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 adbb475..6cf5e29 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 @@ -71,7 +71,11 @@ public class SAPToWMSController { String ZRSV08 = ""; String ZRSV09 = ""; String ZRSV10 = ""; - + /** + * 2025-04-25 + * 设置MATERIALSPEC的SITENAME值为SDK + */ + String materialSpecSiteName = "SDK"; // 物料主数据 @RequestMapping(value = "/materialspec", method = RequestMethod.POST) public WMSToSAPReturn GetMaterialSpec(HttpServletRequest httpRequest, @RequestBody SAPToWMSRequest request) { @@ -160,7 +164,7 @@ public class SAPToWMSController { Timestamp currentTimestamp = TimeStampUtil.getCurrentTimestamp(); HashMap map = new HashMap(); - map.put("sitename", System.getProperty("company")); + map.put("sitename", materialSpecSiteName); map.put("materialspecname", matnr); map.put("materialgroup", matkl); map.put("materialgroupdescription", wgbez); @@ -251,15 +255,21 @@ public class SAPToWMSController { //IDMFrameServiceProxy.getSqlTemplate().update(insertHistorySql, map); String sql="DELETE FROM materialspec WHERE materialspecname=? AND sitename=?"; + /* + 2025-04-25 + sitename = SDK Object[] obj=new Object[] {matnr,System.getProperty("company")}; + */ + Object[] obj=new Object[] {matnr,materialSpecSiteName}; + IDMFrameServiceProxy.getSqlTemplate().update(sql, obj); } else { String selectSql="SELECT count(1) num FROM materialspec WHERE materialspecname = :MATERIALSPECNAME AND sitename = :SITENAME"; - Object[] selectObj=new Object[] {matnr,System.getProperty("company")}; + Object[] selectObj=new Object[] {matnr,materialSpecSiteName}; Map hashMap = new HashMap (); hashMap.put("MATERIALSPECNAME", matnr); - hashMap.put("SITENAME", System.getProperty("company")); + hashMap.put("SITENAME", materialSpecSiteName); List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectSql, hashMap); String string = queryForList.get(0).get("NUM").toString(); if("0".equals(string)) {