功能修改

src/main/java/com/nov/KgLowDurable/service/Impl/LdInventoryRecordServiceImpl.java

@@ -92,7 +92,7 @@ public class LdInventoryRecordServiceImpl extends ServiceImpl<LdInventoryRecordM
                 // 物资编码
                 String materialCode = onePutStorageDetail.getMaterialCode();
                 // 查询库存
-                LdOneForm oneForm = oneFormService.getByMaterialCode(materialCode,null);
+                LdOneForm oneForm = oneFormService.getByMaterialCodeAndType(materialCode,"YH");
                 // 易耗品处理
                 handleConsumerItem(onePutStorageDetail, oneForm, approveDto);
             } else {

src/main/java/com/nov/KgLowDurable/service/Impl/LdOneFormServiceImpl.java

@@ -48,6 +48,11 @@ public class LdOneFormServiceImpl extends ServiceImpl<LdOneFormMapper, LdOneForm
         return oneFormMapper.selectByMaterialCode(materialCode,oneFormId);
     }
 
+    @Override
+    public LdOneForm getByMaterialCodeAndType(String materialCode, String type) {
+        return oneFormMapper.getByMaterialCodeAndType(materialCode,type);
+    }
+
     @Override
     public List<LdOneForm> getPutOneForm(String optionType) {
         return oneFormMapper.selectOneFormByNum(optionType);
@@ -115,8 +120,10 @@ public class LdOneFormServiceImpl extends ServiceImpl<LdOneFormMapper, LdOneForm
         for (LdOneForm oneForm : oneFormList) {
             List<LdOneForm> formList = oneFormMapper.selectByMaterialId(oneForm.getMaterialId(), oneForm.getType());
             if(CollectionUtils.isEmpty(formList)){
-                oneForm.setNum(new BigDecimal(0));
-                list.add(oneForm);
+                if(BatchConstant.CONSUMER.equals(oneForm.getType())){
+                    oneForm.setNum(new BigDecimal(0));
+                    list.add(oneForm);
+                }
             }else {
                 list.addAll(formList);
             }