退回

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

@@ -586,7 +586,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //查询出入库表
         WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(weighingManagement1.getWarehouseInOutId());
         if(weighingManagement1.getWarehouseInOutId() != null){
-            if(warehouseInOutInfo!= null){
+            if(warehouseInOutInfo!= null && "3".equals(warehouseInOutInfo.getStatusFlag())){
                 //状态改为已暂存
                 warehouseInOutInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
                 warehouseInOutInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
@@ -595,6 +595,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 //查询仓位库存信息
                 WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                         .eq("position_id",warehouseInOutInfo.getPositionId())
+                        .eq("goods_name",warehouseInOutInfo.getGoodsName())
                         .eq("delete_flag","0"));
                 if(warehousePositionStorageInfo != null){
                     //更新仓位库存信息
@@ -675,7 +676,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //查询出入库表
         WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(weighingManagement1.getWarehouseInOutId());
         if(weighingManagement1.getWarehouseInOutId() != null){
-            if(warehouseInOutInfo!= null){
+            if(warehouseInOutInfo!= null && "3".equals(warehouseInOutInfo.getStatusFlag())){
                 //状态改为已暂存
                 warehouseInOutInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
                 warehouseInOutInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
@@ -684,6 +685,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 //查询仓位库存信息
                 WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                         .eq("position_id",warehouseInOutInfo.getPositionId())
+                        .eq("goods_name",warehouseInOutInfo.getGoodsName())
                         .eq("delete_flag","0"));
                 if(warehousePositionStorageInfo != null){
                     //更新仓位库存信息