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" +