修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranProcessInfoController.java

@@ -70,7 +70,7 @@ public class TranProcessInfoController {
      */
     @PostMapping("/api/editReceivingStatus")
     public String editReceivingStatus(@RequestBody TranProcessInfo tranProcessInfo){
-        return tranProcessInfoService.editReceivingStatus(tranProcessInfo.getId());
+        return tranProcessInfoService.editReceivingStatus(tranProcessInfo);
     }
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranProcessInfoService.java

@@ -57,7 +57,7 @@ public interface ITranProcessInfoService extends IService<TranProcessInfo> {
      * @param id
      * @return
      */
-    String editReceivingStatus(String id);
+    String editReceivingStatus(TranProcessInfo tranProcessInfo);
     /**
      * 删除运输阶段
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -68,6 +68,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private ITranCarInfoService tranCarInfoService;
     @Autowired
+    private ITranProcessInfoService tranProcessInfoService;
+    @Autowired
     private INewWorkflowService workflowService;
     @Autowired
     private IPriceConfirmationSheetService priceConfirmationSheetService;
@@ -585,7 +587,20 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
                         }
                     }
-                    contractManagementInfo1.setCompletedQuantity(outWeight - loss - returnWeight);
+                    //自运的销售合同
+                    if ("1".equals(contractManagementInfo1.getDeliverType())){
+                        //已完货的粮款结算阶段
+                        TranProcessInfo tranProcessInfo=tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                                .eq("end_flag","1")
+                                .eq("receiving_status_flag","1"));
+                        if (tranProcessInfo!=null){
+                            //完成量等于完货净重
+                            contractManagementInfo1.setCompletedQuantity(tranProcessInfo.getWeight());
+                        }
+                    }
+                    else {
+                        contractManagementInfo1.setCompletedQuantity(outWeight - loss - returnWeight);
+                    }
                 }
             }
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -487,27 +487,31 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     /**
      * 更改收货反馈状态
      *
-     * @param id
+     * @param tranProcessInfo
      * @return
      */
     @Override
-    public String editReceivingStatus(String id) {
+    public String editReceivingStatus(TranProcessInfo tranProcessInfo) {
         //查询反馈信息
-        TranProcessInfo tranProcessInfo = this.selectById(id);
-        if (tranProcessInfo != null) {
-            if (StatusEnum.FEEDBACK_DO.getFlag().equals(tranProcessInfo.getReceivingStatusFlag())) {
-                tranProcessInfo.setReceivingStatusFlag(StatusEnum.FEEDBACK_COMPLETED.getFlag());
-                tranProcessInfo.setReceivingStatus(StatusEnum.FEEDBACK_COMPLETED.getName());
+        TranProcessInfo tranProcessInfo1 = this.selectById(tranProcessInfo.getId());
+        if (tranProcessInfo1 != null) {
+            if (StatusEnum.FEEDBACK_DO.getFlag().equals(tranProcessInfo1.getReceivingStatusFlag())) {
+                //打入完货净重
+                if (tranProcessInfo.getWeight()!=null){
+                    tranProcessInfo1.setWeight(tranProcessInfo.getWeight());
+                }
+                tranProcessInfo1.setReceivingStatusFlag(StatusEnum.FEEDBACK_COMPLETED.getFlag());
+                tranProcessInfo1.setReceivingStatus(StatusEnum.FEEDBACK_COMPLETED.getName());
             } else {
-                tranProcessInfo.setReceivingStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
-                tranProcessInfo.setReceivingStatus(StatusEnum.FEEDBACK_DO.getName());
+                tranProcessInfo1.setReceivingStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
+                tranProcessInfo1.setReceivingStatus(StatusEnum.FEEDBACK_DO.getName());
             }
-            this.updateById(tranProcessInfo);
+            this.updateById(tranProcessInfo1);
             // 插入操作历史
             String staffName = this.billOperateHisService.getStaffAndName();
             // 插入操作历史
-            this.billOperateHisService.saveBillOperateHis(tranProcessInfo.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
-                    tranProcessInfo.getProcessStatus(), null, "");
+            this.billOperateHisService.saveBillOperateHis(tranProcessInfo1.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
+                    tranProcessInfo1.getProcessStatus(), null, "");
             return "OK";
         }
         return "NG";