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

fix：二期出库完成报错bug修复

Browse Source
This commit is contained in:
liuxy
2024-06-28 10:13:23 +08:00
parent 217e8d86d2
commit c053f7a2dd
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -649,6 +649,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// 判断是否有未完成的任务
String task_in = disDaoList.stream()
.filter(row -> ObjectUtil.isNotEmpty(row.getTask_id()))
.map(row -> row.getTask_id().toString())
.distinct()
.collect(Collectors.joining("','"));

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

@@ -378,6 +378,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
param.put("Attribute2", jo_mst.getString("confirm_time"));
param.put("Attribute3", DateUtil.now());
// 删除子卷
WQLObject.getWQLObject("pdm_bi_subpackagerelation")
.delete("package_box_sn = '"+json.getString("box_no")+"'");
JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
for (int k = 0; k < container_jo.size(); k++) {
JSONObject dis_jo = container_jo.getJSONObject(k);
@@ -1493,6 +1497,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
param.put("Attribute2", jo_mst.getString("confirm_time"));
param.put("Attribute3", DateUtil.now());
// 删除子卷
WQLObject.getWQLObject("pdm_bi_subpackagerelation")
.delete("package_box_sn = '"+json.getString("box_no")+"'");
JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
for (int k = 0; k < container_jo.size(); k++) {
JSONObject dis_jo = container_jo.getJSONObject(k);