From a81c9dcbead22ba8bdf5b1738da75bcc9c6bc2a0 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Fri, 23 May 2025 17:00:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20/iqc/select/number=E6=9D=A5=E6=96=99?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86=E5=93=81?=
 =?UTF-8?q?=E5=90=8D=E7=9A=84=E5=8F=96=E5=80=BC=E7=94=B1=E4=B8=8D=E5=B8=A6?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=B8=A6=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cim/idm/service/impl/QMSServiceImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
index 068120f..6fa111a 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
@@ -48,7 +48,7 @@ public class QMSServiceImpl implements QMSService{
 				"		 TO_CHAR(T.RECEIVETIME ,'YYYY-MM-DD' ) deliveryDate, \r\n" +
 				"		 T.RECEIVEREQUESTNAME , \r\n" +
 				"		 M3.MATERIALSPECNAME materialCode, \r\n" +
-				"		 M3.DESC_CN materialName, \r\n" +
+				"		 M3.DESCRIPTION materialName, \r\n" +
 				"		 M3.MATERIALGROUP materialGroup, \r\n" +
 				"		 COUNT(DISTINCT T.CHARGE ) batchQuantity, \r\n" +
 				"		 T.UNIT quantityUnit, \r\n" +
@@ -410,7 +410,7 @@ public class QMSServiceImpl implements QMSService{
 				"       T.LOCATIONNAME,\r\n" +
 				"       TO_CHAR(T.RECEIVETIME, 'YYYY-MM-DD') deliveryDate,\r\n" +
 				"       M3.MATERIALSPECNAME materialCode,\r\n" +
-				"       M3.DESC_CN materialName,\r\n" +
+				"       M3.DESCRIPTION materialName,\r\n" +
 				"       M3.MATERIALGROUP materialGroup,\r\n" +
 				"       COUNT(DISTINCT T.CHARGE) batchQuantity,\r\n" +
 				"       T.UNIT quantityUnit,\r\n" +
@@ -518,7 +518,8 @@ public class QMSServiceImpl implements QMSService{
 				"\t\tAA.batchQuantity,\n" +
 				"\t\tAA.SUPPLIERNAME,\n" +
 				"\t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" +
-				"\t\tMP.MATERIALGROUP\n" +
+				"\t\tMP.MATERIALGROUP,\n" +
+				"\t\tMP.DESCRIPTION\n" +
 				"FROM\n" +
 				"AA\n" +
 				"LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = AA.ERPLOCATION\n" +