From d6eb8a4a31180a22ebf1afdabf52985d3646b07c Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Fri, 25 Apr 2025 10:14:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=AE=BE=E7=BD=AEMATERIALS?=
 =?UTF-8?q?PEC=E8=A1=A8=E7=9A=84SITENAME=E4=B8=BASDK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/controller/SAPToWMSController.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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<String, Object> map = new HashMap<String,Object>();
-				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<String, Object> hashMap = new HashMap<String,Object> ();
 					hashMap.put("MATERIALSPECNAME", matnr);
-					hashMap.put("SITENAME", System.getProperty("company"));
+					hashMap.put("SITENAME", materialSpecSiteName);
 					List<Map<String, Object>> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectSql, hashMap);
 					String string = queryForList.get(0).get("NUM").toString();
 					if("0".equals(string)) {