diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index 95c8523..e034f95 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -415,9 +415,34 @@ public class SAPToWMSController { String lgpro = MapUtils.getString(marcItem, "LGPRO"); // 发货仓库地点  ERP库位 String eisbe = MapUtils.getString(marcItem, "EISBE"); // 安全库存 String insmk = MapUtils.getString(marcItem, "INSMK"); // 过账到质检库存,质检标识 - if("X".equals(insmk)) + /*if("X".equals(insmk)) { insmk="Y";//SAP启用质检标记为X,转换为Y存入数据库。zd.2024.8.2 + }*/ + + /** + * 2025-05-19 + * 增加物料是否质检 + * 1.按照QMS提供对应关系维护到基础表(新增),料号下发时取值 + */ + String selectBSIQCFlagSql = " SELECT\n" + + "\tMS.SITENAME,\n" + + "\tMS.MATERIALGROUP,\n" + + "\tMI.IQCFLAG \n" + + "FROM\n" + + "\tMATERIALSPEC MS\n" + + "\tLEFT JOIN BS_MATERIALSPECIQCFLAG MI ON MS.MATERIALGROUP = MI.MATERIALGROUP\n" + + "WHERE\n" + + "\tMS.SITENAME =:SITENAME\n" + + "\tAND MS.MATERIALSPECNAME =:MATERIALSPECNAME\n "; + Map BSIQCFlagMap = new HashMap (); + BSIQCFlagMap.put("SITENAME", materialSpecSiteName); + BSIQCFlagMap.put("MATERIALSPECNAME", matnr); + List> selectBSIQCFlagList = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectBSIQCFlagSql, BSIQCFlagMap); + if(null != selectBSIQCFlagList && selectBSIQCFlagList.size() > 0){ + insmk = selectBSIQCFlagList.get(0).get("IQCFLAG") == null ? "N" : selectIQCFlagList.get(0).get("IQCFLAG").toString();//是否质检 + }else { + insmk = "N";//是否质检 } String beskz = MapUtils.getString(marcItem, "BESKZ"); // 采购类型 String rgekz = MapUtils.getString(marcItem, "RGEKZ"); // 反冲