耗材登记bug修改

wangqian
1 parent 3c45ba64
Showing 5 changed files with 11 additions and 10 deletions
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventoryout/vo/MaterialInventoryOutSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
@@ -17,6 +17,9 @@ public class MaterialInventoryOutDto {
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long inventoryId;
+
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
     @NotNull(message = "物料ID不能为空")
     private Long materialId;
@@ -14,7 +14,7 @@ public class MaterialInventoryOutSaveReqVO {
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
     @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    //@NotNull(message = "库存ID不能为空")
+    @NotNull(message = "库存ID不能为空")
     private Long inventoryId;
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
@@ -57,13 +57,7 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ
             throw exception0(BAD_REQUEST.getCode(), "无效参数-materialId");
         }
-        MaterialInventoryDO materialInventory = null;
-        if(createReqVO.getInventoryId() != null) {
-            materialInventory = materialInventoryService.getMaterialInventory(createReqVO.getInventoryId());
-        } else {
-            //耗材登记没有库存id,只能使用耗材id+单位查询
-            materialInventory = materialInventoryService.selectMaterialInventoryByMaterialId(material.getMaterialId(), getCompanyId());
-        }
+        MaterialInventoryDO materialInventory = materialInventoryService.getMaterialInventory(createReqVO.getInventoryId());
         if(null == materialInventory){
             throw exception0(BAD_REQUEST.getCode(),createReqVO.getMaterialName()+"没有库存");
         }
@@ -79,4 +79,7 @@ public class MaterialDetailSaveReqVO {
     @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED, example = "规格")
     @NotEmpty(message = "规格不能为空")
     private String specifications;
+
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long inventoryId;
 }
@@ -133,12 +133,13 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
 //            }
 //        }
         //耗材出库
-        for (MaterialDetailDO materialDetailDO : materialDetailList) {
+        for (MaterialDetailSaveReqVO materialDetailDO : createReqVO) {
             MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
             outDto.setMaterialId(materialDetailDO.getMaterialId());
             outDto.setMaterialName(materialDetailDO.getMaterialName());
-            outDto.setOutInventoryNum(materialDetailDO.getUserCount());
+            outDto.setOutInventoryNum(Long.valueOf(materialDetailDO.getUserCount()));
             outDto.setOutDate(LocalDateTime.now());
+            outDto.setInventoryId(materialDetailDO.getInventoryId());
             materialApi.createMaterialInventoryOut(outDto);
         }
         //保存耗材