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

组装、拆卸单的初稿

Browse Source
This commit is contained in:
季圣华
2017-09-20 23:45:24 +08:00
parent 90a9929aa3
commit 814b3839f3
6 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/jsh/action/materials/DepotItemAction.java
View File

@@ -116,6 +116,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
if(tempInsertedJson.get("OtherField3")!=null){depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));}
if(tempInsertedJson.get("OtherField4")!=null){depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));}
if(tempInsertedJson.get("OtherField5")!=null){depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));}
if(tempInsertedJson.get("MType")!=null){depotItem.setMType(tempInsertedJson.getString("MType"));}
depotItemService.create(depotItem);
}
}
@@ -190,6 +191,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
depotItem.setOtherField3(tempUpdatedJson.getString("OtherField3"));
depotItem.setOtherField4(tempUpdatedJson.getString("OtherField4"));
depotItem.setOtherField5(tempUpdatedJson.getString("OtherField5"));
depotItem.setMType(tempUpdatedJson.getString("MType"));
depotItemService.create(depotItem);
}
}
@@ -303,6 +305,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
item.put("OtherField3", depotItem.getOtherField3());
item.put("OtherField4", depotItem.getOtherField4());
item.put("OtherField5", depotItem.getOtherField5());
item.put("MType", depotItem.getMType());
item.put("op", 1);
dataArray.add(item);
}

12
src/main/java/com/jsh/model/po/DepotItem.java
View File

@@ -24,6 +24,7 @@ public class DepotItem implements java.io.Serializable
private String OtherField3; //自定义字段3-制造商
private String OtherField4; //自定义字段4
private String OtherField5; //自定义字段5
private String MType; //商品类型
public DepotItem()
@@ -39,7 +40,7 @@ public class DepotItem implements java.io.Serializable
public DepotItem(DepotHead headerId, Material materialId, String mUnit,
Double operNumber, Double basicNumber, Double unitPrice, Double taxUnitPrice, Double allPrice, String remark, String img,
Depot depotId, Depot anotherDepotId, Double taxRate, Double taxMoney, Double taxLastMoney,
String otherField1, String otherField2, String otherField3, String otherField4, String otherField5) {
String otherField1, String otherField2, String otherField3, String otherField4, String otherField5, String mType) {
super();
HeaderId = headerId;
MaterialId = materialId;
@@ -61,6 +62,7 @@ public class DepotItem implements java.io.Serializable
OtherField3 = otherField3;
OtherField4 = otherField4;
OtherField5 = otherField5;
MType = mType;
}
public Long getId() {
@@ -230,4 +232,12 @@ public class DepotItem implements java.io.Serializable
public void setOtherField5(String otherField5) {
OtherField5 = otherField5;
}
public String getMType() {
return MType;
}
public void setMType(String MType) {
this.MType = MType;
}
}

9
src/main/java/com/jsh/model/vo/materials/DepotItemModel.java
View File

@@ -30,6 +30,7 @@ public class DepotItemModel implements Serializable
private String OtherField3;
private String OtherField4;
private String OtherField5;
private String MType;
private String Inserted = ""; //json插入记录
private String Deleted = ""; //json删除记录
@@ -362,4 +363,12 @@ public class DepotItemModel implements Serializable
public void setOtherField5(String otherField5) {
OtherField5 = otherField5;
}
public String getMType() {
return MType;
}
public void setMType(String MType) {
this.MType = MType;
}
}