root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-28 20:39:57 +08:00
parent 18c119afcf
commit 740e75aae9
3 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -20,7 +20,7 @@
输入.qzzno TYPEAS s_string
输入.sort_seq TYPEAS s_string
输入.point_location TYPEAS s_string
输入.sql_str TYPEAS f_string
输入.sql_str TYPEAS f_string
[临时表]
@@ -142,24 +142,11 @@
IF 输入.flag = "5"
QUERY
SELECT
plan.mfg_order_name,
plan.container_name,
plan.*,
ivt.point_code,
plan.split_group,
plan.manufacture_sort,
plan.manufacture_date,
plan.paper_tube_or_FRP,
plan.paper_tube_material,
plan.paper_tube_description,
plan.paper_tube_model,
plan.FRP_material,
plan.FRP_description,
plan.FRP_model,
plan.workorder_id,
ivt.sort_seq,
ivt.product_area,
ivt.point_location,
plan.qzzno
ivt.point_location
FROM
PDM_BI_SlittingProductionPlan plan
LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name
@@ -179,24 +166,11 @@
IF 输入.flag = "6"
QUERY
SELECT
plan.mfg_order_name,
plan.container_name,
plan.*,
ivt.point_code,
plan.split_group,
plan.manufacture_sort,
plan.manufacture_date,
plan.paper_tube_or_FRP,
plan.paper_tube_material,
plan.paper_tube_description,
plan.paper_tube_model,
plan.FRP_material,
plan.FRP_description,
plan.FRP_model,
plan.workorder_id,
ivt.sort_seq,
ivt.product_area,
ivt.point_location,
plan.qzzno
ivt.point_location
FROM
PDM_BI_SlittingProductionPlan plan
LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
View File

@@ -26,7 +26,6 @@ import java.util.List;
@Slf4j
public class CutTrussTask extends AbstractAcsTask {
private final String THIS_CLASS = CutTrussTask.class.getName();
private final CutConveyorTask conveyorTask;
@Override
public List<AcsTaskDto> addTask() {
@@ -154,7 +153,7 @@ public class CutTrussTask extends AbstractAcsTask {
String point_code2 = form.getString("point_code2");
String point_code3 = form.getString("point_code3");
String point_code4 = form.getString("point_code4");
if (conveyorTask.isSingleTask(point_code1)){
/*if (conveyorTask.isSingleTask(point_code1)){
throw new BadRequestException("点位："+point_code1+"存在未完成的任务！");
}
if (conveyorTask.isSingleTask(point_code2)){
@@ -165,7 +164,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
if (conveyorTask.isSingleTask(point_code4)){
throw new BadRequestException("点位："+point_code4+"存在未完成的任务！");
}
}*/
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1,1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));