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

opt:优化母卷送回支持B1

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-04-09 16:21:06 +08:00
parent 5023da7361
commit bf3279faf7
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -522,8 +522,17 @@ public class FeedingServiceImpl implements FeedingService {
if (type.equals("2")) { if (type.equals("2")) {
//查询对应的分切点位是否存在 //查询对应的分切点位是否存在
JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0); JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cut_jo)) {
throw new BadRequestException("请输入或者扫码分切区域的满轴点位！"); //B1支持从分切上料暂存架送回母卷
if(point_code.contains("B1_FQZC")){
cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cut_jo)) {
throw new BadRequestException("请输入或者扫码分切区域的满轴点位！");
}
}else{
if (ObjectUtil.isEmpty(cut_jo)) {
throw new BadRequestException("请输入或者扫码分切区域的满轴点位！");
}
} }
if (StrUtil.equals("01", cut_jo.getString("full_point_status"))) { if (StrUtil.equals("01", cut_jo.getString("full_point_status"))) {
throw new BadRequestException("该点位库存状态不存在满轴！"); throw new BadRequestException("该点位库存状态不存在满轴！");

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

@@ -362,16 +362,36 @@ public class CoolCutTask extends AbstractAcsTask {
if ("010304".equals(jsonTask.getString("task_type"))) { if ("010304".equals(jsonTask.getString("task_type"))) {
//更新分切区空轴库存 //更新分切区空轴库存
String container_name = "";
//若起点是ST_IVT_CutPointIvt表
JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0);
String container_name = cut_jo2.getString("container_name"); if (ObjectUtil.isEmpty(cut_jo2)) {
cut_jo2.put("full_point_status", "01"); //B1车间支持从分切上料暂存位送回母卷
cut_jo2.put("full_vehicle_code", ""); if(point_code1.contains("B1_FQZC")){
cut_jo2.put("container_name", ""); cut_jo2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0);
cut_jo2.put("update_optid", currentUserId); if (ObjectUtil.isEmpty(cut_jo2)) {
cut_jo2.put("update_optname", currentUsername); throw new BadRequestException("任务点位异常，st_ivt_coolpointivt表找不到满轴点位:"+point_code1);
cut_jo2.put("update_time", DateUtil.now()); }
WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); container_name = cut_jo2.getString("container_name");
cut_jo2.put("full_point_status", "01");
cut_jo2.put("full_vehicle_code", "");
cut_jo2.put("container_name", "");
cut_jo2.put("update_optid", currentUserId);
cut_jo2.put("update_optname", currentUsername);
cut_jo2.put("update_time", DateUtil.now());
WQLObject.getWQLObject("st_ivt_coolpointivt").update(cut_jo2);
}
}else{
container_name = cut_jo2.getString("container_name");
cut_jo2.put("full_point_status", "01");
cut_jo2.put("full_vehicle_code", "");
cut_jo2.put("container_name", "");
cut_jo2.put("update_optid", currentUserId);
cut_jo2.put("update_optname", currentUsername);
cut_jo2.put("update_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2);
}
//更新冷却区空轴库存 //更新冷却区空轴库存
JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0);