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

fix：空木箱入库新增托盘重量校验；分切计划套轴按照创建时间排序；烘箱冷却页面查询修复

Browse Source
This commit is contained in:
zhouz
2025-06-11 14:00:23 +08:00
parent 338257ab9f
commit 81bfb2b213
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
View File

@@ -104,6 +104,8 @@ public class AutoCallAirShaftTask extends Prun {
public final static String USE_XN = "USE_XN";
public String stepStr = "";
public List<String> stepErrorInfo = new ArrayList<>();
private static final DateTimeFormatter TIME_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
/**
* hint: 目前只是考虑了上区域
@@ -152,7 +154,10 @@ public class AutoCallAirShaftTask extends Prun {
if (ObjectUtil.isNotEmpty(useXn) && "1".equals(useXn.getValue())) {
planAll = slittingproductionplanService.getAllCutPlan2(integer);
} else {
planAll = slittingproductionplanService.getAllCutPlan(integer);
planAll = slittingproductionplanService.getAllCutPlan(integer).stream()
.sorted(Comparator.comparing(
dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER)
)).collect(Collectors.toList());
}
// 过滤
String value = paramObj.getValue();

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

@@ -115,12 +115,25 @@ public class InBoxManageServiceImpl implements InBoxManageService {
.eq("is_delete", "0")
.orderByDesc("task_id")
.last("limit 1"));
String vehicleCode2 = one.getVehicle_code2();
if (one!=null){
String vehicleCode2 = one.getVehicle_code2();
if (whereJson.getString("vehicle_code").equals(vehicleCode2)){
throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code());
};
}
}
//查询托盘重量
JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicleCode2 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(vehicle_ext)) {
throw new BadRequestException("未查询到托盘的扩展信息");
}else {
//判断托盘重量是否为空或小于等于0
String qty = vehicle_ext.getString("qty");
if (StrUtil.isEmpty(qty) || Integer.parseInt(qty) <= 0){
throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量！");
}
}
//查询仓库是否存在相同木箱
JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxNo + "'").getResultJSONArray(0);
if (stIvtStructattr != null && stIvtStructattr.size() > 0) {

12
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql
View File

@@ -63,19 +63,19 @@
WHERE
cool.product_area in 输入.in_area_id
OPTION 输入.point_code <> ""
point_code LIKE 输入.point_code
cool.point_code LIKE 输入.point_code
ENDOPTION
OPTION 输入.container_name <> ""
container_name LIKE 输入.container_name
cool.container_name LIKE 输入.container_name
ENDOPTION
OPTION 输入.full_point_status <> ""
full_point_status = 输入.full_point_status
cool.full_point_status = 输入.full_point_status
ENDOPTION
OPTION 输入.empty_point_status <> ""
empty_point_status = 输入.empty_point_status
cool.empty_point_status = 输入.empty_point_status
ENDOPTION
OPTION 输入.cool_ivt_status <> ""
cool_ivt_status = 输入.cool_ivt_status
cool.cool_ivt_status = 输入.cool_ivt_status
ENDOPTION
OPTION 输入.product_area <> ""
cool.product_area = 输入.product_area
@@ -84,7 +84,7 @@
is_used = 输入.is_used
ENDOPTION
OPTION 输入.point_location <> ""
point_location = 输入.point_location
cool.point_location = 输入.point_location
ENDOPTION
OPTION 输入.begin_time <> ""
instorage_time >= 输入.begin_time

8
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
View File

@@ -61,16 +61,16 @@
WHERE
hot.product_area in 输入.in_area_id
OPTION 输入.point_location <> ""
point_location = 输入.point_location
hot.point_location = 输入.point_location
ENDOPTION
OPTION 输入.point_code <> ""
point_code LIKE 输入.point_code
hot.point_code LIKE 输入.point_code
ENDOPTION
OPTION 输入.point_status <> ""
point_status = 输入.point_status
hot.point_status = 输入.point_status
ENDOPTION
OPTION 输入.product_area <> ""
product_area = 输入.product_area
hot.product_area = 输入.product_area
ENDOPTION
OPTION 输入.is_used <> ""
is_used = 输入.is_used