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

根据最新字典表数值修改所有为0开头的的载具状态。

Browse Source
This commit is contained in:
baoge
2023-03-28 09:12:32 +08:00
parent 3d8ed010b9
commit 60ba6a5011
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,11 +191,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject taskObject = taskTab.query("task_id =" + param.getString("instruct_uuid")).uniqueResult(0); JSONObject taskObject = taskTab.query("task_id =" + param.getString("instruct_uuid")).uniqueResult(0);
//01-取消、02-完成、03-任务下发，根据操作类型执行相关操作 //01-取消、02-完成、03-任务下发，根据操作类型执行相关操作
if("01".equals(optType) || "02".equals(optType)) { if("1".equals(optType) || "2".equals(optType)) {
return updateTaskStatus(taskObject, optType); return updateTaskStatus(taskObject, optType);
} }
//任务下发 //任务下发
else if("03".equals(optType)) { else if("3".equals(optType)) {
return SpeMachineryTask.createTask(taskObject); return SpeMachineryTask.createTask(taskObject);
} }
else{ else{
@@ -270,13 +270,13 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
json.put("quantity", "0"); json.put("quantity", "0");
//不展示 //不展示
if("0".equals(json.getString("is_show"))) { if("0".equals(json.getString("is_show"))) {
json.put("vehicle_status", "04"); json.put("vehicle_status", "4");
} }
//展示 //展示
else{ else{
//是否空位 //是否空位
if("1".equals(json.getString("is_empty"))) { if("1".equals(json.getString("is_empty"))) {
json.put("vehicle_status", "00"); json.put("vehicle_status", "0");
} }
else{ else{
// 载具不是空位 // 载具不是空位
@@ -285,7 +285,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
JSONObject ivtObj = ivtTab.query("vehicle_code = '" + vehicle_code + "' and cacheLine_code like '%" + param.getString("wcsdevice_code") + "%'").uniqueResult(0); JSONObject ivtObj = ivtTab.query("vehicle_code = '" + vehicle_code + "' and cacheLine_code like '%" + param.getString("wcsdevice_code") + "%'").uniqueResult(0);
if(ivtObj == null) { if(ivtObj == null) {
//标记为红色异常 //标记为红色异常
json.put("vehicle_status", "03"); json.put("vehicle_status", "3");
} }
else{ else{
json.put("vehicle_status", ivtObj.getString("vehicle_status")); json.put("vehicle_status", ivtObj.getString("vehicle_status"));
@@ -447,7 +447,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
afterIvt.put("vehmaterial_id", IdUtil.getStringId()); afterIvt.put("vehmaterial_id", IdUtil.getStringId());
afterIvt.put("vehicle_code", vehicle_code); afterIvt.put("vehicle_code", vehicle_code);
afterIvt.put("cacheLine_code", cacheLine_code); afterIvt.put("cacheLine_code", cacheLine_code);
afterIvt.put("vehicle_status", "01"); afterIvt.put("vehicle_status", "1");
afterIvt.put("update_time", DateUtil.now()); afterIvt.put("update_time", DateUtil.now());
afterIvt.put("create_time", DateUtil.now()); afterIvt.put("create_time", DateUtil.now());
vehMaterTab.insert(afterIvt); vehMaterTab.insert(afterIvt);
@@ -455,7 +455,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
// 出空箱 // 出空箱
if("2".equals(inOut_type)) { if("2".equals(inOut_type)) {
// 缓存线载具物料表 // 缓存线载具物料表
JSONObject json = vehMaterTab.query("cacheLine_code = '" + cacheLine_code + "' and vehicle_status= '01' and vehicle_code = '" + vehicle_code + "'").uniqueResult(0); JSONObject json = vehMaterTab.query("cacheLine_code = '" + cacheLine_code + "' and vehicle_status= '1' and vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
if(json == null) { if(json == null) {
throw new BadRequestException("无法找到缓存线【" + cacheLine_code + "】的空箱【" + vehicle_code + "】，出空箱失败"); throw new BadRequestException("无法找到缓存线【" + cacheLine_code + "】的空箱【" + vehicle_code + "】，出空箱失败");
} }
@@ -644,12 +644,12 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
json.put("material_name", meObj.getString("material_name")); json.put("material_name", meObj.getString("material_name"));
json.put("quantity", instructObj.getString("material_qty")); json.put("quantity", instructObj.getString("material_qty"));
json.put("product_area", instructObj.getString("product_area")); json.put("product_area", instructObj.getString("product_area"));
json.put("vehicle_status", "02"); json.put("vehicle_status", "2");
} }
// 出满箱扫码异常 // 出满箱扫码异常
if("2".equals(inOut_type)) { if("2".equals(inOut_type)) {
//5.重新新建该缓存线位置上的料箱为空箱子，是空料箱没有放物料等其他信息 //5.重新新建该缓存线位置上的料箱为空箱子，是空料箱没有放物料等其他信息
json.put("vehicle_status", "01"); json.put("vehicle_status", "1");
json.put("material_uuid", ""); json.put("material_uuid", "");
json.put("material_code", ""); json.put("material_code", "");
json.put("material_spec", ""); json.put("material_spec", "");
@@ -776,7 +776,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
String opt_type = param.getString("opt_type"); String opt_type = param.getString("opt_type");
// 类型:恢复是0，暂停是1 // 类型:恢复是0，暂停是1
String type = "1"; String type = "1";
if("02".equals(opt_type)) { if("2".equals(opt_type)) {
type = "0"; type = "0";
} }
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();