From a7cc3b31a7337cc1d2df9d6dcfd016980d6ebd8a Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 24 Apr 2025 11:06:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=96=B9=E6=B3=95=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=BB=84=E7=BB=87=E8=8E=B7=E5=8F=96=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/controller/StorageController.java | 51 +++++++++++++++----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
index 0de9d02..2c933e4 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
@@ -9,7 +9,11 @@ import com.cim.idm.model.CheckPlan1;
 import com.cim.idm.model.StorageSpec;
 import com.cim.idm.response.BaseResponse;
 import com.cim.idm.response.RespGenerator;
+import com.cim.idm.service.impl.MESServiceImpl;
 import com.cim.idm.utils.AjaxResult;
+import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
+import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
+import com.cim.idm.wmspackage.materialpacking.management.info.SetEventInfo;
 import com.cim.idm.wmspackage.storage.StorageServiceProxy;
 import com.cim.idm.wmspackage.storage.management.data.StorageSpecKey;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -18,10 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 货位控制器
@@ -90,18 +91,48 @@ public class StorageController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getLocationNameForERPLocation", method = RequestMethod.POST)
-	public AjaxResult getLocationName2(@RequestBody JSONObject in ){
+	public AjaxResult getLocationName2(@RequestBody JSONObject in )  throws Exception {
 
 		StorageSpec storageSpec = JSON.toJavaObject(in, StorageSpec.class);
-		String erplocation = storageSpec.getErpLocation();
-		String siteName = storageSpec.getSITENAME();
+		//String erplocation = storageSpec.getErpLocation();
+		String erpLocation = storageSpec.getErpLocation();
+		String areaName = "";
 //		String commitDate = storageSpec.getCommitDate();
 		//判断条码是否存在且状态是在库
 		//String sql = "SELECT m.STORAGENAME ,m.DESCRIPTION || m.STORAGENAME DESCRIPTION  FROM STORAGESPEC m WHERE m.ERPLOCATION = :ERPLOCATION ORDER BY STORAGENAME ";
-		String sql = "SELECT m.STORAGENAME ,m.DESCRIPTION || m.STORAGENAME DESCRIPTION  FROM STORAGESPEC m ORDER BY STORAGENAME ";
-
+		String sql = " SELECT\n" +
+				"\tm.STORAGENAME,\n" +
+				"\tm.STORAGENAME || ' ' || m.DESCRIPTION DESCRIPTION \n" +
+				"FROM\n" +
+				"\tSTORAGESPEC m \n" +
+				"WHERE\n" +
+				"\tm.SITENAME =:SITENAME\n" +
+				"\tAND m.AREANAME =:AREANAME\n" +
+				"ORDER BY\n" +
+				"\tSTORAGENAME ";
+		switch (erpLocation) {
+			case "1010":
+			case "1020":
+				areaName = "SH";
+				break;
+			case "1030":
+				areaName = "TC";
+				break;
+			case "1050":
+				areaName = "CQ";
+				break;
+			case "1060":
+				areaName = "DG";
+				break;
+			case "3500":
+				areaName = "YN";
+				break;
+			default :
+				break;
+		}
 		Map<String, Object> bindMap = new HashMap<String, Object>();
-		//bindMap.put("SITENAME",siteName);
+		bindMap.put("SITENAME","SDK");
+		bindMap.put("AREANAME",areaName);
 		List<Map<String,Object>> list = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, bindMap);
 
 		if(Objects.isNull(list) || list.isEmpty()) {