10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

update 到货单入库，QMS质检信息修改

Browse Source
This commit is contained in:
18110972313 2025-05-23 14:44:26 +08:00
parent f84d49217d
commit 625d7e6f6e
2 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java
View File

@ -479,41 +479,52 @@ public class QMSServiceImpl implements QMSService{
public String sendToIQCByDataList(String opCode, String siteName, String deliveryName) throws CustomException {
String sql = " \n" +
"SELECT \n" +
"WITH AA AS (\n" +
"\tSELECT\n" +
"\t\tP.SITENAME,\n" +
" \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.RECEIVEREQUESTNAME,\n" +
"\t\tP.ERPFACTORY,\n" +
"\t\tP.ERPLOCATION,\n" +
"\t\tP.MATERIALSPECNAME AS materialCode,\n" +
"\t\tMP.DESC_CN AS materialName,\n" +
"\t\tMP.MATERIALGROUP AS materialGroup,\n" +
"\t\tP.LOCATIONNAME,\t\n" +
"\t\tP.UNIT AS quantityUnit,\n" +
"\t\tLISTAGG(DISTINCT P.CHARGE , ';') WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS,\n" +
"\t\tCOUNT(DISTINCT P.CHARGE ) batchQuantity,\n" +
" P.UNIT AS quantityUnit,\n" +
"\t\tSP.SUPPLIERNO AS SUPPLIERCODE,\n" +
"\t\tSP.SUPPLIERNAME,\n" +
"\t\tLISTAGG(DISTINCT P.CHARGE , ';') WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS\n" +
"\t\t\tFROM\n" +
" MATERIALPACKING P \n" +
"LEFT JOIN SUPPLIER SP\tON SP.SUPPLIERNO = P.SUPPLIERNAME\n" +
"LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = P.ERPLOCATION AND EL.SITENAME = P.SITENAME\n" +
"LEFT JOIN MATERIALSPEC MP ON MP.MATERIALSPECNAME = P.MATERIALSPECNAME AND MP.SITENAME = P.SITENAME\n" +
"LEFT JOIN BS_MATERIALFACTORY BF ON BF.MATERIALSPECNAME = P.MATERIALSPECNAME AND BF.ERPFACTORY = P.ERPFACTORY\n" +
"LEFT JOIN MATERIALRECEIVEREQUESTDETAIL RD ON P.SITENAME = RD.SITENAME \n" +
"LEFT JOIN MATERIALRECEIVEREQUEST R ON RD.RECEIVEREQUESTNAME = R.RECEIVEREQUESTNAME AND RD.SITENAME = R.SITENAME\n" +
"LEFT JOIN MATERIALDELIVERYRECEIVE DR ON R.RECEIVEREQUESTNAME=DR.RECEIVEREQUESTNAME \n" +
"LEFT JOIN MATERIALDELIVERY D ON DR.DELIVERYNAME = D.DELIVERYNAME WHERE\n" +
" D.SITENAME =:SITENAME\n" +
" AND D.DELIVERYNAME =:DELIVERYNAME\n" +
" AND D.DELIVERYSTATE = '02'\n" +
"\t\tAND DR.MATERIALSPECNAME=RD.MATERIALSPECNAME\n" +
"\t\tAND RD.RECEIVEREQUESTDETAILNAME=DR.RECEIVEREQUESTDETAILNAME\n" +
"\t\tAND P.RECEIVEREQUESTNAME = DR.DELIVERYNAME \n" +
"\t\tAND P.MATERIALSPECNAME = DR.MATERIALSPECNAME AND P.STOCKSTATE = 'Created' \n" +
"\t\tP.SUPPLIERNAME\n" +
"\tFROM\n" +
"\t\tMATERIALPACKING P \n" +
"\tWHERE\n" +
"\t\tP.RECEIVEREQUESTNAME =:DELIVERYNAME\n" +
"\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,DR.RECEIVEREQUESTNAME ";
"\t\tP.SITENAME,\n" +
"\t\tP.RECEIVEREQUESTNAME,\n" +
"\t\tP.ERPFACTORY,\n" +
"\t\tP.ERPLOCATION,\n" +
"\t\tP.MATERIALSPECNAME,\n" +
"\t\tP.LOCATIONNAME,\n" +
"\t\tP.UNIT,\n" +
"\t\tP.SUPPLIERNAME\n" +
"\t\t)\n" +
"\t\t\n" +
"SELECT\n" +
"\tAA.SITENAME,\n" +
"AA.RECEIVEREQUESTNAME,\n" +
"\t\tAA.ERPFACTORY,\n" +
"\t\tAA.ERPLOCATION,\n" +
"\t\tAA.materialCode,\n" +
"\t\tAA.LOCATIONNAME,\t\n" +
"\t\tAA.quantityUnit,\n" +
"\t\tAA.LOTS,\n" +
"\t\tAA.batchQuantity,\n" +
"\t\tAA.SUPPLIERNAME,\n" +
"\t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" +
"\t\tMP.MATERIALGROUP\n" +
"FROM\n" +
"AA\n" +
"LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = AA.ERPLOCATION\n" +
"LEFT JOIN MATERIALSPEC MP ON MP.MATERIALSPECNAME = AA.materialCode\n" +
"WHERE\n" +
"\tAA.RECEIVEREQUESTNAME =:DELIVERYNAME ";
Map<String, Object> hashMap = new HashMap<String,Object> ();
hashMap.put("SITENAME", siteName);
hashMap.put("DELIVERYNAME", deliveryName);

14
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -6717,20 +6717,6 @@ public class ToSAPServiceImpl {
}
if("S".equals(rcode)) {
/**
jsonObject.put("warehouse", list.get(i).get("ERPLOCATIONDESC"));
jsonObject.put("supplierName", list.get(i).get("SUPPLIERNAME"));
jsonObject.put("supplierCode", list.get(i).get("SUPPLIERCODE"));
jsonObject.put("materialName", list.get(i).get("MATERIALNAME"));
jsonObject.put("materialCode", list.get(i).get("MATERIALCODE"));
jsonObject.put("materialGroup", list.get(i).get("MATERIALGROUP"));
jsonObject.put("batchQuantity", list.get(i).get("BATCHQUANTITY"));
jsonObject.put("quantityUnit", list.get(i).get("QUANTITYUNIT"));
jsonObject.put("deliveryDate", list.get(i).get("DELIVERYDATE"));
jsonObject.put("specifications", list.get(i).get("BATCHNUMBER"));
jsonObject.put("LOCATIONNAME", list.get(i).get("LOCATIONNAME"));
String receiveRequestName = list.get(i).get("RECEIVEREQUESTNAME") == null ? "" : list.get(i).get("RECEIVEREQUESTNAME").toString();
*/
// 调用 QMS
//qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory);
exceptionMsg = "QMS返回";