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

rev：出库确认、回传增加管控出库相关逻辑

Browse Source
This commit is contained in:
liuxy
2025-04-11 09:18:42 +08:00
parent 1a5d0110d1
commit b10c478baf
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ public enum IOSEnum {
//出库单据类型 //出库单据类型
OUT_TYPE(MapOf.of("发货出库", "1001", "改切出库", "1003", "调拨出库", "1004", "拆箱出库", "1005", OUT_TYPE(MapOf.of("发货出库", "1001", "改切出库", "1003", "调拨出库", "1004", "拆箱出库", "1005",
"返检出库", "1006", "超期报废", "1007", "退货报废", "1008", "质量问题报废", "1010", "其他报废", "1002", "返检出库", "1006", "超期报废", "1007", "退货报废", "1008", "质量问题报废", "1010", "其他报废", "1002",
"手工出库", "1009" "手工出库", "1009","管控出库", "1099"
)), )),
//移库单据类型 //移库单据类型

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

@@ -947,7 +947,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
/* /*
* 如果为返检出库或者改切出库删除对应的包装关系 * 如果为返检出库或者改切出库删除对应的包装关系
*/ */
if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("返检出库")) || mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("改切出库"))) { if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("返检出库")) || mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("改切出库"))
|| mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("管控出库"))
) {
// 查询库区 // 查询库区
String sect_in = disDaoList.stream() String sect_in = disDaoList.stream()

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

@@ -269,7 +269,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
} }
// 返检出库：回传mes // 返检出库：回传mes
if (StrUtil.equals(bill_type, "1006")) { if (StrUtil.equals(bill_type, "1006") || StrUtil.equals(bill_type, "1099")) {
JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
// 判断是否有未完成的任务 // 判断是否有未完成的任务
ifUnTask(disArr.toJavaList(JSONObject.class)); ifUnTask(disArr.toJavaList(JSONObject.class));
@@ -1546,7 +1546,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
} }
// 返检出库：回传mes // 返检出库：回传mes
if (StrUtil.equals(bill_type, "1006")) { if (StrUtil.equals(bill_type, "1006") || StrUtil.equals(bill_type, "1099")) {
JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
// 判断是否有未完成的任务 // 判断是否有未完成的任务
ifUnTask(disArr.toJavaList(JSONObject.class)); ifUnTask(disArr.toJavaList(JSONObject.class));