diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 226b2d62..3a2da2f1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -372,8 +372,9 @@ public class DepotItemService { depotItem.setBasicNumber(oNumber); //其他情况 } } - //如果数量+已完成数量<原订单数量,代表该单据状态为未全部完成出入库 - if (StringUtil.isExist(rowObj.get("preNumber")) && StringUtil.isExist(rowObj.get("finishNumber"))) { + //如果数量+已完成数量<原订单数量,代表该单据状态为未全部完成出入库(判断前提是存在关联订单) + if (StringUtil.isNotEmpty(depotHead.getLinkNumber()) + && StringUtil.isExist(rowObj.get("preNumber")) && StringUtil.isExist(rowObj.get("finishNumber"))) { BigDecimal preNumber = rowObj.getBigDecimal("preNumber"); BigDecimal finishNumber = rowObj.getBigDecimal("finishNumber"); if(depotItem.getOperNumber().add(finishNumber).compareTo(preNumber)<0) { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 64e7520b..5d84796a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -471,6 +471,8 @@ public class SerialNumberService { } public void addSerialNumberByBill(Long materialId, Long depotId, String snList) throws Exception { + //将中文的逗号批量替换为英文逗号 + snList = snList.replaceAll(",",","); List snArr = StringUtil.strToStringList(snList); for(String sn: snArr) { List list = new ArrayList<>();