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

rev：二期入库创建人修改，入库完成自动回传mes

Browse Source
This commit is contained in:
liuxy
2024-07-19 13:56:30 +08:00
parent d59e5d22a1
commit 6ee2dcc5a9
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
View File

@@ -112,6 +112,9 @@ public enum IOSEnum {
//acs申请任务 //acs申请任务
ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")), ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")),
// acs外部系统用户
EXT_ACS(MapOf.of("acs", "2","kc","康成")),
; ;
private Map<String, String> code; private Map<String, String> code;

21
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.basedata.st.service.StorattrService; import org.nl.wms.basedata.st.service.StorattrService;
import org.nl.wms.basedata.st.service.dto.StorattrDto; import org.nl.wms.basedata.st.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
@@ -668,6 +669,14 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
StorattrDto storattrDto = storattrService.findById(Long.parseLong((String) whereJson.get("stor_id"))); StorattrDto storattrDto = storattrService.findById(Long.parseLong((String) whereJson.get("stor_id")));
if (ObjectUtil.isEmpty(mstDao)) { if (ObjectUtil.isEmpty(mstDao)) {
String currentUserId = SecurityUtils.getCurrentUserId();
String currentNickName = SecurityUtils.getCurrentNickName();
if (currentUserId.equals(IOSEnum.EXT_ACS.code("acs"))) {
// 如果是外部系统创建人全部写系统参数
currentUserId = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IOS_CONFIRM_USER").getValue();
currentNickName = IOSEnum.EXT_ACS.code("kc");
}
// 新增 // 新增
mstDao = StIvtIostorinv.builder() mstDao = StIvtIostorinv.builder()
.iostorinv_id(IdUtil.getLongId()) .iostorinv_id(IdUtil.getLongId())
@@ -684,11 +693,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
.bill_status(whereJson.get("bill_status").toString()) .bill_status(whereJson.get("bill_status").toString())
.total_qty(BigDecimal.valueOf(Double.parseDouble(whereJson.get("total_qty").toString()))) .total_qty(BigDecimal.valueOf(Double.parseDouble(whereJson.get("total_qty").toString())))
.create_mode(IOSEnum.CREATE_MODE.code("PC产生")) .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
.input_optid(Long.parseLong(SecurityUtils.getCurrentUserId())) .input_optid(Long.parseLong(currentUserId))
.input_optname(SecurityUtils.getCurrentNickName()) .input_optname(currentNickName)
.input_time(DateUtil.now()) .input_time(DateUtil.now())
.update_optid(Long.parseLong(SecurityUtils.getCurrentUserId())) .update_optid(Long.parseLong(currentUserId))
.update_optname(SecurityUtils.getCurrentNickName()) .update_optname(currentNickName)
.update_time(DateUtil.now()) .update_time(DateUtil.now())
.is_delete(IOSEnum.IS_NOTANDYES.code("否")) .is_delete(IOSEnum.IS_NOTANDYES.code("否"))
.is_upload(IOSEnum.IS_NOTANDYES.code("否")) .is_upload(IOSEnum.IS_NOTANDYES.code("否"))
@@ -959,7 +968,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
this.updateById(mstDao); this.updateById(mstDao);
// 生产入库：回传mes // 生产入库：回传mes
/* if (mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("生产入库"))) { if (mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("生产入库")) || mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("改切入库"))) {
InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class); InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class);
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
@@ -974,7 +983,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
} finally { } finally {
this.updateById(mstDao); this.updateById(mstDao);
} }
}*/ }
} }
} }