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

给单据增加sku字段

Browse Source
This commit is contained in:
季圣华
2021-07-28 00:54:30 +08:00
parent f073488317
commit 1f166552b2
9 changed files with 141 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -185,6 +185,7 @@ public class DepotItemController {
}
item.put("stock", stock);
item.put("unit", diEx.getMaterialUnit());
item.put("sku", diEx.getSku());
item.put("operNumber", diEx.getOperNumber());
item.put("basicNumber", diEx.getBasicNumber());
item.put("unitPrice", diEx.getUnitPrice());

17
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -195,18 +195,17 @@ public class MaterialController {
item.put("standard", material.getStandard());
item.put("model", material.getModel());
item.put("unit", material.getCommodityUnit() + ratio);
if(depotId!=null) {
BigDecimal stock = depotItemService.getStockByParam(depotId,material.getId(),null,null,tenantId);
if (material.getUnitId()!=null){
Unit unit = unitService.getUnit(material.getUnitId());
if(material.getCommodityUnit().equals(unit.getOtherUnit())) {
if(unit.getRatio()!=0) {
stock = stock.divide(BigDecimal.valueOf(unit.getRatio()),2,BigDecimal.ROUND_HALF_UP);
}
item.put("sku", material.getSku());
BigDecimal stock = depotItemService.getStockByParam(depotId,material.getId(),null,null,tenantId);
if (material.getUnitId()!=null){
Unit unit = unitService.getUnit(material.getUnitId());
if(material.getCommodityUnit().equals(unit.getOtherUnit())) {
if(unit.getRatio()!=0) {
stock = stock.divide(BigDecimal.valueOf(unit.getRatio()),2,BigDecimal.ROUND_HALF_UP);
}
}
item.put("stock", stock);
}
item.put("stock", stock);
String expand = ""; //扩展信息
for (int i = 0; i < mpArr.length; i++) {
if (mpArr[i].equals("制造商")) {

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
View File

@@ -13,6 +13,8 @@ public class DepotItem {
private String materialUnit;
private String sku;
private BigDecimal operNumber;
private BigDecimal basicNumber;
@@ -81,6 +83,14 @@ public class DepotItem {
this.materialUnit = materialUnit == null ? null : materialUnit.trim();
}
public String getSku() {
return sku;
}
public void setSku(String sku) {
this.sku = sku == null ? null : sku.trim();
}
public BigDecimal getOperNumber() {
return operNumber;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
View File

@@ -415,6 +415,76 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andSkuIsNull() {
addCriterion("sku is null");
return (Criteria) this;
}
public Criteria andSkuIsNotNull() {
addCriterion("sku is not null");
return (Criteria) this;
}
public Criteria andSkuEqualTo(String value) {
addCriterion("sku =", value, "sku");
return (Criteria) this;
}
public Criteria andSkuNotEqualTo(String value) {
addCriterion("sku <>", value, "sku");
return (Criteria) this;
}
public Criteria andSkuGreaterThan(String value) {
addCriterion("sku >", value, "sku");
return (Criteria) this;
}
public Criteria andSkuGreaterThanOrEqualTo(String value) {
addCriterion("sku >=", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLessThan(String value) {
addCriterion("sku <", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLessThanOrEqualTo(String value) {
addCriterion("sku <=", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLike(String value) {
addCriterion("sku like", value, "sku");
return (Criteria) this;
}
public Criteria andSkuNotLike(String value) {
addCriterion("sku not like", value, "sku");
return (Criteria) this;
}
public Criteria andSkuIn(List<String> values) {
addCriterion("sku in", values, "sku");
return (Criteria) this;
}
public Criteria andSkuNotIn(List<String> values) {
addCriterion("sku not in", values, "sku");
return (Criteria) this;
}
public Criteria andSkuBetween(String value1, String value2) {
addCriterion("sku between", value1, value2, "sku");
return (Criteria) this;
}
public Criteria andSkuNotBetween(String value1, String value2) {
addCriterion("sku not between", value1, value2, "sku");
return (Criteria) this;
}
public Criteria andOperNumberIsNull() {
addCriterion("oper_number is null");
return (Criteria) this;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View File

@@ -34,6 +34,8 @@ public class MaterialVo4Unit extends Material{
private BigDecimal currentStockPrice;
private String sku;
public String getUnitName() {
return unitName;
}
@@ -153,4 +155,12 @@ public class MaterialVo4Unit extends Material{
public void setCurrentStockPrice(BigDecimal currentStockPrice) {
this.currentStockPrice = currentStockPrice;
}
public String getSku() {
return sku;
}
public void setSku(String sku) {
this.sku = sku;
}
}

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

@@ -331,6 +331,7 @@ 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("operNumber"))) {
depotItem.setOperNumber(rowObj.getBigDecimal("operNumber"));
String unit = rowObj.get("unit").toString();