Переглянути джерело

同步 添加成品英文名 客户部门

liuchaohui 2 роки тому
батько
коміт
a335aabd21

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -76,6 +76,14 @@ public class SyOrderDataItem {
 	@Excel(name = "存货名称", width = 15)
     @ApiModelProperty(value = "存货名称")
 	private java.lang.String inventoryName;
+	/**存货名称*/
+	@Excel(name = "成衣申报要素的英文品名", width = 15)
+	@ApiModelProperty(value = "成衣申报要素的英文品名")
+	private java.lang.String inventoryEnglishName;
+	/**存货名称*/
+	@Excel(name = "客户部门", width = 15)
+	@ApiModelProperty(value = "客户部门")
+	private java.lang.String inventoryCurrencyName;
 	/**规格型号*/
 	@Excel(name = "规格型号", width = 15)
     @ApiModelProperty(value = "规格型号")

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -183,6 +183,8 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cInvCode AS inventoryCode," +
                         "c.cInvCcode AS inventoryCcode," +
                         "c.cInvName AS inventoryName," +
+                        "c.cEnglishName as inventoryEnglishName," +
+                        "c.cCurrencyName as inventoryCurrencyName,"+
                         "s.cFree1 AS colour," +
                         "s.cFree2 AS size," +
                         "s.cFree3 AS codingRules," +