dd

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -179,7 +179,7 @@ class DeliverybillCtl extends CtlBase {
             rarr.baseInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
           }
           if (rs.delivery_info.contactsPhone && rs.delivery_info.contactsPhone != 'undefined') {
-            rarr.contactsInfo.contactsPhone =system.decryptStr(rs.delivery_info.contactsPhone);//联系电话信息
+            rarr.contactsInfo.contactsPhone = system.decryptStr(rs.delivery_info.contactsPhone);//联系电话信息
             rarr.baseInfo.contactsPhone = rarr.contactsInfo.contactsPhone;//联系电话信息
           }
 
@@ -256,28 +256,28 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
-  async updateFileAndStatusByDelivertCode(mobj,qobj, red){//阿里更新状态和盖章文件
+  async updateFileAndStatusByDelivertCode(mobj, qobj, red) {//阿里更新状态和盖章文件
     var pobj = mobj.d;
-    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' ) {
-      try{
+    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
+      try {
         var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
         if (rs && rs != 'undefined') {
           pobj.baseInfo = rs.delivery_info;
-          if (pobj.customerMaterial && pobj.customerMaterial != 'undefined'){
+          if (pobj.customerMaterial && pobj.customerMaterial != 'undefined') {
             pobj.baseInfo.customerMaterial = pobj.customerMaterial;
           }
           await this.service.updateInfoByDeliverCode(pobj);
           return system.getResult("更新成功");
         }
-        else{
+        else {
           return system.getResultError("数据不存在！");
         }
       }
-      catch(error){
+      catch (error) {
         return system.getResultError(error);
       }
     }
-    else{
+    else {
       return system.getResultError("参数错误!");
     }
 
@@ -409,7 +409,7 @@ class DeliverybillCtl extends CtlBase {
               "statusCode": pobj.deliverStatus,
               "clerkName": pInfo.salesman_name,
               "clerkId": pInfo.salesman_id,
-              "deliveryId" : pInfo.delivery_man_id,
+              "deliveryId": pInfo.delivery_man_id,
               "deliveryName": pInfo.delivery_man_name
             }
             if (pInfo.statusReason && pInfo.statusReason != 'undefined') {
@@ -544,8 +544,8 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
-  /*更新业务员信息*/
-  async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {
+  /*更新业务员/交付员信息*/
+  async updateUsermanInfoByDeliverCode(mobj, qobj, req) {
     var pobj = mobj.d;
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
       try {
@@ -556,20 +556,34 @@ class DeliverybillCtl extends CtlBase {
             "flowId": res.id,
             "flowCode": pobj.deliverNumber,
             "salesmanInfo": {
-              "oldOpcode": res.delivery_man_opcode,
-              "oldClerkName": res.delivery_man_name,
-              "oldClerkId": res.delivery_man_id,
               //"oldClerkPhone": res.salesman_phone,
               "oldFacilitatorId": res.facilitator_id,
               "oldFacilitatorName": res.facilitator_name,
-              "newOpcode": pobj.salesmanOpcode,
-              "newClerkName": pobj.salesmanName,
-              "newClerkId": pobj.salesmanId,
               //"newClerkPhone": pobj.salesmanPhone,
               "newFacilitatorId": pobj.facilitatorId,
               "newFacilitatorName": pobj.facilitatorName
             }
           }
+          if (pobj.type == "deliverman") {
+            sInfo.salesmanInfo = {
+              "oldOpcode": res.delivery_man_opcode,
+              "oldClerkName": res.delivery_man_name,
+              "oldClerkId": res.delivery_man_id,
+              "newOpcode": pobj.deliverymanOpcode,
+              "newClerkName": pobj.deliverymanName,
+              "newClerkId": pobj.deliverymanId,
+            }
+          }
+          if (pobj.type == "salesman") {
+            sInfo.salesmanInfo = {
+              "oldOpcode": res.sales_man_opcode,
+              "oldClerkName": res.sales_man_name,
+              "oldClerkId": res.sales_man_id,
+              "newOpcode": pobj.salesmanOpcode,
+              "newClerkName": pobj.salesmanName,
+              "newClerkId": pobj.salesmanId,
+            }
+          }
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
           await this.service.updateSalesmanInfoByDeliverCode(pobj);//更新业务员信息
           return system.getResult("操作成功！");
@@ -679,26 +693,26 @@ class DeliverybillCtl extends CtlBase {
     return system.getResult({})
   }
 
-  async dealAliDeliveryInfo(nobj,qobj,req){//插入交付单信息-阿里用
+  async dealAliDeliveryInfo(nobj, qobj, req) {//插入交付单信息-阿里用
     var pobj = nobj.d;
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
-      try{
+      try {
         var res = await this.service.findInfoByDeliverCode(pobj);
-        if (res){
+        if (res) {
           pobj.deliverStatus = "userConfirmationReject";//状态改成驳回
           await this.service.updateInfoByDeliverCode(pobj);
           return system.getResultSuccess();
           //return await this.service.updateInfoByDeliverCode(pobj);
         }
-        else{
+        else {
           return await this.service.insertInfoall(pobj);
         }
       }
-      catch(error){
+      catch (error) {
         return system.getResultError(error);
       }
     }
-    else{
+    else {
       return system.getResultError("参数错误!");
     }
   }

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -84,18 +84,31 @@ class DeliverybillDao extends Dao {
     return await this.updateByWhere(setobj, whereobj, t);
   }
 
-  /*更新业务员信息*/
+  /*更新业务员/交付员信息*/
   async updateSalesmanInfoByDeliverCode(qobj, t) {
     var setobj = {};
-    if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
-      setobj.delivery_man_id = qobj.salesmanId;
-    };
-    if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
-      setobj.delivery_man_name = qobj.salesmanName;
-    };
-    if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
-      setobj.delivery_man_opcode = qobj.salesmanOpcode;
-    };
+    if(qobj.type == "salesman") {
+      if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
+        setobj.delivery_man_id = qobj.salesmanId;
+      };
+      if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
+        setobj.delivery_man_name = qobj.salesmanName;
+      };
+      if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
+        setobj.delivery_man_opcode = qobj.salesmanOpcode;
+      };
+    }
+    if(qobj.type == "deliverman") {
+      if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
+        setobj.salesman_id = qobj.deliverymanId;
+      };
+      if (qobj.deliverymanName && qobj.deliverymanName != 'undefined') {
+        setobj.salesman_name = qobj.deliverymanName;
+      };
+      if (qobj.deliverymanOpcode && qobj.deliverymanOpcode != 'undefined') {
+        setobj.salesman_opcode = qobj.deliverymanOpcode;
+      };
+    }
     // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
     //   setobj.salesman_phone = qobj.salesmanPhone;
     // };

ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js

@@ -206,7 +206,7 @@ class DeliverybillService extends ServiceBase {
             return await self.dao.updateStatusByDeliverCode(qobj, t);
         });
     }
-    /*更新业务员信息*/
+    /*更新业务员/交付员信息*/
     async updateSalesmanInfoByDeliverCode(qobj){
         var self = this;
         return self.db.transaction(async function (t) {