From e64d4f33891e3bbd846c37bcc01089670afa7cfa Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Sat, 15 Feb 2025 17:11:44 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/order/rest/OrderController.java | 8 + .../nl/acs/order/service/OrderService.java | 7 + .../nl/acs/order/service/dto/OrderDto.java | 10 +- .../order/service/impl/OrderServiceImpl.java | 26 ++ .../org/nl/acs/sch/task/service/dao/Work.java | 3 + .../nl/acs/sch/task/service/dto/WorkDto.java | 2 + .../task/service/impl/WorkServiceImpl.java | 40 +++- .../task/service/impl/TaskServiceImpl.java | 4 +- .../nl/hand/controller/HandController.java | 12 + .../org/nl/hand/controller/PdaController.java | 11 + .../java/org/nl/hand/service/HandService.java | 5 + .../java/org/nl/hand/service/PdaService.java | 2 + .../nl/hand/service/dao/mapper/PdaMapper.xml | 9 +- .../nl/hand/service/impl/HandServiceImpl.java | 62 +++++ .../nl/hand/service/impl/PdaServiceImpl.java | 43 ++++ .../java/org/nl/hand/service/vo/OrderVo.java | 2 + .../java/org/nl/hand/service/vo/WorkVo.java | 2 +- acs/nladmin-ui/src/views/acs/order/index.vue | 223 +++++++++++++++++- acs/nladmin-ui/src/views/acs/order/order.js | 10 +- acs/nladmin-ui/src/views/acs/work/index.vue | 8 +- 20 files changed, 454 insertions(+), 35 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/rest/OrderController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/rest/OrderController.java index ff41e6e..9369b41 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/rest/OrderController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/rest/OrderController.java @@ -78,6 +78,14 @@ public class OrderController { return new ResponseEntity<>(HttpStatus.OK); } + @Log("强制完成") + + @PostMapping("/updateOrder") + public ResponseEntity updateOrder(@RequestBody JSONObject whereJson) { + orderService.updateOrder(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + @Log("开始") @PostMapping("/start") diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/OrderService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/OrderService.java index 2eeedac..5ba87b5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/OrderService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/OrderService.java @@ -76,6 +76,13 @@ public interface OrderService extends CommonService { */ void forceFinish(JSONObject whereJson); + /** + * 起点终点确认 + * + * @param whereJson / + */ + void updateOrder(JSONObject whereJson); + /** * 称重 * diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/dto/OrderDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/dto/OrderDto.java index 704bbb4..e9e469e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/dto/OrderDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/dto/OrderDto.java @@ -112,10 +112,16 @@ public class OrderDto extends CommonModel implements Serializable { private String is_delete; + + /** + * 起点编码 + */ + private String start_device_code; + /** - * 点位编码 + * 终点编码 */ - private String point_code; + private String next_device_code; /** * 明细数量 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/impl/OrderServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/impl/OrderServiceImpl.java index 0a2d855..a20e8b2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/impl/OrderServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/order/service/impl/OrderServiceImpl.java @@ -217,6 +217,32 @@ public class OrderServiceImpl extends CommonServiceImpl i orderMapper.updateById(orderDto); } + @Override + public void updateOrder(JSONObject whereJson) { + String workorder_id = whereJson.getString("workorder_id"); + String start_device_code = whereJson.getString("start_device_code"); + String next_device_code = whereJson.getString("next_device_code"); + if (StrUtil.isEmpty(workorder_id)){ + throw new BadRequestException("工单号为空！"); + } + if (StrUtil.isEmpty(start_device_code)){ + throw new BadRequestException("起点编码不能为空"); + } + if (StrUtil.isEmpty(next_device_code)){ + throw new BadRequestException("终点编码不能为空"); + } + String currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + OrderDto orderDto = orderMapper.selectById(workorder_id); + + orderDto.setStart_device_code(start_device_code); + orderDto.setNext_device_code(next_device_code); + orderDto.setUpdate_optid(currentUserId); + orderDto.setUpdate_optname(currentUsername); + orderDto.setUpdate_time(DateUtil.now()); + orderMapper.updateById(orderDto); + } + @Override public void start(JSONObject whereJson) { String workorder_id = whereJson.getString("workorder_id"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dao/Work.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dao/Work.java index c976c0c..a3b5b5b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dao/Work.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dao/Work.java @@ -80,4 +80,7 @@ public class Work implements Serializable { * 修改时间 */ private String update_time; + + + private String next_device_code; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dto/WorkDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dto/WorkDto.java index b5eadc3..2022a35 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dto/WorkDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/dto/WorkDto.java @@ -66,4 +66,6 @@ public class WorkDto implements Serializable { * 修改时间 */ private String update_time; + + private String next_device_code; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java index ca4dc85..7b3eaba 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java @@ -109,6 +109,9 @@ public class WorkServiceImpl extends ServiceImpl implements Wo if (ObjectUtil.isEmpty(work)) { throw new BadRequestException("不存在该配料任务"); } + if (CommonFinalParam.ONE.equals(work.getStatus())) { + throw new BadRequestException("该配料任务已下发，请勿重复下发!"); + } String mfg_order_name = work.getMfg_order_name(); List works = workMapper.selectList(Wrappers.lambdaQuery(Work.class).eq(Work::getMfg_order_name, mfg_order_name).eq(Work::getStatus, TaskStatus.EXECUTING.getCode())); if (works.size() != 0) { @@ -157,20 +160,33 @@ public class WorkServiceImpl extends ServiceImpl implements Wo if (StrUtil.equals(CommonFinalParam.FINISHED, work.getStatus())) { throw new BadRequestException("该配料任务已完成!"); } - String resource_name = work.getResource_name(); + String mfg_order_name = work.getMfg_order_name(); + OrderDto dto = orderService.findByCode(mfg_order_name); + if (ObjectUtil.isEmpty(dto)){ + throw new BadRequestException("工单不存在"); + } TaskDto taskDto = new TaskDto(); - taskDto.setStart_device_code("T1"); - taskDto.setNext_device_code(resource_name); - taskDto.setTask_type(CommonFinalParam.TYPE_THREE); + String next_device_code = work.getNext_device_code(); + String next_device_code1 = dto.getNext_device_code(); + if (StrUtil.isNotEmpty(next_device_code)) { + taskDto.setNext_device_code(next_device_code); + }else if (StrUtil.isNotEmpty(next_device_code1)) { + taskDto.setNext_device_code(next_device_code1); + }else { + throw new BadRequestException("工单起点和终点未确认！"); + } + + taskDto.setStart_device_code("QZJYTW2"); + taskDto.setTask_type(CommonFinalParam.ONE); taskDto.setAgv_system_type(CommonFinalParam.TWO); taskDto.setWork_id(id); - AcsPoint point = acsPointService.findByCode("T1"); - if (ObjectUtil.isEmpty(point)) { - throw new BadRequestException("不存在T1点位"); - } - if (!point.getIs_used().booleanValue() || point.getPoint_status().equals(CommonFinalParam.ONE)) { - throw new BadRequestException("T1点位被占用"); - } +// AcsPoint point = acsPointService.findByCode("T1"); +// if (ObjectUtil.isEmpty(point)) { +// throw new BadRequestException("不存在T1点位"); +// } +// if (!point.getIs_used().booleanValue() || point.getPoint_status().equals(CommonFinalParam.ONE)) { +// throw new BadRequestException("T1点位被占用"); +// } try { taskService.create(taskDto); } catch (Exception e) { @@ -182,8 +198,6 @@ public class WorkServiceImpl extends ServiceImpl implements Wo work.setStatus(TaskStatus.FINISHED.getCode()); } workMapper.updateById(work); - String mfg_order_name = work.getMfg_order_name(); - OrderDto dto = orderService.findByCode(mfg_order_name); List works = workMapper.selectList(Wrappers.lambdaQuery(Work.class).eq(Work::getMfg_order_name, mfg_order_name).eq(Work::getStatus, TaskStatus.FINISHED.getCode())); // 工单所有配料任务都完成，则工单状态改为已完成 if (works.size() == dto.getDetail_count()) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 0a686ee..ad70911 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -587,8 +587,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme task_code = CodeUtil.getNewCode("TASK_NO"); task_code = CommonFinalParam.HYPHEN_ + task_code; } - String start_device_code = dto.getStart_point_code(); - String next_device_code = dto.getNext_point_code(); + String start_device_code = dto.getStart_device_code(); + String next_device_code = dto.getNext_device_code(); String route_plan_code = dto.getRoute_plan_code(); dto.setCreate_by(StrUtil.isNotEmpty(currentUsername) ? currentUsername : "LMS"); dto.setUpdate_by(currentUsername); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/HandController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/HandController.java index 894ac0c..b3ef776 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/HandController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/HandController.java @@ -34,9 +34,21 @@ public class HandController { return new ResponseEntity<>(handService.query(), HttpStatus.OK); } + @PostMapping("/queryZDDevice") + @Log("查询终点设备") + public ResponseEntity queryZDDevice(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(handService.queryZDDevice(whereJson), HttpStatus.OK); + } + @Log("确认配料作业") @PostMapping(value = "/confirm") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(handService.confirm(whereJson),HttpStatus.OK); } + + @Log("确认配料作业") + @PostMapping(value = "/confirmZZDevice") + public ResponseEntity confirmZZDevice(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(handService.confirmZZDevice(whereJson),HttpStatus.OK); + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/PdaController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/PdaController.java index 2eff228..3d1007b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/PdaController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/controller/PdaController.java @@ -28,6 +28,8 @@ public class PdaController { @Autowired private PdaService pdaService; + + @PostMapping("/queryOrders") @Log("工单查询") public ResponseEntity queryOrders() { @@ -65,6 +67,15 @@ public class PdaController { return new ResponseEntity<>(pdaService.forceFinish(whereJson),HttpStatus.OK); } + @Log("修改工单") + + @PostMapping("/updateOrder") + public ResponseEntity updateOrder(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaService.updateOrder(whereJson),HttpStatus.OK); + } + + + @Log("下发配料作业") @PostMapping(value = "/sendWork") public ResponseEntity sendWork(@RequestBody JSONObject whereJson) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/HandService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/HandService.java index 241339a..c0accc2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/HandService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/HandService.java @@ -1,5 +1,6 @@ package org.nl.hand.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.hand.service.dao.vo.PdaResponseVo; import org.nl.hand.service.vo.WorkVo; @@ -10,4 +11,8 @@ public interface HandService { List query(); PdaResponseVo confirm(JSONObject whereJson); + + PdaResponseVo confirmZZDevice(JSONObject whereJson); + + JSONArray queryZDDevice(JSONObject whereJson); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java index 30ffb61..95540ed 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java @@ -23,6 +23,8 @@ public interface PdaService { PdaResponseVo forceFinish(JSONObject whereJson); + PdaResponseVo updateOrder(JSONObject whereJson); + List queryWorks(JSONObject whereJson); List getExcWorks(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/dao/mapper/PdaMapper.xml b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/dao/mapper/PdaMapper.xml index 7768072..c839743 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/dao/mapper/PdaMapper.xml +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/dao/mapper/PdaMapper.xml @@ -6,7 +6,8 @@ product_name, description, resource_name, - point_code, + start_device_code, + next_device_code, total_qty, Case status WHEN '0' THEN '就绪' @@ -26,7 +27,7 @@ material_code, material_name, qty, - resource_name, + next_device_code, require_num, remain_num, Case status @@ -51,7 +52,7 @@ material_code, material_name, qty, - resource_name, + next_device_code, require_num, remain_num, Case status @@ -61,6 +62,6 @@ ELSE '' END AS status FROM work - where status != '2' ORDER BY work.mfg_order_name asc ,work.seq_no asc + where status = '1' ORDER BY work.mfg_order_name asc ,work.seq_no asc diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java index caaf785..c5b99b4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java @@ -1,9 +1,19 @@ package org.nl.hand.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.domain.Device; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.order.service.OrderService; +import org.nl.acs.order.service.dto.OrderDto; import org.nl.acs.sch.task.service.WorkService; import org.nl.acs.sch.task.service.dao.Work; +import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.hand.service.HandService; import org.nl.hand.service.PdaService; import org.nl.hand.service.dao.vo.PdaResponseVo; @@ -20,6 +30,10 @@ public class HandServiceImpl implements HandService { private PdaService pdaService; @Autowired private WorkService workService; + @Autowired + private DeviceService deviceService; + @Autowired + private OrderService orderService; @Override @@ -36,4 +50,52 @@ public class HandServiceImpl implements HandService { workService.confirm(work.getWork_id()); return PdaResponseVo.pdaResultOk("配料作业确认成功"); } + + @Override + public PdaResponseVo confirmZZDevice(JSONObject whereJson) { + if (StrUtil.isEmpty(whereJson.getString("work_code"))){ + throw new BadRequestException("配料作业编码不能为空"); + } + if (StrUtil.isEmpty(whereJson.getString("next_device_code"))){ + throw new BadRequestException("终点设备编码不能为空"); + } + Work work = workService.findByCode(whereJson.getString("work_code")); + if (work == null){ + return PdaResponseVo.pdaResultOk("配料作业不存在"); + } + work.setNext_device_code(whereJson.getString("next_device_code")); + workService.update(work); + return PdaResponseVo.pdaResultOk("终点确认完成"); + } + + @Override + public JSONArray queryZDDevice(JSONObject whereJson) { + String mfg_order_name = whereJson.getString("mfg_order_name"); + if (StrUtil.isEmpty(mfg_order_name)){ + throw new BadRequestException("工单号不能为空"); + } + OrderDto dto = orderService.findByCode(mfg_order_name); + String resource_name = dto.getResource_name(); + if (StrUtil.isEmpty(resource_name)){ + throw new BadRequestException("工单号为："+mfg_order_name+"的产线ID为空"); + } + + //查询所有设备 + List list = deviceService.lambdaQuery() + .eq(Device::getRegion,resource_name) + .list(); + if (CollectionUtil.isEmpty(list)) { + throw new BadRequestException(LangProcess.msg("error_no_regional")); + } + JSONArray arr = JSONArray.parseArray(JSON.toJSONString(list)); + JSONArray result = new JSONArray(); + for (int i = 0; i < arr.size(); i++) { + JSONObject obj = arr.getJSONObject(i); + JSONObject json = new JSONObject(); + json.put("device_code", obj.getString("device_code")); + json.put("device_name", obj.getString("device_name")); + result.add(json); + } + return result; + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java index 2ea79ed..eb50db3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java @@ -54,7 +54,13 @@ public class PdaServiceImpl implements PdaService { @Override public PdaResponseVo startOrder(JSONObject whereJson) { String mfg_order_name = whereJson.getString("mfg_order_name"); + if (StrUtil.isEmpty(mfg_order_name)){ + return PdaResponseVo.pdaResultOk("工单号为空！"); + } OrderDto dto = orderService.findByCode(mfg_order_name); + if (ObjectUtil.isNull(dto)){ + return PdaResponseVo.pdaResultOk("工单不存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); dto.setStatus("1"); @@ -69,7 +75,13 @@ public class PdaServiceImpl implements PdaService { @Override public PdaResponseVo forceFinish(JSONObject whereJson) { String mfg_order_name = whereJson.getString("mfg_order_name"); + if (StrUtil.isEmpty(mfg_order_name)){ + return PdaResponseVo.pdaResultOk("工单号为空！"); + } OrderDto dto = orderService.findByCode(mfg_order_name); + if (ObjectUtil.isNull(dto)){ + return PdaResponseVo.pdaResultOk("工单不存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); dto.setStatus("2"); @@ -81,6 +93,37 @@ public class PdaServiceImpl implements PdaService { return PdaResponseVo.pdaResultOk("工单：[" + dto.getMfg_order_name() + "]已强制完成"); } + @Override + public PdaResponseVo updateOrder(JSONObject whereJson) { + String mfg_order_name = whereJson.getString("mfg_order_name"); + String start_device_code = whereJson.getString("start_device_code"); + String next_device_code = whereJson.getString("next_device_code"); + if (StrUtil.isEmpty(mfg_order_name)){ + return PdaResponseVo.pdaResultOk("工单号为空！"); + } + OrderDto dto = orderService.findByCode(mfg_order_name); + if (ObjectUtil.isNull(dto)){ + return PdaResponseVo.pdaResultOk("工单不存在"); + } + + if (StrUtil.isEmpty(start_device_code)){ + return PdaResponseVo.pdaResultOk("起点编码不能为空"); + } + if (StrUtil.isEmpty(next_device_code)){ + return PdaResponseVo.pdaResultOk("终点编码不能为空"); + } + + String currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + dto.setStart_device_code(start_device_code); + dto.setNext_device_code(next_device_code); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(currentUsername); + dto.setUpdate_time(DateUtil.now()); + orderService.updateById(dto); + return PdaResponseVo.pdaResultOk("工单：[" + dto.getMfg_order_name() + "]起点、终点已分配！"); + } + @Override public List queryWorks(JSONObject whereJson) { if (StrUtil.isEmpty(whereJson.getString("mfg_order_name"))){ diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/OrderVo.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/OrderVo.java index f27f003..f5cc171 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/OrderVo.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/OrderVo.java @@ -18,4 +18,6 @@ public class OrderVo { private String status; private String create_time; private String realstart_time; + private String start_device_code; + private String next_device_code; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/WorkVo.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/WorkVo.java index a490704..b9fd253 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/WorkVo.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/vo/WorkVo.java @@ -15,7 +15,7 @@ public class WorkVo { private String material_code; private String material_name; private float qty; - private String resource_name; + private String next_device_code; private int require_num; private int remain_num; private String status; diff --git a/acs/nladmin-ui/src/views/acs/order/index.vue b/acs/nladmin-ui/src/views/acs/order/index.vue index 9874b78..f634f84 100644 --- a/acs/nladmin-ui/src/views/acs/order/index.vue +++ b/acs/nladmin-ui/src/views/acs/order/index.vue @@ -12,12 +12,12 @@ label-suffix=":" > - + @@ -108,7 +108,7 @@ - + @@ -171,17 +171,82 @@ {{ scope.row.mfg_order_name }} - - + + + + - + - +