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

代码更新

Browse Source
This commit is contained in:
lyd
2022-10-21 18:29:30 +08:00
parent b82b329410
commit 4abc0f8cb1
10 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql
View File

@@ -48,7 +48,7 @@
SCH_BASE_Task task
WHERE
task.is_delete = '0'
AND task.task_status = '01'
AND task.task_status = '1'
AND task.point_code1 in ('YQX01_WX','YQX02_WX')
ENDSELECT

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class WorkorderServiceImpl implements WorkordeService {
String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER");
dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setWorkorder_code(newCode);
dto.setOrder_status("00");
dto.setOrder_status("1");
dto.setCreate_id(currentUserId);
dto.setCreate_time(now);
dto.setCreate_name(nickName);
@@ -386,7 +386,7 @@ public class WorkorderServiceImpl implements WorkordeService {
WQLObject wo = WQLObject.getWQLObject("PDM_BD_WORKORDER");
JSONObject produceorderMap = new JSONObject();
produceorderMap.put("workorder_id",workorder_id);
produceorderMap.put("order_status","04");
produceorderMap.put("order_status","5");
produceorderMap.put("update_optid", currentUserId);
produceorderMap.put("device_id", null);
produceorderMap.put("update_optname", nickName);

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
View File

@@ -74,7 +74,7 @@
ShiftOrder.order_type_scode = 输入.order_type_scode
ENDOPTION
OPTION 输入.unFinish <> ""
ShiftOrder.order_status <> '04'
ShiftOrder.order_status <> '5'
ENDOPTION
OPTION 输入.order_status <> ""
find_in_set( ShiftOrder.order_status, 输入.order_status)

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

@@ -123,7 +123,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
JSONObject dpjPoint1 = pointTab.query("is_delete='0' and region_code='DPJQB01' and can_vehicle_type like '%" + vehicle_type + "%'").uniqueResult(0);
//叠盘架无载具:1-判断是否有在执行中的堆叠任务，有则等堆叠任务完成以后再去，否则去去缓存位和养生A区找
JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'").uniqueResult(0);
JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'" + " and task_status <> '7' ").uniqueResult(0);
if (ObjectUtil.isNotEmpty(ddTask)) continue;
//去缓存位和养生A区找,生成到叠盘架的任务