From 8150d21b6641875a4c759bbd16df10666938bbab Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 14 Oct 2022 17:44:58 +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 --- .../pda/mps/service/impl/OutServiceImpl.java | 8 +++++++- .../mps/service/impl/ShippingServiceImpl.java | 14 +++++++++++--- .../java/org/nl/wms/pda/mps/wql/PDA_02.wql | 9 +++++---- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 237056 -> 237568 bytes .../wms/sch/service/impl/TaskServiceImpl.java | 4 ++-- .../nl/wms/sch/service/wql/QSCH_TASK_01.wql | 15 ++------------- .../org/nl/wms/sch/tasks/CutConveyorTask.java | 8 ++++++++ .../org/nl/wms/sch/tasks/CutTrussTask.java | 3 ++- 8 files changed, 37 insertions(+), 24 deletions(-) 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 600e49332..0bf19d21f 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 @@ -12,6 +12,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; 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 java.util.HashMap; @@ -21,6 +22,7 @@ import java.util.HashMap; @Slf4j public class OutServiceImpl implements OutService { + private final CutTrussTask cutTrussTask; @Override public JSONObject queryMaterialInfo(JSONObject whereJson) { @@ -43,6 +45,9 @@ public class OutServiceImpl implements OutService { 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"); //查询该点位对应的机台编号 JSONObject cut_ivt = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code ='"+point_code+"' OR down_point_code ='"+point_code+"'").uniqueResult(0); @@ -73,8 +78,9 @@ public class OutServiceImpl implements OutService { jo.put("point_code3",point_code); jo.put("point_code4",delivery_point.getString("point_code")); jo.put("vehicle_code",delivery_point.getString("qzzno")); - jo.put("vehicle_code2",qzzno); + jo.put("vehicle_code2",cut_qzzno); jo.put("task_type","010403"); + cutTrussTask.createTask(jo); JSONObject result = new JSONObject(); result.put("message","操作成功!"); diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index e713a99eb..9b9a3c906 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -77,7 +77,7 @@ public class ShippingServiceImpl implements ShippingService { String qzzno = rows.getJSONObject(0).getString("qzzno"); HashMap map = new HashMap(); - map.put("flag", "3"); + map.put("flag", "6"); if (StrUtil.isNotEmpty(qzzno)) { map.put("qzzno", qzzno); @@ -98,10 +98,18 @@ public class ShippingServiceImpl implements ShippingService { JSONObject form = new JSONObject(); form.put("point_code1","SS02"); form.put("point_code2",empty_point.getString("point_code")); - form.put("task_type","010401"); - form.put("vehicle_code",qzzno); + form.put("task_type","010402"); + form.put("vehicle_code",plan_jo.getString("qzzno")); cutConveyorTask.createTask(form); + //更新该气涨轴对应的分切计划状态 + JSONArray plan_rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); + for (int i = 0; i < plan_rows.size(); i++) { + JSONObject row = plan_rows.getJSONObject(i); + row.put("status","02"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(row); + } + 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 f272dc957..ce148c373 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 @@ -95,7 +95,7 @@ PDM_BI_SlittingProductionPlan plan LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name WHERE - plan.STATUS < 2 + plan.STATUS < 09 AND is_child_tz_ok = 0 AND @@ -175,7 +175,7 @@ PDM_BI_SlittingProductionPlan plan LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name WHERE - plan.STATUS < 2 + plan.STATUS = 03 AND is_child_tz_ok = 1 AND @@ -206,12 +206,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 < 2 + plan.STATUS = '01' 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 153ea0cb5b7fada77204c41c4dcedd5ec8f6277d..f149ed0738f7166afd1feb6e0993371f43054a13 100644 GIT binary patch delta 10994 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 KgH748>3;y@F+@lJ diff --git a/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index a10dc861f..ca1ead55c 100644 --- a/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -105,9 +105,9 @@ public class TaskServiceImpl implements TaskService { } @Override - public TaskDto findByDtlId(String taskdtl_id) { + public TaskDto findByDtlId(String task_id) { WQLObject wo = WQLObject.getWQLObject("sch_base_task"); - JSONObject json = wo.query("task_id = '" + taskdtl_id + "'").uniqueResult(0); + JSONObject json = wo.query("task_id = '" + task_id + "'").uniqueResult(0); final TaskDto obj = json.toJavaObject(TaskDto.class); return obj; } diff --git a/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql index 7d266e30a..5e3f8b0b1 100644 --- a/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql +++ b/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql @@ -51,21 +51,10 @@ IF 输入.flag = "1" PAGEQUERY SELECT - task.*, - p1.point_name AS start_point_name, - region1.region_name AS start_area_name, - p2.point_name AS next_point_name, - region2.region_name AS next_area_name, - d3.label AS task_type_name, - d4.label AS taskdtl_type_name + task.* FROM sch_base_task task - LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code - LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = p1.region_id - LEFT JOIN sch_base_point p2 ON task.next_point_code = p2.point_code - LEFT JOIN SCH_BASE_Region region2 ON region2.region_id = p2.region_id - LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE' - LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL' + WHERE task.is_delete = '0' OPTION 输入.task_type <> "" diff --git a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 8972f25d2..3eab2b954 100644 --- a/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -19,6 +19,8 @@ import org.nl.wms.sch.service.dto.PointDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; + @Service @RequiredArgsConstructor @Slf4j @@ -79,6 +81,12 @@ public class CutConveyorTask extends AbstractAcsTask { jsonIvt.put("point_status", "03"); jsonIvt.put("qzzno", jsonTask.getString("vehicle_code")); ivtTab.update(jsonIvt); + + //更新对应气涨轴的分切计划表为配送完成 + HashMap map = new HashMap(); + map.put("is_child_ps_ok","1"); + map.put("status","03"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"qzzno = '"+jsonTask.getString("vehicle_code")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '0' AND is_delete ='0' AND status = '02'"); } } } 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 06b0f7c91..002f5cf54 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 @@ -81,7 +81,8 @@ public class CutTrussTask extends AbstractAcsTask { } for (int i = 0; i < plan_jo.size(); i++) { JSONObject plan_row = plan_jo.getJSONObject(i); - plan_row.put("status","2"); + plan_row.put("status","09"); + plan_row.put("end_time",DateUtil.now()); WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); } }