From 98e2b430bfba85d51ea99a465cb63c9cfe680452 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 24 Oct 2023 17:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java | 6 ++++++ .../main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java | 6 +++++- .../src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java | 5 ----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index 33b179e..eee2a8b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -575,6 +575,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { Date date = DateUtil.date(); //产品入库批次号(唯一) String pc = DateUtil.format(date, "yyyyMMddHHmmss"); + if (ObjectUtil.isEmpty(mstObj)){ + mstObj=new JSONObject(); + mstObj.put("pro_stockno",vehicle_code); + mstObj.put("itemcode",(String) whereJson.get("material_code")); + } + mstObj.put("PC",pc); mstObj.put("RECORD_TIME",DateUtil.now()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java index ee23a48..8c5cd36 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java @@ -110,10 +110,14 @@ public class ToPackIngTask extends AbstractAcsTask { recordTab.update(record1); } - + String material_code=""; + if (ObjectUtil.isNotEmpty(jsonTask.getJSONObject("request_param"))){ + material_code = jsonTask.getJSONObject("request_param").getString("material_code"); + } // 调用mes接口 HashMap map = new HashMap(); map.put("vehicle_code", jsonTask.getString("vehicle_code")); + map.put("material_code", material_code); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); wmsToJnServiceImpl.feedBackPackage(map); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java index 7968a43..1b84c39 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java @@ -7,14 +7,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Component; -import java.lang.reflect.Method; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - /** * @author geng by