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-02-07 15:13:29 +08:00
parent 3e6f83d585
commit 9946284db0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,6 +339,9 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
jsonAttr = attrTab.query("sect_id = '" + jsonObject.getString("sect_id") + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0); jsonAttr = attrTab.query("sect_id = '" + jsonObject.getString("sect_id") + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0);
} else { } else {
//TODO jsonAttr = inBussManageService.getOneStruct(attrParam); //TODO jsonAttr = inBussManageService.getOneStruct(attrParam);
if (ObjectUtil.isNotEmpty(whereJson.get("in_buss"))) {
attrParam.put("move_block_num", MapUtil.getStr(whereJson, "move_block_num"));
}
jsonAttr = twoInBussManageService.getOneStruct(attrParam); jsonAttr = twoInBussManageService.getOneStruct(attrParam);
} }
} else { } else {

5
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
View File

@@ -379,6 +379,9 @@ public class InBussManageServiceImpl implements InBussManageService {
.eq(StIvtIostorinvdtl::getIostorinvdtl_id, disList.get(0).get("iostorinvdtl_id")) .eq(StIvtIostorinvdtl::getIostorinvdtl_id, disList.get(0).get("iostorinvdtl_id"))
).get(0); ).get(0);
// 获取当前巷道
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code2() + "'").uniqueResult(0);
JSONObject jsonDiv = new JSONObject(); JSONObject jsonDiv = new JSONObject();
jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao))); jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao)));
jsonDiv.put("tableMater", disList); jsonDiv.put("tableMater", disList);
@@ -386,6 +389,8 @@ public class InBussManageServiceImpl implements InBussManageService {
jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否")); jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否"));
jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区")); jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区"));
jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期")); jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期"));
jsonDiv.put("move_block_num", jsonAttr.getString("block_num"));
jsonDiv.put("in_buss", IOSEnum.IS_NOTANDYES.code("是"));
iStIvtIostorinvService.divStruct(jsonDiv); iStIvtIostorinvService.divStruct(jsonDiv);