Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -319,6 +319,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 复检等级
      */
     private String reGrade;
+    /**
+     * 提示
+     */
+    private String tips;
 
     /**
      * 模糊查询

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

@@ -64,6 +64,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     @Autowired
+    private IInOutWarehouseTaskService inOutWarehouseTaskService;
+    @Autowired
     private IStockSaleReceiptReportService stockSaleReceiptReportService;
     @Autowired
     private ITranTaskInfoService tranTaskInfoService;
@@ -716,6 +718,16 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             if (StatusEnum.CONTRACT_DO.getFlag().equals(contractManagementInfo.getStatusFlag())) {
                 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()));
+                if (CollectionUtils.isNotEmpty(inOutWarehouseTaskList)){
+                    for (InOutWarehouseTask inOutWarehouseTask:inOutWarehouseTaskList){
+                        inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_COMPLETED.getFlag());
+                        inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_COMPLETED.getName());
+                        inOutWarehouseTaskService.updateById(inOutWarehouseTask);
+                    }
+                }
             } 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

@@ -216,6 +216,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         //状态为已初检
         qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
         qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
+        qualityInspectionManagement.setAgentKey(AuthSecurityUtils.getCurrentUserId());
+        qualityInspectionManagement.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
         //生成检斤信息
         WeighingManagement weighingManagement=new WeighingManagement();
         weighingManagement.setId(IdGenerator.generateUUID());