Browse Source

销售订单单证 customerCode 客户编码

liuchaohui 2 năm trước cách đây
mục cha
commit
74cbf170a5

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -166,10 +166,10 @@ public class SyOrderData {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
 	private java.lang.Object memo;
-	/**供应商*/
-	@Excel(name = "供应商编码", width = 15)
-	@ApiModelProperty(value = "供应商编码")
-	private java.lang.String supplierCode;
+	/**客户编码*/
+	@Excel(name = "客户编码", width = 15)
+	@ApiModelProperty(value = "客户编码")
+	private java.lang.String customerCode;
 	/**供应商*/
 	@Excel(name = "供应商", width = 15)
 	@ApiModelProperty(value = "供应商")

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

@@ -144,7 +144,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cdefine1 as thirdParty," +
                         "s.cdefine3 as customerOrderNumber," +
                         "s.cdefine11 as endCustomer," +
-                        "s.cCusCode as supplierCode," +
+                        "s.cCusCode as customerCode," +
                         "v.cVenAbbName as supplier," +
                         "s.fbookratio AS depositRatio," +
                         "s.iMoney AS deposit," +
@@ -204,7 +204,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cDefine28 AS smallPo," +
                         "s.cDefine29 AS distributionPoint," +
                         "s.cInvCode AS inventoryCode," +
-                        "s.cInvName AS inventoryName," +
+                        "c.cInvName AS inventoryName," +
                         "s.cFree1 AS colour," +
                         "s.cFree2 AS size," +
                         "s.cFree3 AS codingRules," +