diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index d90e462..7af0aff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -105,9 +105,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_STORAGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_STORAGE.wql index 2e94323..076f4e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_STORAGE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_STORAGE.wql @@ -91,7 +91,7 @@ AND ve.is_delete = '0' ) WHERE - point.region_code = 'CPHJ' + point.region_code = 'BCPHJ' ORDER BY point.create_time DESC ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java index 24ce965..fc297ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/Region.java @@ -18,7 +18,7 @@ public enum Region { HL("混料区", "HL"), KLHJ("困料货架", "KLHJ"), YZ("压制区", "YZ"), - CPHJ("成品货架", "CPHJ"), + BCPHJ("半成品货架", "BCPHJ"), SZ("烧制区", "SZ"), FJ("分拣区", "FJ"), BTHC("半托缓存区", "BTHC"), diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql index 45a1f34..44fb294 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql @@ -49,7 +49,7 @@ WHERE point.is_used = '1' AND point.lock_type = '1' - AND point.region_code = 'CPHJ' + AND point.region_code = 'BCPHJ' AND point.point_status = '1' AND point.vehicle_type = '2' AND vd.is_delete = '0' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql index 13c1d96..9e8dbc8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql @@ -53,7 +53,7 @@ WHERE point.is_used = '1' AND point.lock_type = '1' - AND point.region_code = 'CPHJ' + AND point.region_code = 'BCPHJ' AND point.point_status = '1' AND point.vehicle_type = '2' AND vd.is_fire = '0' @@ -92,7 +92,7 @@ WHERE point.is_used = '1' AND point.lock_type = '1' - AND point.region_code = 'CPHJ' + AND point.region_code = 'BCPHJ' AND point.point_status = '1' AND point.vehicle_type = '2' AND vd.is_fire = '1' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql index dd5394d..d71bbc5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql @@ -48,7 +48,7 @@ WHERE is_used = '1' AND lock_type = '1' - AND region_code = 'CPHJ' + AND region_code = 'BCPHJ' AND point_type = '1' AND point_status = '0' ENDSELECT diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 85fb402..122fd14 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -109,6 +109,7 @@ - + - + - - + + - - + +