From 7cfe04a97719ff105567b0aa0c4797ef00498a38 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sat, 27 Jan 2024 16:29:16 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=A5=97=E8=BD=B4=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BB=BB=E5=8A=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 987fd8e45..3b0dee947 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -974,6 +974,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("sendGetGoalStruct请求参数为--------------------------：" + whereJson.toString()); //type:2、反馈尺寸；3、申请放货；4、申请取货；6、套轴申请；7、套轴完成；8、拔轴完成；9、反馈重量 String type = whereJson.getString("type"); + String device_code = whereJson.getString("device_code"); JSONObject result = new JSONObject(); //桁架任务 @@ -981,11 +982,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //纸管任务 String task_code2 = whereJson.getString("task_code2"); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(task_jo)) { + if (ObjectUtil.isEmpty(task_jo) && !type.equals("6")) { throw new BadRequestException("接口sendGetGoalStruct，任务号为空！"); } JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0); - String product_area = task_jo.getString("product_area"); + String product_area = ""; + if (type.equals("6")) { + JSONObject device_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_code = '" + device_code + "'").uniqueResult(0); + product_area = device_jo.getString("product_area"); + } else { + product_area = task_jo.getString("product_area"); + } + String public_area = ""; if (product_area.equals("A1") || product_area.equals("A2")) { public_area = "A1"; @@ -1248,11 +1256,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { WQLObject.getWQLObject("st_ivt_shaftivt").update(rgv_device); //如果套管工位有货且套轴区域无轴，搬运一根轴到穿拔轴机上 - if (rgv_device.getIntValue("have_qzz") == 0){ + if (rgv_device.getIntValue("have_qzz") == 0) { //判断当前穿拔轴机构上是否存在可用的气涨轴 String cbj_qzz = cbz_jo.getString("have_qzz"); //判断是否存在未完成的成品下卷任务 - 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); + 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); if ("0".equals(cbj_qzz) && ObjectUtil.isEmpty(container_jo)) { PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); //查询套管工位的库存信息 @@ -1291,7 +1299,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject fhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '7' AND product_area = '" + product_area + "'").uniqueResult(0); jo.put("point_code2", fhd_jo.getString("point_code")); jo.put("product_area", product_area); - jo.put("vehicle_code", DateUtil.format(DateUtil.date(),"HHmm")+"qzz"); + jo.put("vehicle_code", DateUtil.format(DateUtil.date(), "HHmm") + "qzz"); jo.put("truss_type", "8"); JSONObject request_param = new JSONObject(); request_param.put("have_size", cbz_size); @@ -1389,8 +1397,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } } else { //判断当前套管工位上是否存在可用的纸管或任务 - JSONObject tggw_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '4' AND product_area = '" + product_area + "'").uniqueResult(0); - JSONObject tggw_task = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+tggw_jo.getString("point_code")+"' AND task_type = '010607' AND is_delete = '0' ADN task_status < '07'").uniqueResult(0); +// JSONObject tggw_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '4' AND product_area = '" + product_area + "'").uniqueResult(0); +// JSONObject tggw_task = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+tggw_jo.getString("point_code")+"' AND task_type = '010607' AND is_delete = '0' ADN task_status < '07'").uniqueResult(0); //判断在等待任务数量范围内是否存在符合的纸管，如果存在则等待，不存在则创建空载具入库任务 boolean need_wait = this.judgeWait(product_area, vehicle_jo); if (!need_wait) {