gyq

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

@@ -134,30 +134,34 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
+  async UpdateofficialSealByDeliverCode(pobj,qobj,req){//
+    if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))){
+      var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
+      if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
+        rs.delivery_info.officialSeal = pobj.baseInfo.officialSeal;
+      }
+      if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
+        rs.delivery_info.businessLicense = pobj.baseInfo.businessLicense;
+      }
+       //更新详情
+      var uarr = {
+        "deliverNumber":pobj.deliverNumber,
+        "baseInfo":rs.delivery_info
+      };
+      await this.service.updateInfoByDeliverCode(uarr);
+      return system.getResult("更新成功");
+    }
+    else{
+      return system.getResultError("参数错误！");
+    }
+  }
+
   /*根据交付单编号更新交付单详情*/
   async updateInfoByDeliverCode(pobj,qobj,req){//
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
       try{
-        
-        //判断工商扫描件和营业执照扫描件是否存在,若存在更新交付单的详情
-        if ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')){
-          var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
-          var deliveryInfo = rs.delivery_info;
-          if (pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined'){
-            deliveryInfo.officialSeal = pobj.baseInfo.officialSeal;
-          }
-          if (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined'){
-            deliveryInfo.businessLicense = pobj.baseInfo.businessLicense;
-          }
-          
-          //更新详情
-          var uarr = {
-            "deliverNumber":pobj.deliverNumber,
-            "deliveryInfo":deliveryInfo
-          };
-          await this.service.updateInfoByDeliverCode(uarr);
-        }
-
+         //更新详情
+        await this.service.updateInfoByDeliverCode(pobj);
         //更新材料信息
         await this.materialService.updateInfoByDeliverNumber(pobj);
         var statusInfo = {
@@ -213,7 +217,7 @@ class DeliverybillCtl extends CtlBase {
           "actionType":"updateOrderStatus",
           "actionBody":{
             "orderNum": pobj.businessMode,//订单编码
-            "status":2,//已接单
+            "status":20,//已接单
             "deliverContent":pobj
           }
         }   

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

@@ -52,7 +52,7 @@ class DeliverybillDao extends Dao {
   /*根据交付单更新交付材料信息*/
   async UpdateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
     var whereobj = { "delivery_code": qobj.deliverNumber };
-    var setobj = { "delivery_info": qobj.deliveryInfo };
+    var setobj = { "delivery_info": qobj.baseInfo };
     return await this.updateByWhere(setobj, whereobj, t);
   }
 

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

@@ -28,7 +28,7 @@ class MaterialDao extends Dao {
       setobj.position_info = qobj.positionInfo;
     }
     if (qobj.managerInfo && qobj.managerInfo != 'undefined'){
-      setobj.position_info = setobj.position_info;
+      setobj.position_info =  qobj.managerInfo;
     }
     if (qobj.regInfo && qobj.regInfo != 'undefined'){
       setobj.file_info = qobj.regInfo;