From 636b2ddd67436bd0bca72c013bcc60f73e7f08b7 Mon Sep 17 00:00:00 2001 From: loujf Date: Tue, 2 Aug 2022 10:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 1 + .../nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 822167f..857a5ea 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -339,6 +339,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { ProduceshiftorderDto dto = new ProduceshiftorderDto(); dto.setOrder_code(producetask_code); dto.setProduct_code(product_code); + dto.setDevice_code(device_code); dto.setOrder_status("1"); dto.setMaterial_code(material_code); dto.setMaterial_name(material_name); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 89872a7..bff0711 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -171,7 +171,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { //判断是否为wms下发的排产单 String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS); - if (dto.getProduct_code().equals("wms") && hasWms.equals("1")) { + if (StrUtil.isNotEmpty(dto.getProduct_code()) && hasWms.equals("1")) { JSONObject json = new JSONObject(); json.put("producetask_code",dto.getOrder_code()); json.put("device_code",dto.getDevice_code());