From aa67abac7bc4bf1bfaa1e842ecc5f811c3c8e723 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 15:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=B7=E7=82=B9=E7=BB=88=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/device/service/impl/DeviceServiceImpl.java | 12 ++++++++++++ .../service/impl/InstructionServiceImpl.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 829b4ae..4f934ee 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -1010,6 +1010,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial device.setQuantity(quantity); device.setBatch(batch); device.setIslock(islock); + device.setModel(model); + device.setProcess(process); + device.setWeight(weight); + device.setQc_status(qc_status); + device.setDate(date); + device.setOperation_by(operation_by); JSONObject updatejson = JSONObject.fromObject(obj); runpointwo.update(updatejson, "device_code = '" + device_code + "'"); } @@ -1034,6 +1040,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial device.setMaterial_type(material_type); device.setBatch(batch); device.setIslock(islock); + device.setModel(model); + device.setProcess(process); + device.setWeight(weight); + device.setQc_status(qc_status); + device.setDate(date); + device.setOperation_by(operation_by); JSONObject updatejson = JSONObject.fromObject(obj); runpointwo.update(updatejson, "device_code = '" + device_code + "'"); } 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 7eefe4f..caa4a55 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 @@ -675,6 +675,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo1.put("batch", startdevice.getBatch()); jo1.put("vehicle_code", entity.getVehicle_code()); jo1.put("islock", "false"); + jo1.put("model", startdevice.getModel()); + jo1.put("process", startdevice.getProcess()); + jo1.put("weight", startdevice.getWeight()); + jo1.put("qc_status", startdevice.getQc_status()); + jo1.put("date", startdevice.getDate()); + jo1.put("operation_by", startdevice.getOperation_by()); deviceService.changeDeviceStatus(jo1); // 如果是无光电的设备 指令完成变更起点、终点状态 JSONObject jo = new JSONObject(); @@ -685,6 +691,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo.put("remark", ""); jo.put("batch", ""); jo.put("islock", "false"); + jo.put("model", ""); + jo.put("process", ""); + jo.put("weight", ""); + jo.put("qc_status", ""); + jo.put("date", ""); + jo.put("operation_by", ""); deviceService.changeDeviceStatus(jo); JSONObject json = JSONObject.fromObject(entity);