diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 88301dba..b52558c4 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -258,6 +258,7 @@ public class DepotItemController {
}
BigDecimal allWeight = diEx.getBasicNumber()==null||diEx.getWeight()==null?BigDecimal.ZERO:diEx.getBasicNumber().multiply(diEx.getWeight());
item.put("weight", allWeight);
+ item.put("position", diEx.getPosition());
item.put("remark", diEx.getRemark());
item.put("imgName", diEx.getImgName());
if(fileUploadType == 2) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
index 95f8b379..3a14d875 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
@@ -50,6 +50,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private BigDecimal weight;
+ private String position;
+
private String imgName;
public Long getMId() {
@@ -236,6 +238,14 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
this.weight = weight;
}
+ public String getPosition() {
+ return position;
+ }
+
+ public void setPosition(String position) {
+ this.position = position;
+ }
+
public String getImgName() {
return imgName;
}
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index e4b31897..31dc1ae9 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -26,6 +26,7 @@
+
@@ -308,7 +309,7 @@