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

Merge branch 'master' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-07-01 15:13:07 +08:00
parent 4c07bdbfca e9f415d8cf
commit 69b58c9d06
77 changed files with 2503 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java
View File

@@ -26,7 +26,12 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender {
mdcPropertyMap.put("traceId", traceId);
}
}
super.append(event);
try {
super.append(event);
} catch (Exception e) {
System.out.println(e.getMessage());
return;
}
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java
View File

@@ -207,7 +207,7 @@ public class InbillServiceImpl {
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
//回传MES
if (StrUtil.equals(mst_jo.getString("bill_type"), "0001")) {
if (StrUtil.equals(mst_jo.getString("bill_type"), "0001") || StrUtil.equals(mst_jo.getString("bill_type"), "0007")) {
InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class);
JSONObject param = new JSONObject();

4
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -173,7 +173,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
String lgort = stor_jo.getString("ext_id");
String is_productstore = stor_jo.getString("is_productstore");
//生产入库
if (StrUtil.equals(bill_type, "0001")) {
if (StrUtil.equals(bill_type, "0001") || StrUtil.equals(bill_type, "0007")) {
//1.回传MES
//查询该入库单下的所有箱子回传
@@ -1014,7 +1014,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
String lgort = stor_jo.getString("ext_id");
String is_productstore = stor_jo.getString("is_productstore");
//生产入库
if (StrUtil.equals(bill_type, "0001")) {
if (StrUtil.equals(bill_type, "0001") || StrUtil.equals(bill_type, "0007")) {
//1.回传MES
//查询该入库单下的所有箱子回传