From 62733e0c0cd265c217e3c57f70b2d3d3199e6462 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 4 Aug 2022 17:40:17 +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 --- .../java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java | 4 +++- .../org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java index b58285e2..2106f3c1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java @@ -62,7 +62,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0); jsonParam.put("pallet_code", json.getString("pallet_code")); jsonParam.put("inputtime", now); - jsonParam.put("iostorinv_uuid", json.getString("pallet_code") + "-" + now); + jsonParam.put("iostorinv_uuid", json.getString("pallet_code") + "-" + now.replaceAll("[[\\s-:punct:]]", "")); jsonParam.put("create_ext_id", jsonUser.getString("ext_id")); jsonParam.put("create_id", currentUserId); jsonParam.put("create_name", SecurityUtils.getNickName()); @@ -150,6 +150,8 @@ public class WmsToLkServiceImpl implements WmsToLkService { jsonParam.put("invtype", json.getString("invtype")); jsonParam.put("agvaddr", json.getString("agvaddr"));// AGV站点 jsonParam.put("remark", json.getString("remark")); + jsonParam.put("iostorinv_uuid", json.getString("iostorinv_uuid")); + JSONArray dataArr = new JSONArray(); for (int i = 0; i < jsonArray.size(); i++) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java index 4d6de16a..58a34652 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.lk.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; @@ -56,6 +57,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService { @Override @Transactional(rollbackFor = Exception.class) public void outLk(JSONObject json) { + String now = DateUtil.now(); JSONObject data = json.getJSONObject("data"); String agvaddr = json.getString("agvaddr"); String pallet_code = data.getString("pallet_code"); @@ -64,6 +66,8 @@ public class LibraryqueryServiceImpl implements LibraryqueryService { jsonParam.put("invtype", "2"); // 暂时没有 jsonParam.put("agvaddr", agvaddr); jsonParam.put("remark", ""); + jsonParam.put("iostorinv_uuid", pallet_code + "-" + now.replaceAll("[[\\s-:punct:]]", "")); + JSONArray jsonDataArr = new JSONArray(); JSONArray resultJSONArray = WQL.getWO("QLK01").addParam("flag", "2").addParam("pallet_code",pallet_code).setDbname("dataSource2").process().getResultJSONArray(0); for (int i = 0; i < resultJSONArray.size(); i++) {