From 006856220da6c5e5e95d369fcdac47082d196c9f Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 1 Mar 2023 11:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/LmsToMesServiceImpl.java | 40 ++++++++ .../mes/service/impl/MesToLmsServiceImpl.java | 93 +++++++++++------- .../pda/mps/service/impl/OutServiceImpl.java | 4 + .../mps/service/impl/RawFoilServiceImpl.java | 11 ++- .../java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql | 2 +- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 250368 -> 250368 bytes .../org/nl/wms/sch/tasks/CutTrussTask.java | 4 +- .../org/nl/wms/sch/tasks/InCoolIvtTask.java | 2 + 8 files changed, 115 insertions(+), 41 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index db31a7ce3..6d514b609 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.ext.mes.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONArray; @@ -8,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; @@ -91,6 +93,25 @@ public class LmsToMesServiceImpl implements LmsToMesService { return result; } + //判断母卷对应的设备是否启用，如果启用则回传，未启用则不回传 + String iContainerName = param.getString("iContainerName"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + iContainerName + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到母卷号:" + iContainerName + "对应的生箔工单！"); + } + String resource_name = raw_jo.getString("resource_name"); + JSONObject sb_jo = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code ='" + resource_name + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(sb_jo)) { + throw new BadRequestException("未查询到母卷号：" + iContainerName + "对应的生箔机台编号！"); + } + if (StrUtil.equals("0", sb_jo.getString("is_used"))) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "设备：" + sb_jo.getString("point_code") + "未启动!"); + result.put("data", new JSONObject()); + return result; + } + JSONArray list = new JSONArray(); // String url = acsUrl + api; @@ -134,6 +155,25 @@ public class LmsToMesServiceImpl implements LmsToMesService { return result; } + //判断母卷对应的设备是否启用，如果启用则回传，未启用则不回传 + String iContainerName = param.getString("iContainerName"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + iContainerName + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到母卷号:" + iContainerName + "对应的生箔工单！"); + } + String resource_name = raw_jo.getString("resource_name"); + JSONObject sb_jo = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code ='" + resource_name + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(sb_jo)) { + throw new BadRequestException("未查询到母卷号：" + iContainerName + "对应的生箔机台编号！"); + } + if (StrUtil.equals("0", sb_jo.getString("is_used"))) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "设备：" + sb_jo.getString("point_code") + "未启动!"); + result.put("data", new JSONObject()); + return result; + } + String UserName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 39d326a9a..590ee5f45 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -147,31 +147,34 @@ public class MesToLmsServiceImpl implements MesToLmsService { JSONObject result = new JSONObject(); try { - String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue(); - if (StrUtil.equals(is_mesTolms, "1")) { - String ContainerName = param.getString("ContainerName"); - String ResourceName = param.getString("ResourceName"); - //查询该母卷号、设备号对应的生箔工单 - JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "' AND resource_name = '" + ResourceName + "'").uniqueResult(0); + JSONArray arr = new JSONArray(); + String ContainerName = param.getString("ContainerName"); + String ResourceName = param.getString("ResourceName"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "' AND resource_name = '" + ResourceName + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(raw_jo)) { - throw new BadRequestException("未查询到对应的生箔工单！"); - } + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到对应的生箔工单！"); + } - JSONArray data = new JSONArray(); + //查询对应的设备是否启用 + JSONObject jsonPoint = WQLObject.getWQLObject("ST_IVT_SbPointIvt").query("ext_code ='" + ResourceName + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonPoint)) { + jsonPoint = new JSONObject(); + } + if (StrUtil.equals("1", jsonPoint.getString("is_used"))) { JSONObject json = new JSONObject(); json.put("ContainerName", raw_jo.getString("container_name")); json.put("ResourceName", raw_jo.getString("resource_name")); json.put("Weight", String.format("%.2f", raw_jo.getDoubleValue("productin_qty"))); json.put("WeighDate", DateUtil.now()); - data.add(json); + arr.add(json); } result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); result.put("RTOAL", 1); - result.put("RTDAT", null); + result.put("RTDAT", arr); System.out.println(result); - } catch (Exception e) { result.put("RTYPE", "E"); result.put("RTMSG", "操作失败!" + e.getMessage()); @@ -199,16 +202,22 @@ public class MesToLmsServiceImpl implements MesToLmsService { WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 try { - String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue(); - if (StrUtil.equals(is_mesTolms, "1")) { - String containerName = param.getString("ContainerName"); - String resourceName = param.getString("ResourceName"); - if (ObjectUtil.isEmpty(resourceName)) throw new BadRequestException("机台编码不能为空"); - if (ObjectUtil.isEmpty(containerName)) throw new BadRequestException("母卷号不能为空"); + String containerName = param.getString("ContainerName"); + String resourceName = param.getString("ResourceName"); + if (ObjectUtil.isEmpty(resourceName)) throw new BadRequestException("机台编码不能为空"); + if (ObjectUtil.isEmpty(containerName)) throw new BadRequestException("母卷号不能为空"); - JSONObject jsonSb = sbTab.query("ext_code = '" + resourceName + "' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位设备不存在"); + JSONObject jsonSb = sbTab.query("ext_code = '" + resourceName + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位设备不存在"); + if (StrUtil.equals("1", jsonSb.getString("is_used"))) { + //查询该母卷对应的工单状态是否为准备就绪，如果不是则提示报错 + // 更新工单状态 + JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonRaw)) throw new BadRequestException("工单不存在"); + if (!jsonRaw.getString("status").equals("03")) { + throw new BadRequestException("该生箔工单对应的状态不为准备就绪，不允许确认下卷！"); + } // 下发ACS更改任务状态 JSONArray paramArr = new JSONArray(); JSONObject json = new JSONObject(); @@ -220,10 +229,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (!StrUtil.equals(resultAcs.getString("status"), "200")) { throw new BadRequestException(resultAcs.getString("message ")); } - - // 更新工单状态 - JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonRaw)) throw new BadRequestException("工单不存在"); jsonRaw.put("status", "04"); rawTab.update(jsonRaw); } @@ -259,16 +264,28 @@ public class MesToLmsServiceImpl implements MesToLmsService { JSONObject jsonParam = new JSONObject(); try { - String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue(); - if (StrUtil.equals(is_mesTolms, "1")) { - String containerName = param.getString("ContainerName"); // 母卷号 - String nextSpec = param.getString("NextSpec"); // 下工序：1-入烘箱，2-入冷却 - String bakingTemperature = param.getString("BakingTemperature"); // 温度 - String bakingTimer = param.getString("BakingTimer"); // 烘烤时间 + String containerName = param.getString("ContainerName"); // 母卷号 + String nextSpec = param.getString("NextSpec"); // 下工序：1-入烘箱，2-入冷却 + String bakingTemperature = param.getString("BakingTemperature"); // 温度 + String bakingTimer = param.getString("BakingTimer"); // 烘烤时间 - if (ObjectUtil.isEmpty(containerName)) throw new BadRequestException("母卷号不能为空"); - if (ObjectUtil.isEmpty(nextSpec)) throw new BadRequestException("下工序不能为空"); + if (ObjectUtil.isEmpty(containerName)) throw new BadRequestException("母卷号不能为空"); + if (ObjectUtil.isEmpty(nextSpec)) throw new BadRequestException("下工序不能为空"); + //判断母卷号对应的设备是否启用，启用则调度生成任务，未启用返回MES成功 + String ContainerName = param.getString("ContainerName"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "'").uniqueResult(0); + + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到对应的生箔工单！"); + } + String resource_name = raw_jo.getString("resource_name"); + JSONObject sb_jo = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code ='" + resource_name + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(sb_jo)) { + throw new BadRequestException("未查询到母卷号：" + ContainerName + "对应的生箔机台编号！"); + } + if (StrUtil.equals("1", sb_jo.getString("is_used"))) { if (StrUtil.equals(nextSpec, "1")) { /* * 入烘箱 @@ -675,7 +692,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (Status.equals("1")) { for (int i = 0; i < param.size(); i++) { JSONObject row = param.getJSONObject(i); - JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "'").uniqueResult(0); + JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(plan_jo)) { throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup")); } @@ -697,7 +714,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { for (int i = 0; i < param.size(); i++) { JSONObject row = param.getJSONObject(i); - JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "'").uniqueResult(0); + JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(plan_jo)) { throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup")); } @@ -715,7 +732,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { //更新分切计划表状态 for (int i = 0; i < param.size(); i++) { JSONObject row = param.getJSONObject(i); - JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "'").uniqueResult(0); + JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(plan_jo)) { throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup")); } @@ -747,7 +764,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { for (int i = 0; i < param.size(); i++) { JSONObject row = param.getJSONObject(i); //查询对应的分切计划 - JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "'").uniqueResult(0); + JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(plan_jo)) { throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup")); } @@ -833,6 +850,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { jo.put("is_last", "1"); } + } else { + jo.put("is_last", "0"); } } else { jo.put("is_last", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 270802c5d..551707aef 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -55,6 +55,10 @@ public class OutServiceImpl implements OutService { String point_code = whereJson.getString("point_code"); String is_last = whereJson.getString("is_last"); + if (StrUtil.isEmpty(is_last)){ + throw new BadRequestException("是否末次下卷不能为空！"); + } + JSONArray rows = whereJson.getJSONArray("cut_rows"); if (rows.size() > 2) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 7e1d16a39..1433f5f61 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -21,6 +21,7 @@ import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.service.RawFoilService; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.tasks.CallEmpReelTask; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -142,7 +143,11 @@ public class RawFoilServiceImpl implements RawFoilService { if (!StrUtil.equals(jsonRaw.getString("status"), "01")) throw new BadRequestException("工单状态不为开始"); JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("生箔点位不存在"); + if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位："+jsonRaw.getString("resource_name")+"生箔设备不存在"); + + if (StrUtil.equals("0", jsonSb.getString("is_used"))) { + throw new BadRequestException("当前生箔机："+jsonSb.getString("ext_code")+"未启用！"); + } String start_pint_code = ""; String point_code4 = ""; @@ -198,6 +203,10 @@ public class RawFoilServiceImpl implements RawFoilService { throw new BadRequestException("未查到相关的生箔机点位！"); } + if (StrUtil.equals("0", raw_jo.getString("is_used"))) { + throw new BadRequestException("当前生箔机："+raw_jo.getString("ext_code")+"未启用！"); + } + // 2.根据就近原则查对应空卷抽 JSONObject map = new JSONObject(); map.put("flag", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql index cf6946479..08f216728 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql @@ -49,7 +49,7 @@ der.STATUS WHEN '01' THEN '开始' WHEN '02' THEN '空轴搬出' - WHEN '03' THEN '确认下卷' + WHEN '03' THEN '准备就绪' WHEN '04' THEN '下卷完成' WHEN '09' THEN '结束' END diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index c59ba5410508323805d0bda7e7168c9aba7e37d7..d986a55b2f8432eda4fc80e88e08d8639b962702 100644 GIT binary patch delta 6610 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 n!iD=P?SKMhsB0< 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index 4b72a3241..3ba7c1be4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -382,7 +382,7 @@ public class CutTrussTask extends AbstractAcsTask { //更新入站气涨轴的分切计划状态 JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan_jo)) { - throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code") + "对应的分切计划！"); + throw new BadRequestException("未查询到状态为入站完成气涨轴：" + json.getString("vehicle_code") + "对应的分切计划！"); } for (int i = 0; i < plan_jo.size(); i++) { JSONObject plan_row = plan_jo.getJSONObject(i); @@ -394,7 +394,7 @@ public class CutTrussTask extends AbstractAcsTask { //更新出站气涨轴的分切计划状态 JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code2") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan_jo2)) { - throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code2") + "对应的分切计划！"); + throw new BadRequestException("未查询到状态为入站完成气涨轴：" + json.getString("vehicle_code2") + "对应的分切计划！"); } for (int i = 0; i < plan_jo2.size(); i++) { JSONObject plan_row = plan_jo2.getJSONObject(i); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index ba89fe95f..8d7d73b09 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -208,6 +208,8 @@ public class InCoolIvtTask extends AbstractAcsTask { json.put("acs_task_type","3" ); tab.insert(json); + this.immediateNotifyAcs(null); + return json.getString("task_id"); }