root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字段名字修改

Browse Source
This commit is contained in:
liyongde
2023-03-28 19:03:14 +08:00
parent c898a8fc5b
commit 4885d9b897
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
View File

@@ -322,7 +322,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
//工序 //工序
String workprocedure_code = param.getString("workprocedure_code"); String workprocedure_code = param.getString("workprocedure_code");
// 缓存线 // 缓存线
String cacheLine_code = param.getString("cacheLine_code"); String cacheLine_code = param.getString("wcsdevice_code");
String weight = param.getString("weight"); String weight = param.getString("weight");
String quantity = param.getString("quantity"); String quantity = param.getString("quantity");
if(StringUtils.isEmpty(quantity) || param.getInteger("quantity") <= 0) { if(StringUtils.isEmpty(quantity) || param.getInteger("quantity") <= 0) {
@@ -838,11 +838,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
@Override @Override
public JSONArray getCacheLineMaterialInfo(JSONObject param) { public JSONArray getCacheLineMaterialInfo(JSONObject param) {
// 缓存线编码 point_code // 缓存线编码 point_code
String pointCode = param.getString("point_code"); String pointCode = param.getString("wcsdevice_code");
String productArea = param.getString("product_area");
AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray()); AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray());
RedissonUtils.lock(()->{ RedissonUtils.lock(()->{
// 生产区域 // 生产区域
String productArea = param.getString("product_area");
res.set(WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "8", "product_area", productArea, "cacheLine_code", pointCode)).process().getResultJSONArray(0)); res.set(WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "8", "product_area", productArea, "cacheLine_code", pointCode)).process().getResultJSONArray(0));
},pointCode,3); },pointCode,3);
return res.get(); return res.get();

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
View File

@@ -180,12 +180,12 @@
IF 输入.flag = "8" IF 输入.flag = "8"
QUERY QUERY
SELECT SELECT
sch_cacheline_position.cacheLine_code, sch_cacheline_position.cacheLine_code as wcsdevice_code,
sch_cacheline_position.position_code, sch_cacheline_position.position_code,
sch_cacheline_position.position_name, sch_cacheline_position.position_name,
sch_cacheline_position.vehicle_code, sch_cacheline_position.vehicle_code,
sch_cacheline_position.layer_num, sch_cacheline_position.layer_num,
sch_cacheline_position.positionOrder_no, sch_cacheline_position.positionorder_no as seat_order_num,
sch_cacheline_vehilematerial.workprocedure_code, sch_cacheline_vehilematerial.workprocedure_code,
sch_cacheline_vehilematerial.workprocedure_name, sch_cacheline_vehilematerial.workprocedure_name,
sch_cacheline_vehilematerial.material_uuid, sch_cacheline_vehilematerial.material_uuid,

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls
View File

Binary file not shown.