diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java index 0f7a6210..bb3b0157 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java @@ -34,7 +34,7 @@ public class RedissonUtils { if (isLock){ process.process(); } else { - throw new BadRequestException("当前业务 key:"+key+"正在锁定请稍后再试"); + throw new BadRequestException("当前业务 key:"+key+"正在执行请稍后再试"); } }finally { if (isLock){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 66b5d99f..847697f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -120,7 +120,6 @@ public class AcsToWmsController { } - @GetMapping("/taskPublish") @Log("taskPublish") @ApiOperation("taskPublish") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index e2aac724..9da7db27 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -8,6 +8,8 @@ import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.RedissonUtils; +import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.common.utils.api.ResultCode; import org.nl.modules.common.exception.BizCoreException; import org.nl.wms.mps.service.ProduceshiftorderService; @@ -93,7 +95,10 @@ public class ProduceshiftorderController{ @Log("看板开工") @ApiOperation("看板开工") public ResponseEntity openStart(@RequestBody JSONObject param) { - return new ResponseEntity<>(iPdmProduceWorkorderService.openStart(param), HttpStatus.OK); + RedissonUtils.lock(()->{ + iPdmProduceWorkorderService.openStart(param); + },param.getString("workorder_id"),null); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> new JSONObject()),HttpStatus.OK); } @PostMapping("/saveReport") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java index 8fff62e4..df45e532 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java @@ -50,7 +50,6 @@ public class TaskServiceImpl implements TaskService { HashMap map = new HashMap<>(); map.put("flag", "1"); - JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); String task_status = whereJson.getString("task_status"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index 8f42c1a6..462a29a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -223,7 +223,6 @@ public class SpeFullTask extends AbstractAcsTask { vehilematerial.setQuantity(task.getMaterial_qty()); cacheLineVechileService.save(vehilematerial); } - break; case STATUS_FINISH: taskService.update(new UpdateWrapper() @@ -251,12 +250,17 @@ public class SpeFullTask extends AbstractAcsTask { .set("update_name", "acs") .set("update_time", DateUtil.now()).eq("task_id", task.getTask_id()); log.info("生坑到料完成："+param.toString()); + taskService.update(wrapper); if (extParam.get("fall_finish") != null){ + //TODO:添加任务唯一性校验防止重复更新 PdmBiDevice one = deviceService.getOne(new QueryWrapper().eq("device_code", task.getPoint_code2())); - deviceService.update(new UpdateWrapper() - .set("material_id", task.getMaterial_id()) - .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty())) - .eq("device_code", task.getPoint_code2())); + if (!one.getRemark().equals("fall_finish"+task.getTask_id())){ + deviceService.update(new UpdateWrapper() + .set("material_id", task.getMaterial_id()) + .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty())) + .set("remark","fall_finish"+task.getTask_id()) + .eq("device_code", task.getPoint_code2())); + } } break; case STATUS_FINISH: diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/rest/TaskController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java diff --git a/mes/hd/nladmin-system/src/main/resources/scheduler.xml b/mes/hd/nladmin-system/src/main/resources/scheduler.xml index 0198fab3..b9aa5b65 100644 --- a/mes/hd/nladmin-system/src/main/resources/scheduler.xml +++ b/mes/hd/nladmin-system/src/main/resources/scheduler.xml @@ -8,11 +8,9 @@ - + - - diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 77547392..115daaf6 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -132,11 +132,12 @@ /> + - + 任务调度 { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }) + }, buildTree(classes) { classes.forEach(data => { if (data.children) { diff --git a/mes/qd/src/views/wms/scheduler_manage/task/task.js b/mes/qd/src/views/wms/scheduler_manage/task/task.js index 98d53708..4b534246 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/task.js +++ b/mes/qd/src/views/wms/scheduler_manage/task/task.js @@ -58,6 +58,12 @@ export function operation(data) { data }) } +export function scheduler() { + return request({ + url: '/api/acsToWms/task/taskPublish', + method: 'get' + }) +} export default { add, @@ -67,5 +73,6 @@ export default { getTaskStatus, getTaskType, getAcsTaskType, - getFinishType + getFinishType, + scheduler } diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue index 8852c9bf..87866367 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue @@ -157,7 +157,7 @@ - + @@ -168,13 +168,13 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker/index' -import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog' +// import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog' import { mapGetters } from 'vuex' import crudStorattr from '@/api/wms/basedata/st/storattr' export default { name: 'MoreOrLess', - components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, + components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, cruds() { return CRUD({ title: '',