purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给批号和序列号增加限制判断（入库或者出库）

Browse Source
This commit is contained in:
季圣华
2022-07-11 21:31:58 +08:00
parent 9ebd4ac38c
commit 85a4f046b4
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -407,19 +407,27 @@ public class DepotItemService {
depotHead.getNumber(), materialExtend.getMaterialId(), depotId, depotItem.getSnList()); depotHead.getNumber(), materialExtend.getMaterialId(), depotId, depotItem.getSnList());
} }
} else { } else {
//序列号不能为空 //入库或出库
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) { if(BusinessConstants.DEPOTHEAD_TYPE_IN.equals(depotHead.getType()) ||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_CODE, BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())) {
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_MSG, barCode)); //序列号不能为空
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_CODE,
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_EMPTY_MSG, barCode));
}
} }
} }
if (StringUtil.isExist(rowObj.get("batchNumber"))) { if (StringUtil.isExist(rowObj.get("batchNumber"))) {
depotItem.setBatchNumber(rowObj.getString("batchNumber")); depotItem.setBatchNumber(rowObj.getString("batchNumber"));
} else { } else {
//批号不能为空 //入库或出库
if(BusinessConstants.ENABLE_BATCH_NUMBER_ENABLED.equals(material.getEnableBatchNumber())) { if(BusinessConstants.DEPOTHEAD_TYPE_IN.equals(depotHead.getType()) ||
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_BATCH_NUMBERE_EMPTY_CODE, BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())) {
String.format(ExceptionConstants.DEPOT_HEAD_BATCH_NUMBERE_EMPTY_MSG, barCode)); //批号不能为空
if (BusinessConstants.ENABLE_BATCH_NUMBER_ENABLED.equals(material.getEnableBatchNumber())) {
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_BATCH_NUMBERE_EMPTY_CODE,
String.format(ExceptionConstants.DEPOT_HEAD_BATCH_NUMBERE_EMPTY_MSG, barCode));
}
} }
} }
if (StringUtil.isExist(rowObj.get("expirationDate"))) { if (StringUtil.isExist(rowObj.get("expirationDate"))) {