From b9d1c04bb5055d03eb6cc143e2082ff122a767af Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sat, 15 Oct 2022 14:58:34 +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 --- .../wms/pda/mps/rest/RawFoilController.java | 6 +- .../wms/pda/mps/service/RawFoilService.java | 12 +- .../pda/mps/service/impl/OutServiceImpl.java | 6 +- .../service/impl/PointStatusServiceImpl.java | 6 + .../mps/service/impl/RawFoilServiceImpl.java | 147 +++++++++++++----- .../java/org/nl/wms/pda/mps/wql/PDA_02.wql | 5 +- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 237568 -> 237568 bytes .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 8 +- .../org/nl/wms/sch/tasks/CutTrussTask.java | 42 ++++- 9 files changed, 171 insertions(+), 61 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java index bc860165b..51122feeb 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java @@ -48,8 +48,8 @@ public class RawFoilController { @Log("呼叫空轴") @ApiOperation("呼叫空轴") public ResponseEntity needEmptyAxis(@RequestBody JSONObject whereJson) { - rawFoilService.needEmptyAxis(whereJson); - return new ResponseEntity<>( HttpStatus.OK); + + return new ResponseEntity<>(rawFoilService.needEmptyAxis(whereJson), HttpStatus.OK); } @PostMapping("/confirmBlanking") @@ -57,7 +57,7 @@ public class RawFoilController { @ApiOperation("确认下卷") public ResponseEntity confirmBlanking(@RequestBody JSONObject whereJson) { rawFoilService.confirmBlanking(whereJson); - return new ResponseEntity<>( HttpStatus.OK); + return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/finishBlanking") diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java index 6930a580f..dc1251681 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java @@ -9,28 +9,28 @@ public interface RawFoilService { * 查询生产区域 * @return json */ - JSONArray queryProductArea(); + JSONObject queryProductArea(); /** * 查询生箔生产进度 * @param whereJson / * @return JSONObject */ - JSONArray queryRawFoil(JSONObject whereJson); + JSONObject queryRawFoil(JSONObject whereJson); /** * 查询生箔工单 * @param whereJson / * @return JSONObject */ - JSONArray queryRawFoilList(JSONObject whereJson); + JSONObject queryRawFoilList(JSONObject whereJson); /** * 确认下卷 * @param whereJson / * @return JSONObject */ - void needEmptyAxis(JSONObject whereJson); + JSONObject needEmptyAxis(JSONObject whereJson); /** * 查询生箔工单 @@ -44,12 +44,12 @@ public interface RawFoilService { * @param whereJson / * @return JSONObject */ - void finishBlanking(JSONObject whereJson); + JSONObject finishBlanking(JSONObject whereJson); /** * 完成 * @param whereJson / * @return JSONObject */ - void finish(JSONObject whereJson); + JSONObject finish(JSONObject whereJson); } diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 0bf19d21f..a8074ef0f 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -14,6 +14,7 @@ import org.nl.wms.pda.mps.service.OutService; import org.nl.wms.pda.mps.service.ShippingService; import org.nl.wms.sch.tasks.CutTrussTask; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; @@ -42,12 +43,13 @@ public class OutServiceImpl implements OutService { @Override + @Transactional(rollbackFor = Exception.class) public JSONObject confirm(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); JSONArray rows = whereJson.getJSONArray("cut_rows"); - String cut_qzzno = rows.getJSONObject(0).getString("qzz_no"); + String cut_qzzno = rows.getJSONObject(0).getString("qzzno"); //查询该点位对应的机台编号 JSONObject cut_ivt = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code ='"+point_code+"' OR down_point_code ='"+point_code+"'").uniqueResult(0); @@ -58,7 +60,7 @@ public class OutServiceImpl implements OutService { String ext_code = cut_ivt.getString("ext_code"); //查询该机台编号已经配送完成，套轴完成但是未完成的分切计划 - JSONObject slitting = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("resource_name = '"+ext_code+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND status = '1'").uniqueResult(0); + JSONObject slitting = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("resource_name = '"+ext_code+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND status = '03'").uniqueResult(0); if (ObjectUtil.isEmpty(slitting)){ throw new BadRequestException("该分切机没有对应完成配送完成的气涨轴！"); diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java index 02b2bdf20..96ffa1c2e 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java @@ -109,8 +109,14 @@ public class PointStatusServiceImpl implements PointStatusService { } JSONObject jo = new JSONObject(); jo.put("container_name", vehicle_code); + if (have_goods.equals("01")){ + have_goods = "否"; + }else { + have_goods = "是"; + } jo.put("have_goods", have_goods); + JSONObject result = new JSONObject(); result.put("data", jo); result.put("message", "查询成功！"); diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 37de3dcaa..0cb85d80e 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -34,15 +34,18 @@ public class RawFoilServiceImpl implements RawFoilService { private final PointService pointService; @Override - public JSONArray queryProductArea() { + public JSONObject queryProductArea() { JSONObject map = new JSONObject(); map.put("flag", "3"); JSONArray jsonArr = WQL.getWO("PDA_RAWFOIL_01").addParam("flag", "3").process().getResultJSONArray(0); - return jsonArr; + JSONObject jo = new JSONObject(); + jo.put("data", jsonArr); + jo.put("message", "查询成功!"); + return jo; } @Override - public JSONArray queryRawFoil(JSONObject whereJson) { + public JSONObject queryRawFoil(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); String container_name = whereJson.getString("container_name"); String product_area = whereJson.getString("product_area"); @@ -80,8 +83,13 @@ public class RawFoilServiceImpl implements RawFoilService { long betweenDay = DateUtil.between(end_time2, now_time, DateUnit.MINUTE, false); - if (betweenDay > 0) json.put("color_type", "1"); - if (betweenDay <= 0 && betweenDay >= -30) json.put("color_type", "2"); + if (betweenDay > 0) { + json.put("color_type", "1"); + }else if(betweenDay <= 0 && betweenDay >= -30) { + json.put("color_type", "2"); + }else { + json.put("color_type", "0"); + } json.put("container_name", jsonObject.getString("container_name")); json.put("realstart_time", jsonObject.getString("realstart_time")); @@ -93,22 +101,28 @@ public class RawFoilServiceImpl implements RawFoilService { resultArr.add(json); } - return resultArr; + JSONObject jo = new JSONObject(); + jo.put("data", resultArr); + jo.put("message", "查询成功!"); + return jo; } @Override - public JSONArray queryRawFoilList(JSONObject whereJson) { + public JSONObject queryRawFoilList(JSONObject whereJson) { JSONObject map = new JSONObject(); map.put("flag", "5"); map.put("point_code", whereJson.getString("point_code")); map.put("container_name", whereJson.getString("container_name")); JSONArray resultJSONArray = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().getResultJSONArray(0); - return resultJSONArray; + JSONObject jo = new JSONObject(); + jo.put("data", resultJSONArray); + jo.put("message", "查询成功!"); + return jo; } @Override @Transactional(rollbackFor = Exception.class) - public void needEmptyAxis(JSONObject whereJson) { + public JSONObject needEmptyAxis(JSONObject whereJson) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); @@ -138,10 +152,41 @@ public class RawFoilServiceImpl implements RawFoilService { } else { start_pint_code = jsonIvt.getString("empty_point_code"); } + + //查询满轴存放点位 + // 2.根据就近原则查对应空卷抽 + String point_code4= ""; + JSONObject map4 = new JSONObject(); + map4.put("flag", "2"); + map4.put("product_area", jsonPoint.getProduct_area()); + map4.put("point_location", jsonPoint.getPoint_location()); + JSONObject jsonIvt4 = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0); + // 3.如果没找到则继续找下一节点 + if (ObjectUtil.isEmpty(jsonIvt)) { + String point_location = jsonPoint.getPoint_location(); + if (StrUtil.equals(point_location, "0")) { + map.put("point_location", "1"); + } + if (StrUtil.equals(point_location, "1")) { + map.put("point_location", "0"); + } + JSONObject jsonIvt_tow = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonIvt_tow)) { + throw new BadRequestException("没有空位"); + } + point_code4 = jsonIvt_tow.getString("full_point_code"); + } else { + point_code4 = jsonIvt.getString("full_point_code"); + } // 起点和终点确定 生成任务 JSONObject param = new JSONObject(); - param.put("start_pint_code", start_pint_code); - param.put("end_pint_code", end_pint_code); + param.put("point_code1", start_pint_code); + param.put("point_code2", end_pint_code); + param.put("point_code3", end_pint_code); + param.put("point_code4", point_code4); + param.put("task_type", "010101"); + param.put("material_code", whereJson.getString("container_name")); CallEmpReelTask callEmpReelTask = new CallEmpReelTask(); String task_id = callEmpReelTask.createTask(param); @@ -154,15 +199,23 @@ public class RawFoilServiceImpl implements RawFoilService { jsonTask.put("task_status", "05"); taskTab.update(jsonTask); } + JSONObject jo = new JSONObject(); + jo.put("message", "操作成功!"); + return jo; } @Override public void confirmBlanking(JSONObject whereJson) { + //查询该母卷号对应的任务 + String container_name = whereJson.getString("container_name"); + JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '"+container_name+"'").uniqueResult(0); + + //下发ACS，执行取满放空的AGV动作 } @Override - public void finishBlanking(JSONObject whereJson) { + public JSONObject finishBlanking(JSONObject whereJson) { String start_pint_code = whereJson.getString("point_code"); WQLObject regionTab = WQLObject.getWQLObject("ST_IVT_CoolRegionIO"); // 冷却区出入表 @@ -170,6 +223,10 @@ public class RawFoilServiceImpl implements RawFoilService { WQLObject coolTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 + //查询该母卷号对应的任务 + String container_name = whereJson.getString("container_name"); + JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '"+container_name+"'").uniqueResult(0); + JSONObject jsonCool = coolTab.query("mfg_order_name = '" + whereJson.getString("mfg_order_name") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(start_pint_code)) throw new BadRequestException("起点不能为空"); @@ -179,7 +236,7 @@ public class RawFoilServiceImpl implements RawFoilService { PointDto jsonPoint = pointService.findByCode(start_pint_code); if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("起点点位不存在"); - // 2.根据就近原则查对应空卷抽 + /*// 2.根据就近原则查对应空卷抽 JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("product_area", jsonPoint.getProduct_area()); @@ -200,11 +257,9 @@ public class RawFoilServiceImpl implements RawFoilService { // 4.起点和终点确定 生成任务 JSONObject param = new JSONObject(); - param.put("start_pint_code",start_pint_code); - param.put("end_pint_code",end_point_code); - - BookTwoConfirmTask bookTwoConfirmTask = new BookTwoConfirmTask(); - String task_id = bookTwoConfirmTask.createTask(param); + param.put("start_pint_code", start_pint_code); + param.put("end_pint_code", end_point_code); + String task_id = bookTwoConfirmTask.createTask(param);*/ // 5.插入入库单 Long currentUserId = SecurityUtils.getCurrentUserId(); @@ -213,49 +268,57 @@ public class RawFoilServiceImpl implements RawFoilService { JSONObject jsonMater = materTab.query("material_code = '" + jsonCool.getString("product_name") + "'").uniqueResult(0); JSONObject jsonRegion = new JSONObject(); - jsonRegion.put("iostorinv_id", IdUtil.getSnowflake(1,1).nextId()); + jsonRegion.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); jsonRegion.put("bill_code", CodeUtil.getNewCode("COOLREGION_BILL_CODE")); jsonRegion.put("io_type", "1"); jsonRegion.put("material_id", jsonMater.getString("material_id")); - jsonRegion.put("pcsn",""); - jsonRegion.put("vehicle_code",""); - jsonRegion.put("qty",jsonCool.getString("productin_qty")); - jsonRegion.put("qty_unit_id",""); - jsonRegion.put("bill_status","10"); - jsonRegion.put("start_point_code",start_pint_code); - jsonRegion.put("end_point_code",end_point_code); - jsonRegion.put("cust_id",""); - jsonRegion.put("create_mode","03"); - jsonRegion.put("task_id",task_id); - jsonRegion.put("create_id",currentUserId); - jsonRegion.put("create_name",currentUsername); - jsonRegion.put("create_time",DateUtil.now()); + jsonRegion.put("pcsn", ""); + jsonRegion.put("vehicle_code", ""); + jsonRegion.put("qty", jsonCool.getString("productin_qty")); + jsonRegion.put("qty_unit_id", ""); + jsonRegion.put("bill_status", "10"); + jsonRegion.put("start_point_code", start_pint_code); + jsonRegion.put("end_point_code", end_point_code); + jsonRegion.put("cust_id", ""); + jsonRegion.put("create_mode", "03"); + jsonRegion.put("task_id", task_jo.getString("task_id")); + jsonRegion.put("create_id", currentUserId); + jsonRegion.put("create_name", currentUsername); + jsonRegion.put("create_time", DateUtil.now()); regionTab.insert(jsonRegion); - // 6.下发任务 - JSONObject jsonObject = bookTwoConfirmTask.renotifyAcs(task_id); + // 6.下发任务入库任务 + BookTwoConfirmTask bookTwoConfirmTask = new BookTwoConfirmTask(); + JSONObject jsonObject = bookTwoConfirmTask.renotifyAcs(task_jo.getString("task_id")); if (StrUtil.equals(jsonObject.getString("status"), "200")) { // 成功返回 更新任务状态 - JSONObject jsonTask = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); + JSONObject jsonTask = taskTab.query("task_id ='" + task_jo.getString("task_id") + "'").uniqueResult(0); jsonTask.put("task_status", "05"); taskTab.update(jsonTask); // 更新出入表状态 jsonRegion.put("bill_status", "30"); - jsonRegion.put("update_optid",currentUserId); - jsonRegion.put("update_optname",currentUsername); - jsonRegion.put("update_time",DateUtil.now()); + jsonRegion.put("update_optid", currentUserId); + jsonRegion.put("update_optname", currentUsername); + jsonRegion.put("update_time", DateUtil.now()); regionTab.update(jsonRegion); } + JSONObject jo = new JSONObject(); + jo.put("message", "操作成功!"); + return jo; } @Override - public void finish(JSONObject whereJson) { + public JSONObject finish(JSONObject whereJson) { WQLObject coolTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 JSONObject jsonCool = coolTab.query("mfg_order_name = '" + whereJson.getString("mfg_order_name") + "'").uniqueResult(0); - jsonCool.put("status","2"); - jsonCool.put("realend_time",DateUtil.now()); - jsonCool.put("finish_type","02"); + jsonCool.put("status", "2"); + jsonCool.put("realend_time", DateUtil.now()); + jsonCool.put("finish_type", "02"); coolTab.update(jsonCool); + + JSONObject jo = new JSONObject(); + jo.put("message", "操作成功!"); + return jo; } } diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index ce148c373..affbc4960 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -170,12 +170,13 @@ plan.workorder_id, ivt.sort_seq, ivt.product_area, - ivt.point_location + ivt.point_location, + plan.qzzno FROM PDM_BI_SlittingProductionPlan plan LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name WHERE - plan.STATUS = 03 + plan.STATUS = 05 AND is_child_tz_ok = 1 AND diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index f149ed0738f7166afd1feb6e0993371f43054a13..c689ad236af21b1ffe693a9b97cb83011fa5dcd9 100644 GIT binary patch delta 5831 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 delta 5795 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 diff --git a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index d71663840..db283739e 100644 --- a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -101,10 +101,12 @@ public class CallEmpReelTask extends AbstractAcsTask { JSONObject json = new JSONObject(); json.put("task_id",IdUtil.getSnowflake(1,1).nextId()); json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - json.put("task_type", "05"); json.put("task_status", "01"); - json.put("point_code1", form.getString("start_pint_code")); - json.put("point_code2", form.getString("end_pint_code")); + json.put("point_code1", form.getString("point_code1")); + json.put("point_code2", form.getString("point_code2")); + json.put("point_code3", form.getString("point_code3")); + json.put("point_code4", form.getString("point_code4")); + json.put("task_type", form.getString("task_type")); json.put("handle_class", THIS_CLASS); json.put("sort_seq", "1"); json.put("create_id", currentUserId); diff --git a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index 002f5cf54..25711eafb 100644 --- a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -68,14 +68,15 @@ public class CutTrussTask extends AbstractAcsTask { } WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_point); //更新输送线的气涨轴编码 - JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("qzzno = '"+jsonTask.getString("point_code1")+"'").uniqueResult(0); + JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("point_code = '"+jsonTask.getString("point_code1")+"'").uniqueResult(0); if (ObjectUtil.isEmpty(delivery_point)){ throw new BadRequestException("未查询到对应的输送线点位！"); } delivery_point.put("qzzno",jsonTask.getString("vehicle_code2")); + delivery_point.put("point_status","04"); WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").update(delivery_point); - //更新分切计划状态 - JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+jsonTask.getString("vehicle_code2")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '1'").getResultJSONArray(0); + //更新出站气涨轴的分切计划状态 + JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+jsonTask.getString("vehicle_code2")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan_jo)){ throw new BadRequestException("未查询到气涨轴："+jsonTask.getString("vehicle_code2")+"对应的分切计划！"); } @@ -85,6 +86,17 @@ public class CutTrussTask extends AbstractAcsTask { plan_row.put("end_time",DateUtil.now()); WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); } + //更新入站气涨轴的分切计划状态 + JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+jsonTask.getString("vehicle_code")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '04'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(plan_jo2)){ + throw new BadRequestException("未查询到气涨轴："+jsonTask.getString("vehicle_code")+"对应的分切计划！"); + } + for (int i = 0; i < plan_jo2.size(); i++) { + JSONObject plan_row = plan_jo2.getJSONObject(i); + plan_row.put("status","05"); + plan_row.put("end_time",DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } } } } @@ -125,6 +137,30 @@ public class CutTrussTask extends AbstractAcsTask { json.put("acs_task_type","5" ); tab.insert(json); + //更新入站气涨轴的分切计划状态 + 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")+"对应的分切计划！"); + } + for (int i = 0; i < plan_jo.size(); i++) { + JSONObject plan_row = plan_jo.getJSONObject(i); + plan_row.put("status","04"); + plan_row.put("end_time",DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + + //更新出站气涨轴的分切计划状态 + 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")+"对应的分切计划！"); + } + for (int i = 0; i < plan_jo2.size(); i++) { + JSONObject plan_row = plan_jo.getJSONObject(i); + plan_row.put("status","06"); + plan_row.put("end_time",DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + return json.getString("task_id"); }