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

入库测试

Browse Source
This commit is contained in:
ls
2026-02-28 13:32:41 +08:00
parent 21cdb6963d
commit 5dd197c974
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -482,7 +482,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
List<BstIvtBoxstack> bstIvtBoxstacks = boxstackMapper.selectList(new QueryWrapper<BstIvtBoxstack>()
.eq("box_spec", whereJson.getString("checked"))
.gt("current_layer_count", 0)
.eq("point_status", BoxStackEnum.POINT_STATUS.code("对接区"))
.eq("point_status", BoxStackEnum.POINT_STATUS.code("木箱对接区"))
.orderByAsc("update_time"));
if (CollUtil.isEmpty(bstIvtBoxstacks)) {
// 查询缓存区木箱，先送数量少的

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -422,7 +422,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
}
//获取子卷最新信息
jo.put("container_name", whereJson.getString("container_name"));
if (isOnMes.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
if (isOnMes.equals(IOSEnum.IS_NOTANDYES.code("是"))) {
lmsToMesService.getInspectionResult(jo);
//子卷下料信息MES传递给LMS
iPdmBiContainerinfoService.createSubInfoByContainer(whereJson.getString("container_name"));

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

@@ -387,6 +387,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
JSONObject oneStruct = twoInBussManageService.getOneStruct(attrParam);
if (!ObjectUtil.isEmpty(oneStruct)) {
stIvtStructattr = oneStruct.toJavaObject(StIvtStructattr.class);
stIvtStructattrs.add(stIvtStructattr);
}
}

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

@@ -70,7 +70,7 @@ public class TwoInBussManageServiceImpl implements TwoInBussManageService {
String input = jsonObject.getString("height");
List<String> result = Arrays.asList(input.split("','"));
List<String> result = Arrays.asList(input.split(","));
LambdaQueryWrapper<StIvtStructattr> stIvtStructattrLambdaQueryWrapper = new LambdaQueryWrapper<>();

22
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/dao/mapper/StIvtStructattrMapper.xml
View File

@@ -16,7 +16,9 @@
AND IFNULL(attr.storagevehicle_code,'') = ''
AND attr.stor_id = #{param.stor_id}
AND attr.sect_id = #{param.sect_id}
AND attr.storagevehicle_type = #{param.vehicle_type}
<if test="param.vehicle_type != '' and param.vehicle_type != null ">
AND attr.storagevehicle_type != #{param.vehicle_type}
</if>
<if test="param.not_in_block_num != '' and param.not_in_block_num != null ">
AND attr.block_num != #{param.block_num}
</if>
@@ -49,9 +51,9 @@
AND IFNULL(attr.storagevehicle_code,'') != ''
AND box.is_packing = '1'
<if test="param.block_in != null ">
AND attr.block_num in
<foreach collection="param.block_in" open="(" close=")" separator="," index="block_num">
<if test="param.block_in != null and param.block_in.size() > 0 ">
AND attr.block_num IN
<foreach collection="param.block_in" open="(" close=")" separator="," item="block_num">
#{block_num}
</foreach>
</if>
@@ -148,7 +150,9 @@
AND attr.stor_id = #{param.stor_id}
AND attr.sect_id = #{param.sect_id}
AND attr.zdepth = '2'
AND attr.storagevehicle_type = #{param.vehicle_type}
<if test="param.vehicle_type != '' and param.vehicle_type != null ">
AND attr.storagevehicle_type != #{param.vehicle_type}
</if>
AND attr.height in
<foreach collection="param.height" open="(" close=")" separator="," index="height">
@@ -206,7 +210,9 @@
AND IFNULL(attr.storagevehicle_code,'') = ''
AND attr.stor_id = #{param.stor_id}
AND attr.sect_id = #{param.sect_id}
AND attr.storagevehicle_type = #{param.vehicle_type}
<if test="param.vehicle_type != '' and param.vehicle_type != null ">
AND attr.storagevehicle_type != #{param.vehicle_type}
</if>
AND attr.height in
<foreach collection="param.height" open="(" close=")" separator="," index="height">
#{height}
@@ -240,7 +246,9 @@
AND attr.is_delete = '0'
AND attr.stor_id = #{param.stor_id}
AND attr.sect_id = #{param.sect_id}
AND attr.storagevehicle_type = #{param.vehicle_type}
<if test="param.vehicle_type != '' and param.vehicle_type != null ">
AND attr.storagevehicle_type != #{param.vehicle_type}
</if>
AND attr.height in
<foreach collection="param.height" open="(" close=")" separator="," index="height">

4
lms/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -21,8 +21,8 @@ public class Init implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
// initTwoAttr(4,30,3,2, "2");
createAttr();
initTwoAttr2(1,10,2, 2, 1, 2);
// createAttr();
// initTwoAttr2(1,10,2, 2, 1, 2);
}