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-08-04 17:40:17 +08:00
parent 588b9bdf83
commit 62733e0c0c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java
View File

@@ -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++) {

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
View File

@@ -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++) {