From 7ee18189ba1bfc7eba72f0b60f980f5efa96cb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Thu, 29 Dec 2022 14:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=A1=AE=E8=AE=A4=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E5=8D=95=E6=97=B6=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hf_station/HfStationDeviceDriver.java | 2 +- .../impl/ProduceshiftorderServiceImpl.java | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 32 ++++--------------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index 52faadf..f0e2c0d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -378,8 +378,8 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De dto.setUpdate_time(DateUtil.now()); produceshiftorderService.update(dto); this.setRequireSucess(true); + this.writing(8); logServer.deviceInfo("人工排产确认", this.getDevice_code(), "人工排产确认成功!"); - this.writing(3); } return true; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 8c77a85..daceb87 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -140,7 +140,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A hfStationDeviceDriver.writing("to_order", dto.getOrder_code()); hfStationDeviceDriver.writing("to_order_num", String.valueOf(dto.getQty())); hfStationDeviceDriver.writing("to_product_number", dto.getMaterial_code()); -// hfStationDeviceDriver.writing("to_command", "3"); + hfStationDeviceDriver.writing("to_command", "3"); } JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 14266ac..852f67c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -419,31 +419,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject resp = new JSONObject(); String ext_order_id = whereJson.getString("ext_order_id"); WorkorderDto dto = workordeService.findById(Long.valueOf(ext_order_id)); - if (ObjectUtil.isEmpty(dto)) { - throw new BadRequestException("查询到工单为空！"); - } - String device_code = whereJson.getString("device_code"); - String material_code = whereJson.getString("material_code"); - MaterialbaseDto materialbaseDto = materialbaseService.findByCode(material_code); - if (ObjectUtil.isEmpty(materialbaseDto)) { - throw new BadRequestException("物料编码不存在！"); - } - String order_code = whereJson.getString("order_code"); - if (StrUtil.equals(device_code, dto.getDevice_code()) && - StrUtil.equals(material_code, materialbaseDto.getMaterial_code()) - && StrUtil.equals(order_code, dto.getWorkorder_code()) - ) { - dto.setOrder_status("3"); - dto.setUpdate_time(DateUtil.now()); - workordeService.update(dto); - resp.put("status", "200"); - resp.put("message", "人工排产确认成功！"); - return resp; - } else { - resp.put("status", "400"); - resp.put("message", "人工排产确认失败,工单设备编码或物料编码或工单号与acs传来的不一致！"); - return resp; - } - + dto.setOrder_status("3"); + dto.setUpdate_time(DateUtil.now()); + workordeService.update(dto); + resp.put("status", "200"); + resp.put("message", "人工排产确认成功！"); + return resp; } }