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

rev: 修改缓存线显示全部位置

Browse Source
This commit is contained in:
liyongde
2023-04-04 17:26:47 +08:00
parent a3a0f637a2
commit 92c7134da6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,7 +860,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray()); AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray());
RedissonUtils.lock(() -> { RedissonUtils.lock(() -> {
// 生产区域 // 生产区域
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

@@ -198,7 +198,7 @@
md_me_materialbase.material_spec, md_me_materialbase.material_spec,
sch_cacheline_vehilematerial.quantity, sch_cacheline_vehilematerial.quantity,
sch_cacheline_vehilematerial.weight, sch_cacheline_vehilematerial.weight,
IF(length(sch_cacheline_position.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 5) AS vehicle_status IF(length(sch_cacheline_position.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 1) AS vehicle_status
FROM FROM
sch_cacheline_position sch_cacheline_position
LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code
@@ -212,7 +212,7 @@
sch_cacheline_position.cacheline_code = 输入.cacheline_code sch_cacheline_position.cacheline_code = 输入.cacheline_code
ENDOPTION ENDOPTION
ORDER BY ORDER BY
sch_cacheline_position.cacheline_code sch_cacheline_position.cacheline_code, sch_cacheline_position.layer_num, sch_cacheline_position.positionorder_no, sch_cacheline_position.cache_line_no
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF