1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -12,6 +12,7 @@ public enum StatusEnum {
     //合同状态
     CONTRACT_WAIT("0", "待执行", "wait implementation"),
     CONTRACT_DO("1", "执行中", "Under implementation"),
+    END_OF_SHIPMENT("2", "发运结束", "End of shipment"),
     CONTRACT_COMPLETED("3", "已完成", "Completed"),
 
     // 仓库显示标识

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

@@ -79,7 +79,7 @@ public class ContractManagementInfoController {
      */
     @PostMapping("/editStatus")
     public String editStatus(@RequestBody ContractManagementInfo contractManagementInfo) {
-        return contractManagementInfoService.editStatus(contractManagementInfo.getId());
+        return contractManagementInfoService.editStatus(contractManagementInfo.getId(),contractManagementInfo.getEndFlag());
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -524,6 +524,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
     private Double depositReceived;
     @TableField(exist = false)
     private List<CollectionWarehousingRecord> collectionWarehousingRecordList;
+    /**
+     * 发运结束标识
+     */
+    @TableField(exist = false)
+    private String endFlag;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -387,6 +387,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String qualityType;
+    /**
+     *合同对象
+     */
+    @TableField(exist = false)
+    private ContractManagementInfo contractManagement;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -51,7 +51,7 @@ public interface IContractManagementInfoService extends IService<ContractManagem
      * @param id
      * @return
      */
-    String editStatus(String id);
+    String editStatus(String id,String endFlag);
 
     /**
      * 删除

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

@@ -710,13 +710,19 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String editStatus(String id) {
+    public String editStatus(String id,String endFlag) {
         // 查询合同信息
         ContractManagementInfo contractManagementInfo = this.selectById(id);
         if (contractManagementInfo != null) {
             if (StatusEnum.CONTRACT_DO.getFlag().equals(contractManagementInfo.getStatusFlag())) {
-                contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
-                contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
+                //发运结束
+                if ("1".equals(endFlag)){
+                    contractManagementInfo.setStatusFlag(StatusEnum.END_OF_SHIPMENT.getFlag());
+                    contractManagementInfo.setStatus(StatusEnum.END_OF_SHIPMENT.getName());
+                }else{
+                    contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
+                    contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
+                }
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("comp_id", contractManagementInfo.getCompId())
                         .eq("contract_no", contractManagementInfo.getContractNo()));
@@ -727,7 +733,11 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         inOutWarehouseTaskService.updateById(inOutWarehouseTask);
                     }
                 }
-            } else {
+            } else if(StatusEnum.END_OF_SHIPMENT.getFlag().equals(contractManagementInfo.getStatusFlag())){
+                contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
+                contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
+            }
+            else {
                 contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());
                 contractManagementInfo.setStatus(StatusEnum.CONTRACT_DO.getName());
                 //货物信息

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

@@ -44,6 +44,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Autowired
     private IShippingInformationService shippingInformationService;
     @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
     private ICommonStaffService staffService;
     @Autowired
     private QRCodeUtil qrCodeUtil ;
@@ -81,6 +83,12 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             if (weighingManagement != null) {
                 qualityInspectionManagement1.setWeighingManagement(weighingManagement);
             }
+            ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("comp_id",qualityInspectionManagement.getCompId())
+                    .eq("contract_no",qualityInspectionManagement1.getContractNo()));
+            if (contractManagementInfo!=null){
+                qualityInspectionManagement1.setContractManagement(contractManagementInfo);
+            }
         }
         Page<QualityInspectionManagement> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);