From f832367908cfaf5d15bddc1476c9930d4a80fba2 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 28 Jun 2022 16:11:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=B2=89=E4=BD=9C=E4=B8=9A=EF=BC=9A?= =?UTF-8?q?=E6=8A=95=E6=96=99=E7=A1=AE=E8=AE=A4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/out/service/impl/HandPFOutIvtServiceImpl.java | 11 +++++++---- .../nl/wms/pf/service/impl/FlourworkServiceImpl.java | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 4d871027..b21c2aef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.pda.st.out.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -408,6 +409,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { @Override public Map confirmOutStore2(Map jsonObject) { + String input_optid = MapUtil.getStr(jsonObject, "input_optid"); + String input_optname = MapUtil.getStr(jsonObject, "input_optid"); Long currentUserId = SecurityUtils.getCurrentUserId(); UserDto userDto = userService.findById(currentUserId); // 仓位属性表【ST_IVT_StructAttr】 @@ -550,8 +553,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { invrow.put("detail_count", 1); invrow.put("bill_status", "99"); invrow.put("create_mode", "02"); - invrow.put("input_optid", currentUserId); - invrow.put("input_optname", userDto.getNickName()); + invrow.put("input_optid", input_optid); + invrow.put("input_optname", input_optname); invrow.put("input_time", now); invrow.put("update_optid", currentUserId); invrow.put("update_optname", userDto.getNickName()); @@ -559,8 +562,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { invrow.put("dis_optid", currentUserId); invrow.put("dis_optname", userDto.getNickName()); invrow.put("dis_time", now); - invrow.put("confirm_optid", currentUserId); - invrow.put("confirm_optname", userDto.getNickName()); + invrow.put("confirm_optid", input_optid); + invrow.put("confirm_optname", input_optname); invrow.put("confirm_time", now); invrow.put("sysdeptid", userDto.getDept().getId()); invrow.put("syscompanyid", userDto.getDept().getId()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index a6ac72cb..a51f7a54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -553,6 +553,8 @@ public class FlourworkServiceImpl implements FlourworkService { } map.put("bucketunique", jsonFormDtlJob.getString("bucketunique")); map.put("out_qty", jsonFormDtlJob.getString("outconfirm_qty")); + map.put("input_optid", jsonFormDtlJob.getString("create_id")); + map.put("input_optname", jsonFormDtlJob.getString("create_name")); handPFOutIvtService.confirmOutStore2(map); } else { // 2.如果不是