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

修改任务查询查询条件。

Browse Source
This commit is contained in:
baoge
2023-03-29 10:12:49 +08:00
parent 6e74b9dcf3
commit 2420791a15
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -331,6 +331,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{
public void updateRedis() { public void updateRedis() {
JSONArray materialJsonArray = WQL.getWO("PDA_QUERY").addParam("flag", "5").process().getResultJSONArray(0); JSONArray materialJsonArray = WQL.getWO("PDA_QUERY").addParam("flag", "5").process().getResultJSONArray(0);
List<MaterialDto> finalMaterialList = materialJsonArray.toJavaList(MaterialDto.class); List<MaterialDto> finalMaterialList = materialJsonArray.toJavaList(MaterialDto.class);
redisUtils.set("materialList", finalMaterialList); redisUtils.set("hl_one_wms:cacheLineHand:materialList", finalMaterialList);
} }
} }

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

@@ -79,15 +79,15 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
List<MaterialDto> materialList; List<MaterialDto> materialList;
ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll();
//12W种物料信息，查本地缓存 //12W种物料信息，查本地缓存
materialList = cache.get("materialList"); materialList = cache.get("hl_one_wms:cacheLineHand:materialList");
if(null != materialList) { if(null != materialList) {
return getMaterialDto(materialList, param); return getMaterialDto(materialList, param);
} }
//2.查reids //2.查reids
materialList = redisUtils.get("materialList", MaterialDto.class); materialList = redisUtils.get("hl_one_wms:cacheLineHand:materialList", MaterialDto.class);
if(null != materialList) { if(null != materialList) {
// //设置本地缓存 // //设置本地缓存
cache.setLocalCache("materialList", materialList); cache.setLocalCache("hl_one_wms:cacheLineHand:materialList", materialList);
return getMaterialDto(materialList, param); return getMaterialDto(materialList, param);
} }
//3.查db //3.查db
@@ -95,10 +95,10 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
materialList = materialJsonArray.toJavaList(MaterialDto.class); materialList = materialJsonArray.toJavaList(MaterialDto.class);
//缓存到redis //缓存到redis
List<MaterialDto> finalMaterialList1 = materialList; List<MaterialDto> finalMaterialList1 = materialList;
CompletableFuture<Void> f1 = CompletableFuture.runAsync(() -> redisUtils.set("materialList", finalMaterialList1), pool); CompletableFuture<Void> f1 = CompletableFuture.runAsync(() -> redisUtils.set("hl_one_wms:cacheLineHand:materialList", finalMaterialList1), pool);
//缓存到本地 //缓存到本地
List<MaterialDto> finalMaterialList = materialList; List<MaterialDto> finalMaterialList = materialList;
CompletableFuture<Void> f2 = CompletableFuture.runAsync(() -> cache.setLocalCache("materialList", finalMaterialList), pool); CompletableFuture<Void> f2 = CompletableFuture.runAsync(() -> cache.setLocalCache("hl_one_wms:cacheLineHand:materialList", finalMaterialList), pool);
f1.exceptionally((e) -> { f1.exceptionally((e) -> {
throw new BadRequestException("物料信息缓存redis失败"); throw new BadRequestException("物料信息缓存redis失败");
}); });
@@ -162,8 +162,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
map.put("status", task_status.replace("-1", "")); map.put("status", task_status.replace("-1", ""));
} }
//任务编号 //任务编号
if(StrUtil.isNotEmpty(whereJson.getString("task_code"))) { if(StrUtil.isNotEmpty(whereJson.getString("inst_num"))) {
map.put("task_code", "%" + whereJson.getString("task_code") + "%"); map.put("inst_num", "%" + whereJson.getString("inst_num") + "%");
} }
//起点 //起点
if(StrUtil.isNotEmpty(whereJson.getString("start_point"))) { if(StrUtil.isNotEmpty(whereJson.getString("start_point"))) {
@@ -542,7 +542,6 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
* 料箱码 vehicle_code * 料箱码 vehicle_code
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public String inOutExceptionInstConfirm(JSONObject param) { public String inOutExceptionInstConfirm(JSONObject param) {
// 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码 // 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码
String inOut_type = param.getString("inOut_type"); String inOut_type = param.getString("inOut_type");
@@ -560,17 +559,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
jsonObject.put("vehicle_code", vehicle_code); jsonObject.put("vehicle_code", vehicle_code);
jsonObject.put("position_code", position_code); jsonObject.put("position_code", position_code);
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
try { //TOFIX 等确定api后，换成下发的url
//TOFIX 等确定api后，换成下发的url return AcsUtil.notifyAcs("api", jsonArray).getString("status");
return AcsUtil.notifyAcs("api", jsonArray).getString("status");
}
catch(Exception e) {
throw new BadRequestException(e.getMessage());
}
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public String cacheLineExcepOpt(JSONObject param) { public String cacheLineExcepOpt(JSONObject param) {
// 缓存线编码 // 缓存线编码
String wcsdevice_code = param.getString("wcsdevice_code"); String wcsdevice_code = param.getString("wcsdevice_code");
@@ -586,13 +579,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
jsonObject.put("type", type); jsonObject.put("type", type);
jsonObject.put("wcsdevice_code", wcsdevice_code); jsonObject.put("wcsdevice_code", wcsdevice_code);
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
try { //TOFIX 等确定api后，换成下发的url
//TOFIX 等确定api后，换成下发的url return AcsUtil.notifyAcs("api", jsonArray).getString("status");
return AcsUtil.notifyAcs("api", jsonArray).getString("status");
}
catch(Exception e) {
throw new BadRequestException(e.getMessage());
}
} }
/** /**
@@ -840,10 +828,10 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
String pointCode = param.getString("wcsdevice_code"); String pointCode = param.getString("wcsdevice_code");
String productArea = param.getString("product_area"); String productArea = param.getString("product_area");
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();
} }
@@ -854,7 +842,6 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void deleteBox(JSONObject param) { public void deleteBox(JSONObject param) {
WQLObject cvTab = WQLObject.getWQLObject("SCH_CacheLine_VehileMaterial"); WQLObject cvTab = WQLObject.getWQLObject("SCH_CacheLine_VehileMaterial");
String vehicleCode = param.getString("vehicle_code"); String vehicleCode = param.getString("vehicle_code");

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

@@ -22,6 +22,7 @@
输入.start_point TYPEAS s_string 输入.start_point TYPEAS s_string
输入.end_point TYPEAS s_string 输入.end_point TYPEAS s_string
输入.start_date TYPEAS s_string 输入.start_date TYPEAS s_string
输入.vehicle_code TYPEAS s_string
输入.end_date TYPEAS s_string 输入.end_date TYPEAS s_string
输入.task_id TYPEAS s_string 输入.task_id TYPEAS s_string