diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java index d414a91f8..0fcb924dc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java @@ -46,7 +46,7 @@ public class AutoSendOutShaft { queryRgvParam.put("product_area", rgv_jo.getString("product_area")); JSONObject canUseRgv = wmsToAcsService.queryRGVStatus(queryRgvParam); String rgvResStatus = canUseRgv.getString("status"); - boolean canUse = true; + boolean canUse = false; if (rgvResStatus.equals("200")) { int qty = canUseRgv.getInteger("qty"); IschBaseTaskService taskService = SpringContextHolder.getBean(IschBaseTaskService.class); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index f2968bc35..b332a8838 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -127,11 +127,22 @@ public class PaperTubeTask extends AbstractAcsTask { JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0); //判断是否存在未完成的成品下卷任务 JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); - + boolean needCallShaft = false; + if ("1".equals(have_qzz)) { + // 有轴也不一定能用,判断是否存在搬走的任务 + JSONObject haveTask = WQLObject.getWQLObject("sch_base_task") + .query("point_code1 = '" + cbz_jo.getString("point_code") + + "' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'") + .uniqueResult(0); + if (ObjectUtil.isNotEmpty(haveTask)) { + needCallShaft = true; + } + } if (("0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz")) && ObjectUtil.isEmpty(container_jo)) || (ObjectUtil.isNotEmpty(container_jo) && ( container_jo.getString("point_code2").contains("RG_RGV") - || container_jo.getString("point_code2").contains("CPZC")))) { + || container_jo.getString("point_code2").contains("CPZC"))) + || needCallShaft) { PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); // 创建桁架任务搬运一个符合的气涨轴 JSONObject jo = new JSONObject();