1

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

@@ -421,7 +421,6 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         .eq("comp_id", contractManagementInfo.getCompId())
                         .eq("contract_no", contractManagementInfo.getContractNo())
                         .eq("delete_flag", "0")
-                        .eq("task_type_key", "3")
                         .orderBy("update_date", false));
                 if (inOutWarehouseTask!=null){
                     inOutWarehouseTask.setWeight(contractManagementInfo.getWeight());

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

@@ -273,7 +273,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                     .eq("bin_number",qualityInspectionManagement1.getBinNumber())
                     .eq("delete_flag","0")
                     .eq("base_id", warehouseInOutInfo.getBaseId()));
-            warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
+            if (warehousePositionInfo!=null){
+                warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
+            }
             warehouseInOutInfo.setBinNumber(qualityInspectionManagement1.getBinNumber());
             warehouseInOutInfo.setCost(qualityInspectionManagement1.getCost());
             warehouseInOutInfoService.updateById(warehouseInOutInfo);

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

@@ -1500,7 +1500,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("comp_id", contractManagementInfo.getCompId())
                         .eq("contract_no", contractManagementInfo.getContractNo())
                         .eq("delete_flag", "0")
-                        .eq("task_type_key", "3")
                         .orderBy("update_date", false));
                 if (inOutWarehouseTask==null){
                     ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()

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

@@ -159,21 +159,21 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                             .eq("comp_id", weighingManagement1.getCompId()));
                     if (qualityInspectionManagement != null) {
                         weighingManagement1.setQualityInspectionManagement(qualityInspectionManagement);
-                        WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(qualityInspectionManagement.getWarehouseInOutId());
-                        if (warehouseInOutInfo!=null){
-                            InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
-                                    .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo())
-                                    .eq("comp_id",weighingManagement1.getCompId()));
-                            if (inOutWarehouseTask!=null){
-                                weighingManagement1.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity());
-                                weighingManagement1.setWeight(inOutWarehouseTask.getWeight());
-                            }
-                            weighingManagement1.setTranCarNo(warehouseInOutInfo.getTranCarNo());
-                            WarehouseInOutDetail warehouseInOutDetail=warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>()
-                                    .eq("info_id", warehouseInOutInfo.getId()));
-                            if (warehouseInOutDetail!=null){
-                                weighingManagement1.setInOutDetailId(warehouseInOutDetail.getId());
-                            }
+                    }
+                    WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(weighingManagement1.getWarehouseInOutId());
+                    if (warehouseInOutInfo!=null){
+                        InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                                .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo())
+                                .eq("comp_id",weighingManagement1.getCompId()));
+                        if (inOutWarehouseTask!=null){
+                            weighingManagement1.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity());
+                            weighingManagement1.setWeight(inOutWarehouseTask.getWeight());
+                        }
+                        weighingManagement1.setTranCarNo(warehouseInOutInfo.getTranCarNo());
+                        WarehouseInOutDetail warehouseInOutDetail=warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>()
+                                .eq("info_id", warehouseInOutInfo.getId()));
+                        if (warehouseInOutDetail!=null){
+                            weighingManagement1.setInOutDetailId(warehouseInOutDetail.getId());
                         }
                     }
                     WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()