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

给商品和单据增加序列号和批次字段

Browse Source
This commit is contained in:
季圣华
2021-09-28 00:28:23 +08:00
parent 06d91f8655
commit 09b603c80e
12 changed files with 519 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,7 +333,18 @@ public class DepotItemService {
depotItem.setMaterialId(materialExtend.getMaterialId());
depotItem.setMaterialExtendId(materialExtend.getId());
depotItem.setMaterialUnit(rowObj.getString("unit"));
depotItem.setSku(rowObj.getString("sku"));
if (StringUtil.isExist(rowObj.get("snList"))) {
depotItem.setSnList(rowObj.getString("snList"));
}
if (StringUtil.isExist(rowObj.get("batchNumber"))) {
depotItem.setBatchNumber(rowObj.getString("batchNumber"));
}
if (StringUtil.isExist(rowObj.get("expirationDate"))) {
depotItem.setExpirationDate(rowObj.getDate("expirationDate"));
}
if (StringUtil.isExist(rowObj.get("sku"))) {
depotItem.setSku(rowObj.getString("sku"));
}
if (StringUtil.isExist(rowObj.get("operNumber"))) {
depotItem.setOperNumber(rowObj.getBigDecimal("operNumber"));
String unit = rowObj.get("unit").toString();

3
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -211,6 +211,9 @@ public class MaterialService {
if(material.getUnitId() == null) {
materialMapperEx.setUnitIdToNull(material.getId());
}
if(material.getExpiryNum() == null) {
materialMapperEx.setExpiryNumToNull(material.getId());
}
materialExtendService.saveDetials(obj, obj.getString("sortList"),material.getId(), "update");
if(obj.get("stock")!=null) {
JSONArray stockArr = obj.getJSONArray("stock");