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

update 库位查询通用方法，根据登录组织获取库位

Browse Source
This commit is contained in:
18110972313 2025-04-24 11:06:47 +08:00
parent 1f345b3d58
commit a7cc3b31a7
1 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
View File

@ -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()) {