diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java index 1ab56956..2701c5c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java @@ -322,7 +322,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ //工序 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 quantity = param.getString("quantity"); if(StringUtils.isEmpty(quantity) || param.getInteger("quantity") <= 0) { @@ -838,11 +838,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ @Override public JSONArray getCacheLineMaterialInfo(JSONObject param) { // 缓存线编码 point_code - String pointCode = param.getString("point_code"); + String pointCode = param.getString("wcsdevice_code"); + String productArea = param.getString("product_area"); AtomicReference res = new AtomicReference<>(new JSONArray()); 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)); },pointCode,3); return res.get(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql index 8c83281b..2b215acb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql @@ -180,12 +180,12 @@ IF 输入.flag = "8" QUERY SELECT - sch_cacheline_position.cacheLine_code, + sch_cacheline_position.cacheLine_code as wcsdevice_code, sch_cacheline_position.position_code, sch_cacheline_position.position_name, sch_cacheline_position.vehicle_code, 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_name, sch_cacheline_vehilematerial.material_uuid, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index ff5ecf07..ada8eefe 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ