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 6acad30..ace0053 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 @@ -484,6 +484,7 @@ public class QMSServiceImpl implements QMSService{ " \t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" + "\t\tP.LOCATIONNAME,\t\n" + "\t\tTO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ) deliveryDate,\n" + + "\t\tDR.RECEIVEREQUESTNAME,\n" + "\t\tP.MATERIALSPECNAME AS materialCode,\n" + "\t\tMP.DESC_CN AS materialName,\n" + "\t\tMP.MATERIALGROUP AS materialGroup,\n" + @@ -512,7 +513,7 @@ public class QMSServiceImpl implements QMSService{ "\t\tGROUP BY \n" + "\t\tP.SITENAME,EL.DESCRIPTION,TO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ),\n" + "\t\tP.MATERIALSPECNAME,MP.DESC_CN, MP.MATERIALGROUP,P.UNIT,SP.SUPPLIERNO, SP.SUPPLIERNAME,\n" + - "\t\tSUBSTR(P.TRUEGG , 1, INSTR(P.TRUEGG , '*') - 1) ,P.LOCATIONNAME "; + "\t\tSUBSTR(P.TRUEGG , 1, INSTR(P.TRUEGG , '*') - 1) ,P.LOCATIONNAME,DR.RECEIVEREQUESTNAME "; Map hashMap = new HashMap (); hashMap.put("SITENAME", siteName); hashMap.put("DELIVERYNAME", deliveryName);