1

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

@@ -770,30 +770,29 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         WeighingManagement weighingManagement1 = this.selectById(weighingManagement.getId());
         //查询出入库表
         WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(weighingManagement1.getWarehouseInOutId());
-        if(weighingManagement1.getWarehouseInOutId() != null){
-            if(warehouseInOutInfo!= null && "3".equals(warehouseInOutInfo.getStatusFlag())){
-                //状态改为已暂存
-                warehouseInOutInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
-                warehouseInOutInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
-                //更新出入库表信息
-                warehouseInOutInfoService.updateById(warehouseInOutInfo);
-                //查询仓位库存信息
-                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                        .eq("position_id",warehouseInOutInfo.getPositionId())
-                        .eq("goods_name",warehouseInOutInfo.getGoodsName())
-                        .eq("delete_flag","0"));
-                if(warehousePositionStorageInfo != null){
-                    //更新仓位库存信息
-                    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);
-                }
+        //非收购类型更新库存量和任务完成量
+        if(warehouseInOutInfo!= null && "3".equals(warehouseInOutInfo.getStatusFlag())){
+            //状态改为已暂存
+            warehouseInOutInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+            warehouseInOutInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+            //更新出入库表信息
+            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+            //查询仓位库存信息
+            WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                    .eq("position_id",warehouseInOutInfo.getPositionId())
+                    .eq("goods_name",warehouseInOutInfo.getGoodsName())
+                    .eq("delete_flag","0"));
+            if(warehousePositionStorageInfo != null){
+                //更新仓位库存信息
+                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);
             }
         }
         //收购入库
@@ -803,7 +802,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             weighingManagement1.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
             //更新检斤信息
             this.updateById(weighingManagement1);
-
+            if (warehouseInOutInfo!=null) {
+                //更新任务已完成量
+                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);
+                }
+            }
             //查询付款信息表
             PaymentManagement paymentManagement = paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
                         .eq("payment_no",weighingManagement1.getNumber())