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 153ea0cb5..f149ed073 100644 Binary files a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ 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); } }