空载具出库
This commit is contained in:
@@ -36,7 +36,7 @@ public class FIFOAndVehicleHandler extends Decisioner<StrategyStructMaterialVO,
|
|||||||
@Override
|
@Override
|
||||||
public List<StrategyStructMaterialVO> handler(List<StrategyStructMaterialVO> list, JSONObject param) {
|
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,批次
|
//当前条件只有id,批次
|
||||||
log.info("---------执行空托盘出库分配规则---------");
|
log.info("---------执行空托盘出库分配规则---------");
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import java.util.Map;
|
|||||||
public enum StragegyTypeEnum {
|
public enum StragegyTypeEnum {
|
||||||
|
|
||||||
// 策略类型
|
// 策略类型
|
||||||
STRAGEGY_TYPE(MapOf.of("1", "空托盘", "2", "正常策略"))
|
STRAGEGY_TYPE(MapOf.of( "空托盘","1", "正常策略","2"))
|
||||||
;
|
;
|
||||||
|
|
||||||
private Map<String, String> code;
|
private Map<String, String> code;
|
||||||
|
|||||||
@@ -248,9 +248,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
|||||||
if (qty > 6) {
|
if (qty > 6) {
|
||||||
throw new BadRequestException("一次性只能输入小于7以内的载具数量");
|
throw new BadRequestException("一次性只能输入小于7以内的载具数量");
|
||||||
}
|
}
|
||||||
queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空料箱"));
|
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料箱"));
|
||||||
} else {
|
} else {
|
||||||
queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空托盘"));
|
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘"));
|
||||||
}
|
}
|
||||||
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getOne(queryWrapper);
|
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getOne(queryWrapper);
|
||||||
if (materDao == null) {
|
if (materDao == null) {
|
||||||
@@ -258,10 +258,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
|||||||
}
|
}
|
||||||
whereJson.put("material_id", materDao.getMaterial_id());
|
whereJson.put("material_id", materDao.getMaterial_id());
|
||||||
whereJson.put("material_code", materDao.getMaterial_code());
|
whereJson.put("material_code", materDao.getMaterial_code());
|
||||||
Sectattr sectattr = iSectattrService.getById(new LambdaQueryWrapper<>(Sectattr.class)
|
Sectattr sectattr = iSectattrService.getById(whereJson.getString("sect_id"));
|
||||||
.eq(Sectattr::getSect_id, whereJson.getString("sect_id"))
|
|
||||||
.eq(Sectattr::getIs_used, BaseDataEnum.IS_YES_NOT.code("是"))
|
|
||||||
);
|
|
||||||
if (ObjectUtil.isEmpty(sectattr)) {
|
if (ObjectUtil.isEmpty(sectattr)) {
|
||||||
throw new BadRequestException("该仓位所属的库区已禁用,请先启用该库区!");
|
throw new BadRequestException("该仓位所属的库区已禁用,请先启用该库区!");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user