From 8fdb2e5abb92eea77e6b98eff9f5ce293ed75109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Tue, 6 Dec 2022 18:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InstructionServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index caa4a55..f78c270 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -777,6 +777,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo.put("hasGoodStatus", "0"); jo.put("material_type", ""); jo.put("batch", ""); + jo.put("model", ""); + jo.put("process", ""); + jo.put("weight", ""); + jo.put("qc_status", ""); + jo.put("date", ""); + jo.put("operation_by", ""); deviceService.changeDeviceStatus(jo); JSONObject jo1 = new JSONObject(); @@ -785,6 +791,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo1.put("material_type", dto.getMaterial()); jo1.put("batch", dto.getBatch()); jo1.put("vehicle_code", dto.getVehicle_code()); + Device start_device = appService.findDeviceByCode(dto.getStart_point_code()); + jo1.put("model", start_device.getModel()); + jo1.put("process", start_device.getProcess()); + jo1.put("weight", start_device.getWeight()); + jo1.put("qc_status", start_device.getQc_status()); + jo1.put("date", start_device.getDate()); + jo1.put("operation_by", start_device.getOperation_by()); deviceService.changeDeviceStatus(jo1); LampThreecolorDeviceDriver lampThreecolorDeviceDriver;