gyq

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

@@ -256,6 +256,33 @@ class DeliverybillCtl extends CtlBase {
     }
   }
 
+  async updateFileAndStatusByDelivertCode(mobj,qobj, red){//阿里更新状态和盖章文件
+    var pobj = mobj.d;
+    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'){
+            pobj.baseInfo.customerMaterial = pobj.customerMaterial;
+          }
+          await this.service.updateInfoByDeliverCode(pobj);
+          return system.getResult("更新成功");
+        }
+        else{
+          return system.getResultError("数据不存在！");
+        }
+      }
+      catch(error){
+        return system.getResultError(error);
+      }
+    }
+    else{
+      return system.getResultError("参数错误!");
+    }
+
+  }
+
   async updatestartTimeByDeliverCode(mobj, qobj, red) {//根据交付单编号更新开始计费时间
     var pobj = mobj.d;
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.baseInfo.startTime && pobj.baseInfo.startTime != 'undefined') {

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

@@ -70,7 +70,7 @@ class DeliverybillDao extends Dao {
     var whereobj = { "delivery_code": qobj.deliverNumber };
     var rs = await this.findOne(whereobj);
     if (rs && rs != 'undefined') {
-      if (qobj.deliverStatus == "collecting" || qobj.deliverStatus == "received" || qobj.deliverStatus == "paid") {
+      if (qobj.deliverStatus == "collecting" || qobj.deliverStatus == "received" || qobj.deliverStatus == "paid" || qobj.deliverStatus == "userConfirmationReject") {//兼顾阿里
         rs.delivery_info.payStatus = "待交付";
       }
       else if (qobj.deliverStatus == "closed") {