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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2025-08-05 10:49:40 +08:00
parent a1a820d522 bbaaa3d7de
commit 5eee43988d
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFOAndVehicleHandler.java
View File

@@ -36,7 +36,7 @@ public class FIFOAndVehicleHandler extends Decisioner<StrategyStructMaterialVO,
@Override
public List<StrategyStructMaterialVO> handler(List<StrategyStructMaterialVO> list, JSONObject param) {
//如果是空托盘出库任务，则执行空托盘出库
if (StragegyTypeEnum.STRAGEGY_TYPE.code("空托盘").equals(param.getString("strategyType"))) {
if (StragegyTypeEnum.STRAGEGY_TYPE.code("空托盘").equals(param.getString("stragegyType"))) {
//查新空托盘
//当前条件只有id，批次
log.info("---------执行空托盘出库分配规则---------");

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/enums/StragegyTypeEnum.java
View File

@@ -19,7 +19,7 @@ import java.util.Map;
public enum StragegyTypeEnum {
// 策略类型
STRAGEGY_TYPE(MapOf.of("1", "空托盘", "2", "正常策略"))
STRAGEGY_TYPE(MapOf.of( "空托盘","1", "正常策略","2"))
;
private Map<String, String> code;

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
View File

@@ -248,9 +248,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
if (qty > 6) {
throw new BadRequestException("一次性只能输入小于7以内的载具数量");
}
queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空料箱"));
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料箱"));
} else {
queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空托盘"));
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘"));
}
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getOne(queryWrapper);
if (materDao == null) {
@@ -258,10 +258,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
}
whereJson.put("material_id", materDao.getMaterial_id());
whereJson.put("material_code", materDao.getMaterial_code());
Sectattr sectattr = iSectattrService.getById(new LambdaQueryWrapper<>(Sectattr.class)
.eq(Sectattr::getSect_id, whereJson.getString("sect_id"))
.eq(Sectattr::getIs_used, BaseDataEnum.IS_YES_NOT.code("是"))
);
Sectattr sectattr = iSectattrService.getById(whereJson.getString("sect_id"));
if (ObjectUtil.isEmpty(sectattr)) {
throw new BadRequestException("该仓位所属的库区已禁用，请先启用该库区!");
}