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

优化序列和和批号

Browse Source
This commit is contained in:
季圣华
2021-10-02 23:13:28 +08:00
parent 47bda02035
commit 9f44bb39fc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,8 +372,9 @@ public class DepotItemService {
depotItem.setBasicNumber(oNumber); //其他情况 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 preNumber = rowObj.getBigDecimal("preNumber");
BigDecimal finishNumber = rowObj.getBigDecimal("finishNumber"); BigDecimal finishNumber = rowObj.getBigDecimal("finishNumber");
if(depotItem.getOperNumber().add(finishNumber).compareTo(preNumber)<0) { if(depotItem.getOperNumber().add(finishNumber).compareTo(preNumber)<0) {

2
jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -471,6 +471,8 @@ public class SerialNumberService {
} }
public void addSerialNumberByBill(Long materialId, Long depotId, String snList) throws Exception { public void addSerialNumberByBill(Long materialId, Long depotId, String snList) throws Exception {
//将中文的逗号批量替换为英文逗号
snList = snList.replaceAll("，",",");
List<String> snArr = StringUtil.strToStringList(snList); List<String> snArr = StringUtil.strToStringList(snList);
for(String sn: snArr) { for(String sn: snArr) {
List<SerialNumber> list = new ArrayList<>(); List<SerialNumber> list = new ArrayList<>();