gyq

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

@@ -699,7 +699,9 @@ class DeliverybillCtl extends CtlBase {
       try {
       try {
         var res = await this.service.findInfoByDeliverCode(pobj);
         var res = await this.service.findInfoByDeliverCode(pobj);
         if (res) {
         if (res) {
-          pobj.deliverStatus = "userConfirmationReject";//状态改成驳回
+          if (res.delivery_status != 'received'){//如果数据库中状态是已接单，说明是第一次提交文件，状态为传过了的状态；如果不是已接单，说明是客户驳回后重新提交的文件，状态改为已驳回
+            pobj.deliverStatus = "userConfirmationReject";//状态改成驳回,
+          }
           await this.service.updateInfoByDeliverCode(pobj);
           await this.service.updateInfoByDeliverCode(pobj);
           return system.getResultSuccess();
           return system.getResultSuccess();
           //return await this.service.updateInfoByDeliverCode(pobj);
           //return await this.service.updateInfoByDeliverCode(pobj);