root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配粉作业：投料确认更新

Browse Source
This commit is contained in:
liuxy
2022-06-28 16:11:19 +08:00
parent 645cf8cfe5
commit f832367908
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.pda.st.out.service.impl; package org.nl.pda.st.out.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@@ -408,6 +409,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
@Override @Override
public Map<String, Object> confirmOutStore2(Map<String, String> jsonObject) { public Map<String, Object> confirmOutStore2(Map<String, String> jsonObject) {
String input_optid = MapUtil.getStr(jsonObject, "input_optid");
String input_optname = MapUtil.getStr(jsonObject, "input_optid");
Long currentUserId = SecurityUtils.getCurrentUserId(); Long currentUserId = SecurityUtils.getCurrentUserId();
UserDto userDto = userService.findById(currentUserId); UserDto userDto = userService.findById(currentUserId);
// 仓位属性表【ST_IVT_StructAttr】 // 仓位属性表【ST_IVT_StructAttr】
@@ -550,8 +553,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
invrow.put("detail_count", 1); invrow.put("detail_count", 1);
invrow.put("bill_status", "99"); invrow.put("bill_status", "99");
invrow.put("create_mode", "02"); invrow.put("create_mode", "02");
invrow.put("input_optid", currentUserId); invrow.put("input_optid", input_optid);
invrow.put("input_optname", userDto.getNickName()); invrow.put("input_optname", input_optname);
invrow.put("input_time", now); invrow.put("input_time", now);
invrow.put("update_optid", currentUserId); invrow.put("update_optid", currentUserId);
invrow.put("update_optname", userDto.getNickName()); invrow.put("update_optname", userDto.getNickName());
@@ -559,8 +562,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
invrow.put("dis_optid", currentUserId); invrow.put("dis_optid", currentUserId);
invrow.put("dis_optname", userDto.getNickName()); invrow.put("dis_optname", userDto.getNickName());
invrow.put("dis_time", now); invrow.put("dis_time", now);
invrow.put("confirm_optid", currentUserId); invrow.put("confirm_optid", input_optid);
invrow.put("confirm_optname", userDto.getNickName()); invrow.put("confirm_optname", input_optname);
invrow.put("confirm_time", now); invrow.put("confirm_time", now);
invrow.put("sysdeptid", userDto.getDept().getId()); invrow.put("sysdeptid", userDto.getDept().getId());
invrow.put("syscompanyid", userDto.getDept().getId()); invrow.put("syscompanyid", userDto.getDept().getId());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
View File

@@ -553,6 +553,8 @@ public class FlourworkServiceImpl implements FlourworkService {
} }
map.put("bucketunique", jsonFormDtlJob.getString("bucketunique")); map.put("bucketunique", jsonFormDtlJob.getString("bucketunique"));
map.put("out_qty", jsonFormDtlJob.getString("outconfirm_qty")); 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); handPFOutIvtService.confirmOutStore2(map);
} else { } else {
// 2.如果不是 // 2.如果不是