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

压机叫料时序修改 压机叫料任务未正常完成 未正常更新条码

Browse Source
This commit is contained in:
张江玮
2023-01-05 15:57:26 +08:00
parent 6733004128
commit 6bbfcae338
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
View File

@@ -497,7 +497,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
json.put("type", "3"); json.put("type", "3");
JSONObject resp = acsToWmsService.apply(json); JSONObject resp = acsToWmsService.apply(json);
if (StrUtil.equals(resp.getString("status"), "200")) { if (StrUtil.equals(resp.getString("status"), "200")) {
this.writing(8); this.writing(6);
this.setCallMaterialRequireSucess(true); this.setCallMaterialRequireSucess(true);
logServer.deviceInfo("acs申请任务", this.getDevice_code(), "压机叫料任务申请成功!"); logServer.deviceInfo("acs申请任务", this.getDevice_code(), "压机叫料任务申请成功!");
} }

8
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -321,9 +321,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//如果是的话说明困料区来的 先去库存表查询对应的条码的物料信息 并将对应的物料信息保存在redis中 //如果是的话说明困料区来的 先去库存表查询对应的条码的物料信息 并将对应的物料信息保存在redis中
if (StrUtil.equals(is_first, "true")) { if (StrUtil.equals(is_first, "true")) {
JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0); JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0);
redisUtils.set(barcode, ivtJson.getString("material_id")); if (ObjectUtil.isNotEmpty(ivtJson)) {
redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty")); redisUtils.set(barcode, ivtJson.getString("material_id"));
materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id")); redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty"));
materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id"));
}
} }
Object redis_material_id = redisUtils.get(barcode); Object redis_material_id = redisUtils.get(barcode);
String material_id = ObjectUtil.isEmpty(redis_material_id) ? null : String.valueOf(redis_material_id); String material_id = ObjectUtil.isEmpty(redis_material_id) ? null : String.valueOf(redis_material_id);

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java
View File

@@ -70,14 +70,14 @@ public class YljCallMaterialTask extends AbstractAcsTask {
pointTab.update(jsonStart); pointTab.update(jsonStart);
} }
if (StrUtil.equals(status, "1")) { if (StrUtil.equals(status, TaskStatusEnum.EXECUTING.getCode())) {
// 更新任务状态为执行中 // 更新任务状态为执行中
taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode());
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); taskTab.update(taskObj);
} }
if (StrUtil.equals(status, "2")) { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
//判断状态, //判断状态,
if (StrUtil.equals("2", taskObj.getString("task_status"))) { if (StrUtil.equals("2", taskObj.getString("task_status"))) {