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-10-09 16:47:16 +08:00
parent 61bf30c6dc
commit 2aa091125c
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java
View File

@@ -351,7 +351,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
inBussManageService.inTask(whereJson);
HashMap sub_map = new HashMap();
sub_map.put("sub_type", "0");
sub_map.put("sub_type", "");
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_map, "package_box_sn = '" + whereJson.getString("box_no")+"'");
PdmProductSpecServiceImpl.doRecord(SpecEnum.RK_YC, null, Boolean.TRUE, null, subs);
JSONObject result = new JSONObject();

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -1247,6 +1247,9 @@ public class SlitterServiceImpl implements SlitterService {
if (tryLock) {
// param: point_code
String pointCode = param.getString("point_code");
if (ObjectUtil.isEmpty(pointCode)){
throw new BadRequestException("点位编码不能为空！");
}
// 校验是否存在任务
List<SchBaseTask> taskList = taskService.checkHaveStartTask(pointCode);
if (taskList.size() > 0) {
@@ -1331,6 +1334,9 @@ public class SlitterServiceImpl implements SlitterService {
try {
if (openLock) {
BstIvtCutpointivt agvCode = bcutpointivtService.getPintByTrussCode(pointCode, false);
if (ObjectUtil.isEmpty(agvCode)) {
throw new BadRequestException("请输入正确的点位编码，未查询到该点位【" + pointCode + "】");
}
if (agvCode.getTruss_point_code1().equals(pointCode)) {
agvCode.setQzz_no1("");
}

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
View File

@@ -52,6 +52,9 @@ public class ComPareUtil {
if (ObjectUtil.isEmpty(vehicle_ext)) {
throw new BadRequestException("未查询到托盘的扩展信息");
}
if (!subList.get(0).getString("package_box_sn").equals(vehicle_ext.getString("pcsn"))) {
throw new BadRequestException("托盘绑定的木箱号与当前的不一致!");
}
IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);
List<PdmBiSubpackagerelation> list = ipdmBiSubpackagerelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, vehicle_ext.getString("pcsn")));
if (ObjectUtil.isEmpty(list)) {

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -362,6 +362,12 @@ public class CoolCutTask extends AbstractAcsTask {
if ("010303".equals(jsonTask.getString("task_type"))) {
//更新分切区空轴库存
JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cut_jo2)) {
cut_jo2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code1 + "'").uniqueResult(0);
}
if (ObjectUtil.isEmpty(cut_jo2)) {
throw new BadRequestException("未查询到对应的点位【" + point_code1 + "】！");
}
cut_jo2.put("empty_point_status", "01");
cut_jo2.put("empty_vehicle_code", "");
cut_jo2.put("update_optid", currentUserId);