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

feat:bug修复

Browse Source
This commit is contained in:
郑旭明\73939
2026-07-04 10:01:52 +07:00
parent d124027df4
commit e5037fd3e8
8 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
View File

@@ -51,6 +51,13 @@ public class VehicleTwoController {
return new ResponseEntity<>(vehicleTwoService.boxIn(whereJson), HttpStatus.OK);
}
@PostMapping("/boxUpLine")
@Log("木箱上线")
@SaIgnore
public ResponseEntity<Object> boxUpLine(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(vehicleTwoService.boxIn(whereJson), HttpStatus.OK);
}
@PostMapping("/returnIn")
@Log("退货入库")
@SaIgnore

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

@@ -125,7 +125,7 @@ public interface IStIvtIostorinvOutService extends IService<StIvtIostorinv> {
void allSetPoint(JSONObject whereJson);
/**
* 出库强制确认
* 出库强制确认,,出库确认
* @param whereJson {
* iostorinv_id： 主表标识
* }

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
View File

@@ -1430,10 +1430,10 @@
WHERE
dis.box_no = #{boxNo}
AND dis.work_status <![CDATA[ <= ]]> '99'
AND dis.work_status <![CDATA[ < ]]> '99'
AND ( dis.struct_id IS NOT NULL AND dis.struct_id <![CDATA[ <> ]]> '' )
AND mst.is_delete = '0'
AND mst.bill_status <![CDATA[ <= ]]> '99'
AND mst.bill_status <![CDATA[ < ]]> '99'
</select>
<select id="getOutManageExportData" resultType="org.nl.wms.st.outbill.service.vo.OutManageExportVo">
SELECT

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

@@ -416,20 +416,20 @@ public class InBoxManageServiceImpl implements InBoxManageService {
@Transactional(rollbackFor = Exception.class)
public void returnIn(JSONObject whereJson) {
//判断是否是手工入库：如果是手工入库则判断是否是第一次入库
if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("生产入库")) ||
whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("手工入库"))
if (IOSEnum.IN_TYPE.code("生产入库").equals(whereJson.getString("bill_type")) ||
IOSEnum.IN_TYPE.code("手工入库").equals(whereJson.getString("bill_type"))
) {
// 校验是否第一次入库
boolean ifFirst = inBussManageService.firstInBox(whereJson.getString("box_no"));
// 手工入库
if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("手工入库"))) {
if (IOSEnum.IN_TYPE.code("手工入库").equals(whereJson.getString("bill_type"))) {
if (!ifFirst) {
throw new BadRequestException("此木箱【" + whereJson.getString("box_no") + "】未入过库，请选择【生产入库】!");
}
}
if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("生产入库"))) {
if (IOSEnum.IN_TYPE.code("生产入库").equals(whereJson.getString("bill_type"))) {
if (ifFirst) {
throw new BadRequestException("此木箱【" + whereJson.getString("box_no") + "】已入过库，请选择【手工入库】!");
}

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

@@ -159,6 +159,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
.set(ObjectUtil.isNotEmpty(json.getString("inv_id")), StIvtStructattr::getInv_id, json.getString("inv_id"))
.set(ObjectUtil.isNotEmpty(json.getString("inv_type")), StIvtStructattr::getInv_type, json.getString("inv_type"))
.set(ObjectUtil.isNotEmpty(json.getString("inv_code")), StIvtStructattr::getInv_code, json.getString("inv_code"))
.set(ObjectUtil.isNotEmpty(json.getString("storagevehicle_code")), StIvtStructattr::getStoragevehicle_code, json.getString("storagevehicle_code"))
.set(ObjectUtil.isNotEmpty(json.getString("lock_type")), StIvtStructattr::getLock_type, json.getString("lock_type"));
structattrService.update(lam);
}

14
lms/nladmin-system/src/main/java/org/nl/common/utils/StringDealUtils.java
View File

@@ -2,6 +2,7 @@ package org.nl.common.utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -12,13 +13,16 @@ import java.util.stream.Collectors;
*/
public class StringDealUtils {
public static List<String> splitString(String input) {
// 不含空格直接返回
if (input == null || input.trim().isEmpty() || !input.matches(".*\\s.*")) {
// 空值、全空白返回空集合
if (input == null || input.trim().isEmpty()) {
return new ArrayList<>();
}
return Arrays.stream(input.split("\\s+"))
.filter(s -> !s.isEmpty())
// 包含空白则分割，不包含则返回单个元素集合
String trimInput = input.trim();
if (!trimInput.matches(".*\\s.*")) {
return Collections.singletonList(trimInput);
}
return Arrays.stream(trimInput.split("\\s+"))
.collect(Collectors.toList());
}
}

2
lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -239,7 +239,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
updateSubCnt(oldPid);
updateSubCnt(newPid);
//更新SystemType
if (!resources.getSystem_type().equals(menu.getSystem_type())) {
if (StringUtils.isNotBlank(resources.getSystem_type()) && !ObjectUtil.equals(resources.getSystem_type(),menu.getSystem_type())) {
this.update(new UpdateWrapper<SysMenu>().set(DictConstantPool.DICT_SYS_CODE, resources.getSystem_type()).in("menu_id", allChildIds));
}

4
lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue
View File

@@ -77,12 +77,12 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.st.sect.sectCapacity')" prop="capacity">
<el-form-item :label="$t('common.sectCapacity')" prop="capacity">
<el-input v-model="form.capacity" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.st.sect.sectType')" prop="sect_type_attr">
<el-form-item :label="$t('common.sectType')" prop="sect_type_attr">
<el-select
v-model="form.sect_type_attr"
:placeholder="$t('common.pleaseSelect')"