From 522abe91c7abc9264435aef5a226e132150addc9 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 8 Sep 2025 17:02:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:B1=E5=85=A5=E7=83=98=E7=AE=B1=E6=89=BE?= =?UTF-8?q?=E5=86=B7=E5=8D=B4=E7=82=B9=E7=BB=9F=E4=B8=80=E7=94=A8=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E5=8E=BB=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 8fb2a5ff2..7a15ebd8a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -209,7 +209,7 @@ public class CallEmpReelTask extends AbstractAcsTask { throw new BadRequestException("终点未找到可用点位:" + point_code2); } - //创建桁架任务将子卷搬运到桁架下的半成品缓存位 + /*//创建桁架任务将子卷搬运到桁架下的半成品缓存位 //查询当前点位为空且没有任务的桁架内缓存点 JSONObject cache_param = new JSONObject(); cache_param.put("flag", "4"); @@ -250,7 +250,29 @@ public class CallEmpReelTask extends AbstractAcsTask { param.put("type", "3"); InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); inHotTask.createTask(param); - } + }*/ + JSONObject cache_param = new JSONObject(); + cache_param.put("flag", "4"); + cache_param.put("point_location", jsonIvt.getString("point_location")); + cache_param.put("product_area", jsonIvt.getString("product_area")); + // 创建半条任务 + JSONObject jo = new JSONObject(); + jo.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); + jo.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); + jo.put("task_type", "010206"); + jo.put("task_status", TaskStatusEnum.SURE_START.getCode()); + jo.put("point_code1", point_code4); + jo.put("point_code2", ""); + jo.put("material_code", jsonTask.getString("material_code")); + jo.put("product_area", jsonTask.getString("product_area")); + jo.put("handle_class", InHotTask.class.getName()); + jo.put("remark", cache_param); + jo.put("type", "3"); + jo.put("priority", "1"); + jo.put("sort_seq", "1"); + jo.put("create_time", DateUtil.now()); + jo.put("acs_task_type", "6"); + taskTab.insert(jo); // 更新点位库存状态 jsonIvt2.put("point_status", "2"); jsonIvt2.put("material_code", jsonTask.getString("material_code")); From 2bcaebfa1440d2e2e4e0e29440a44083b7934e23 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 9 Sep 2025 13:41:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=B7=B1=E6=B5=85=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E8=A2=AB=E9=94=81=E5=AE=9A=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSubpackagerelationServiceImpl.java | 4 +- .../org/nl/b_lms/sch/tasks/TwoOutBoxTask.java | 42 ++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index b00647279..72f4ecbd6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -460,10 +460,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl{ + RedissonUtils.lock(c -> { if (status.equals(TaskStatusEnum.FINISHED.getCode())) { immediateNotifyAcs(null); } - },"zjInBound",20,this); + }, "zjInBound", 20, this); } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { @@ -229,10 +233,10 @@ public class TwoOutBoxTask extends AbstractAcsTask { throw new BadRequestException("木箱号不能为空!"); } String vehicle_code = form.getString("vehicle_code"); - String point_code1 = form.getString("start_device_code"); + String point_code1 = form.getString("start_device_code"); JSONObject task1 = isSingleTask(point_code1); - if ( ObjectUtil.isNotEmpty(task1)) { - throw new BadRequestException("载具:"+vehicle_code+"所在点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code")); + if (ObjectUtil.isNotEmpty(task1)) { + throw new BadRequestException("载具:" + vehicle_code + "所在点位：" + point_code1 + "存在未完成的任务:" + task1.getString("task_code")); } JSONObject json = new JSONObject(); json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -276,13 +280,13 @@ public class TwoOutBoxTask extends AbstractAcsTask { JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); - if(ObjectUtil.isNotEmpty(task1)){ + if (ObjectUtil.isNotEmpty(task1)) { return task1; - }else if(ObjectUtil.isNotEmpty(task2)){ + } else if (ObjectUtil.isNotEmpty(task2)) { return task2; - }else if(ObjectUtil.isNotEmpty(task3)){ + } else if (ObjectUtil.isNotEmpty(task3)) { return task3; - }else if(ObjectUtil.isNotEmpty(task4)){ + } else if (ObjectUtil.isNotEmpty(task4)) { return task4; }