1

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

@@ -131,6 +131,12 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if (paymentManagement != null) {
                     weighingManagement1.setPaymentManagement(paymentManagement);
                 }
+                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("comp_id",weighingManagement1.getCompId())
+                        .eq("contract_no",weighingManagement1.getContractNo()));
+                if (contractManagementInfo!=null){
+                    weighingManagement1.setContractManagement(contractManagementInfo);
+                }
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                         .eq("relation_id", weighingManagement1.getRelationId())
                         .eq("comp_id", weighingManagement1.getCompId()));
@@ -620,6 +626,13 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - weighingManagement1.getNetWeight()/1000);
                     warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                 }
+                //减去任务已完成量
+                InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                        .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
+                if (inOutWarehouseTask!=null){
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()-warehouseInOutInfo.getNetWeight());
+                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
+                }
             }
         }
         //收购入库
@@ -710,6 +723,13 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + weighingManagement1.getNetWeight()/1000);
                     warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                 }
+                //减去任务已完成量
+                InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                        .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
+                if (inOutWarehouseTask!=null){
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()-warehouseInOutInfo.getNetWeight());
+                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
+                }
             }
         }
         //移库出库