耗材登记bug修改

wangqian
1 parent c86e5ad0
Showing 2 changed files with 10 additions and 2 deletions
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
@@ -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")
@@ -15,6 +15,7 @@ import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -55,7 +56,14 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ
         if(null == material){
             throw exception0(BAD_REQUEST.getCode(), "无效参数-materialId");
         }
-        MaterialInventoryDO materialInventory = materialInventoryService.getMaterialInventory(createReqVO.getInventoryId());
+
+        MaterialInventoryDO materialInventory = null;
+        if(createReqVO.getInventoryId() != null) {
+            materialInventory = materialInventoryService.getMaterialInventory(createReqVO.getInventoryId());
+        } else {
+            //耗材登记没有库存id,只能使用耗材id+单位查询
+            materialInventory = materialInventoryService.selectMaterialInventoryByMaterialId(material.getMaterialId(), getCompanyId());
+        }
         if(null == materialInventory){
             throw exception0(BAD_REQUEST.getCode(),createReqVO.getMaterialName()+"没有库存");
         }