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

fix:二期PC端入库逻辑修改

Browse Source
This commit is contained in:
zhouz
2026-04-30 16:15:02 +08:00
parent d373a18753
commit 776823c8ce
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,8 +125,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
.base_bill_code(row.getString("base_bill_code"))
.base_bill_table(row.getString("base_bill_table"))
.remark(row.getString("remark"))
.assign_qty(BigDecimal.valueOf(0))
.unassign_qty(row.getBigDecimal("plan_qty"))
.unassign_qty(BigDecimal.valueOf(0))
.assign_qty(row.getBigDecimal("plan_qty"))
.box_no(row.getString("package_box_sn"))
.vbeln(row.getString("vbeln"))
.posnr(row.getString("posnr"))

12
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -1209,8 +1209,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 更新主表
JSONObject jsonMst = mstTab.query("iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'").uniqueResult(0);
jsonMst.put("is_overdue", whereJson.getString("is_overdue"));
mstTab.update(jsonMst);
HashMap<String, String> map = new HashMap<>();
map.put("is_overdue", whereJson.getString("is_overdue"));
mstTab.update(map, "iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'");
// 计算超期数量
List<JSONObject> disList = disTab.query("iostorinvdtl_id = '" + whereJson.getString("iostorinvdtl_id") + "' AND is_overdue = '1'")
@@ -1220,6 +1221,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.map(row -> row.getDoubleValue("plan_qty"))
.reduce(Double::sum).orElse(0.00);
jsonMst.put("is_overdue", whereJson.getString("is_overdue"));
JSONObject result = new JSONObject();
result.put("overdue_qyt", overdue_qyt);
result.put("mst", jsonMst);
@@ -1262,7 +1264,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
// 根据交货单找到主单据
JSONObject jsonMst = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag","22").addParam("vbeln",vbeln).process().uniqueResult(0);
JSONObject jsonMst = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "22").addParam("vbeln", vbeln).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonMst)) {
continue;
}
@@ -3247,12 +3249,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONArray structArr = WQLObject.getWQLObject("ST_IVT_StructAttr").query("block_num = '" + jsonRow.getString("block_num")
+ "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(structArr)) {
throw new BadRequestException("有仓位被其他业务锁定，仓位编码为【"+structArr.getJSONObject(0).getString("struct_code")+"】，对应单据号为【" + structArr.getJSONObject(0).getString("inv_code") + "】，请稍后在试!");
throw new BadRequestException("有仓位被其他业务锁定，仓位编码为【" + structArr.getJSONObject(0).getString("struct_code") + "】，对应单据号为【" + structArr.getJSONObject(0).getString("inv_code") + "】，请稍后在试!");
}
}
}
// 1.判断此条分配明细的 ‘仓位’在此主表下的分配明细是否有相同的 ‘仓位’
List<StructAllsetDto> structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id"),whereJson.getString("iostorinvdtl_id"));
List<StructAllsetDto> structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id"), whereJson.getString("iostorinvdtl_id"));
//同区同排排序：10302-04-01
//口口回口回口口口1
//口口回回口口口口2