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

add:一楼看板增加数据；fix:出库任务完成报错；opt:任务查询不到优化

Browse Source
This commit is contained in:
zhangzq
2025-04-25 13:59:33 +08:00
parent 3a98deb92a
commit d2a8682f4a
7 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
View File

@@ -25,4 +25,10 @@ public class BstIvtPackageinfoivtVO extends BstIvtPackageinfoivt {
* 管芯重量
*/
private String paper_weight;
/** 子卷幅宽 */
private Integer split_breadth;
/** 子卷理论长度 */
private Integer split_height;
}

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -137,6 +137,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
if (planInfo!=null){
vo.setWeight(planInfo.getWeight());
vo.setPaper_weight(planInfo.getPaper_weight());
vo.setSplit_breadth(planInfo.getSplit_breadth().intValue());
vo.setSplit_height(planInfo.getSplit_height().intValue());
}
voRecords.add(vo);
}

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
View File

@@ -208,7 +208,11 @@ public class TwoOutTask extends AbstractAcsTask {
JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'")
.getResultJSONArray(0);
if (ObjectUtil.isEmpty(resultJSONArray)) {
this.immediateNotifyAcs(null);
try {
this.immediateNotifyAcs(null);
}catch (Exception ex){
log.warn("载具出库批量下发异常",ex.getMessage());
}
}
}, "cratergv", 30, this);
}

1
lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java
View File

@@ -23,6 +23,7 @@ public enum SpecEnum {
YX_MES(9, "验箱","CamstarApi/BoxDataCollectionSubmit2"),
RK(10, "入库",""),
RK_YC(11, "异常口入库",""),
RK_MES(12, "入库回传","CamstarApi/ChildRollFGInboundComplete"),
;
private final Integer value;

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -73,7 +73,7 @@ public class TaskServiceImpl implements TaskService {
map.put("task_status", task_status.replace("-1", ""));
}
if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) {
map.put("task_code", "%" + whereJson.getString("task_code") + "%");
map.put("task_code", whereJson.getString("task_code"));
}
if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) {
map.put("point_code1", "%" + whereJson.getString("point_code1") + "%");

101
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
View File

@@ -18,6 +18,7 @@
输入.finished_type TYPEAS s_string
输入.task_type TYPEAS f_string
输入.in_area_id TYPEAS f_string
输入.lk TYPEAS s_string
输入.point_code1 TYPEAS s_string
输入.point_code2 TYPEAS s_string
输入.task_code TYPEAS s_string
@@ -50,61 +51,53 @@
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT * FROM (
SELECT
task.*,
md.class_name task_type_name,
user.person_name AS create_name1,
dict.label task_status_name,
case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area
FROM
(select
tas.*
from
sch_base_task tas
where 1=1
OPTION 输入.is_delete <> ""
tas.is_delete = 输入.is_delete
ENDOPTION
OPTION 输入.finished_type <> ""
tas.finished_type = 输入.finished_type
ENDOPTION
OPTION 输入.unFinish <> ""
tas.task_status <> '07'
ENDOPTION
OPTION 输入.task_status <> ""
find_in_set( tas.task_status, 输入.task_status)
ENDOPTION
OPTION 输入.vehicle_code <> ""
(tas.vehicle_code like 输入.vehicle_code OR tas.material_code like 输入.vehicle_code OR tas.vehicle_code2 like 输入.vehicle_code)
ENDOPTION
OPTION 输入.task_code <> ""
(tas.task_code like 输入.task_code)
ENDOPTION
OPTION 输入.point_code1 <> ""
(tas.point_code1 like 输入.point_code1)
ENDOPTION
OPTION 输入.begin_time <> ""
tas.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
tas.create_time <= 输入.end_time
ENDOPTION
) task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_user user ON user.username = task.create_name
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE
1=1
OPTION 输入.task_type <> ""
md.class_id in 输入.task_type
ENDOPTION
) a
WHERE 1=1
OPTION 输入.in_area_id <> ""
a.final_product_area IN 输入.in_area_id
PAGEQUERY
SELECT
task.*,
md.class_name task_type_name,
user.person_name AS create_name1,
dict.label task_status_name
FROM
sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_user user ON user.username = task.create_name
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE
1=1
OPTION 输入.is_delete <> ""
task.is_delete = 输入.is_delete
ENDOPTION
OPTION 输入.task_type <> ""
md.class_id in 输入.task_type
ENDOPTION
OPTION 输入.finished_type <> ""
task.finished_type = 输入.finished_type
ENDOPTION
OPTION 输入.unFinish <> ""
task.task_status <> '07'
ENDOPTION
OPTION 输入.task_status <> ""
find_in_set( task.task_status, 输入.task_status)
ENDOPTION
OPTION 输入.vehicle_code <> ""
(task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code)
ENDOPTION
OPTION 输入.task_code <> ""
(task.task_code = 输入.task_code)
ENDOPTION
OPTION 输入.point_code1 <> ""
(task.point_code1 like 输入.point_code1)
ENDOPTION
OPTION 输入.begin_time <> ""
task.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
OPTION 输入.in_area_id <> ""
IF(task_type like '0105%','LK',IF(task_type like '0107%','LK',ifnull(product_area,'LK')))
IN 输入.in_area_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

1
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -134,6 +134,7 @@ https://juejin.cn/post/6844903775631572999
<root level="info">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/>
</root>
<logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>