diff --git a/lms/nladmin-system/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/src/main/java/org/nl/start/Init.java
index a6a2cab..e51c9f3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/start/Init.java
+++ b/lms/nladmin-system/src/main/java/org/nl/start/Init.java
@@ -1,7 +1,10 @@
package org.nl.start;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.wql.core.bean.WQLObject;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
@@ -15,7 +18,23 @@ import org.springframework.stereotype.Component;
public class Init implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
+ WQLObject point_tab = WQLObject.getWQLObject("sch_base_point");
+ JSONArray arr = point_tab.query("region_code = 'CPQYA01'").getResultJSONArray(0);
+ for (int i = 0; i < arr.size(); i++) {
+ JSONObject json = arr.getJSONObject(i);
+ json.put("in_order_seq",Integer.parseInt(json.getString("point_code").replace("-","")));
+ json.put("in_empty_seq",Integer.parseInt(json.getString("point_code").replace("-","")));
+ point_tab.update(json);
+
+ }
System.out.println("项目启动成功!");
}
+ public static void main(String[] args) {
+
+ int i = Integer.parseInt("01-07-02".replace("-",""));
+ System.out.println(i);
+
+ }
+
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
deleted file mode 100644
index 0705563..0000000
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
+++ /dev/null
@@ -1,103 +0,0 @@
-[交易说明]
- 交易名： 点位载具关系设置分页查询
- 所属模块：
- 功能简述：
- 版权所有：
- 表引用：
- 版本经历：
-
-[数据库]
- --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
-
-[IO定义]
- #################################################
- ## 表字段对应输入参数
- #################################################
- 输入.flag TYPEAS s_string
- 输入.name TYPEAS s_string
- 输入.area_type TYPEAS s_string
-
-
-[临时表]
- --这边列出来的临时表就会在运行期动态创建
-
-[临时变量]
- --所有中间过程变量均可在此处定义
-
-[业务过程]
-
- ##########################################
- # 1、输入输出检查 #
- ##########################################
-
-
- ##########################################
- # 2、主过程前处理 #
- ##########################################
-
-
- ##########################################
- # 3、业务主过程 #
- ##########################################
-
- IF 输入.flag = "1"
- PAGEQUERY
- SELECT
- point.*,
- svp.storagevehiclepoint_id,
- svp.storagevehicle_id,
- svp.ehicle_code,
- svp.set_type,
- d.label AS set_type_name
- FROM
- sch_base_point point
- LEFT JOIN md_pb_storagevehiclepoint svp ON point.point_id = svp.point_id and svp.set_type <>'02'
- LEFT JOIN sys_dict_detail d ON svp.set_type = d.value and d.name = 'set_type'
- WHERE
- point.is_delete = '0'
- AND point.is_used = '1'
- AND point.area_type in (25,26,32,28)
- ENDOPTION
- OPTION 输入.name <> ""
- (point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%")
- ENDOPTION
-
- ENDOPTION
- OPTION 输入.area_type <> ""
- point.area_type = 输入.area_type
- ENDOPTION
-
- ENDSELECT
- ENDPAGEQUERY
- ENDIF
-
- IF 输入.flag = "2"
- PAGEQUERY
- SELECT
- dict.label,
- dict.value
- FROM
- sys_dict_detail dict
- WHERE
- dict.name = 'storagevehicle_type'
- AND dict.value in (30,31,32,33)
- ENDSELECT
- ENDPAGEQUERY
- ENDIF
-
- IF 输入.flag = "3"
- QUERY
- SELECT
- dict.label,
- dict.value
- FROM
- sys_dict_detail dict
- WHERE
- dict.name = 'sch_area_type'
- AND dict.value in (25,26,32,28)
- ENDSELECT
- ENDQUERY
- ENDIF
-
-
-
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql
index e870918..0532c2f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql
@@ -95,11 +95,11 @@
LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id
LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id
LEFT JOIN sys_dict_detail d1 ON d1.value = p.product_mode and d1.name = 'product_mode'
- LEFT JOIN sys_dict_detail d2 ON d2.value = s.is_need_plan and d2.name = 'IS_OR_NOT'
- LEFT JOIN sys_dict_detail d3 ON d3.value = s.is_report and d3.name = 'IS_OR_NOT'
- LEFT JOIN sys_dict_detail d7 ON d7.value = p.is_report and d7.name = 'IS_OR_NOT'
- LEFT JOIN sys_dict_detail d4 ON d4.value = p.is_auto_open and d4.name = 'IS_OR_NOT'
- LEFT JOIN sys_dict_detail d5 ON d5.value = p.is_again_put and d5.name = 'IS_OR_NOT'
+ LEFT JOIN sys_dict_detail d2 ON d2.value = s.is_need_plan and d2.name = 'is_or_not'
+ LEFT JOIN sys_dict_detail d3 ON d3.value = s.is_report and d3.name = 'is_or_not'
+ LEFT JOIN sys_dict_detail d7 ON d7.value = p.is_report and d7.name = 'is_or_not'
+ LEFT JOIN sys_dict_detail d4 ON d4.value = p.is_auto_open and d4.name = 'is_or_not'
+ LEFT JOIN sys_dict_detail d5 ON d5.value = p.is_again_put and d5.name = 'is_or_not'
LEFT JOIN sys_dict_detail d6 ON d6.value = p.product_series and d6.name = 'product_series'
LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id
WHERE
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index a4d503d..2640257 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ
diff --git a/lms/nladmin-ui/src/views/loki/view/index.vue b/lms/nladmin-ui/src/views/loki/view/index.vue
index 0bc0e0f..0725879 100644
--- a/lms/nladmin-ui/src/views/loki/view/index.vue
+++ b/lms/nladmin-ui/src/views/loki/view/index.vue
@@ -12,6 +12,8 @@
/>
+
+
+
backward
forward
diff --git a/lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue
index ec22f3b..9619c79 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue
@@ -15,7 +15,7 @@
-
-
-
-
@@ -190,7 +186,7 @@ import crudClassstandard from '@/api/wms/basedata/classstandard'
export default {
name: 'ViewDialog',
components: { Treeselect },
- dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
+ dicts: ['pdm_workorder_status', 'is_used', 'pdm_workorder_type', 'is_or_not'],
mixins: [crud()],
props: {
dialogShow: {
@@ -218,7 +214,6 @@ export default {
produce_date: null,
plan_qty: null,
real_qty: null,
- report_qty: null,
material_id: null,
material_code: null,
material_weight: null,
diff --git a/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue b/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue
index f787768..277807f 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/produce/index.vue
@@ -31,17 +31,6 @@
class="filter-item"
/>
-
-
-
+
+
+
@@ -138,7 +138,7 @@
-
-
-
-
-
-
+
+
+
- {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
+ {{ dict.label.pdm_workorder_status[scope.row.order_status] }}
-
@@ -287,12 +283,12 @@
- {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
+ {{ dict.label.is_or_not[scope.row.is_needmove] }}
- {{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
+ {{ dict.label.pdm_workorder_type[scope.row.order_type_scode] }}
@@ -337,7 +333,6 @@ const defaultForm = {
produce_date: null,
plan_qty: null,
real_qty: null,
- report_qty: null,
material_id: null,
material_code: null,
material_weight: null,
@@ -369,7 +364,7 @@ export default {
name: 'Produceshiftorder',
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
- dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'vehicle_type', 'workorder_procedure'],
+ dicts: ['pdm_workorder_status', 'is_used', 'pdm_workorder_type', 'is_or_not', 'vehicle_type', 'workorder_procedure'],
cruds() {
return CRUD({
title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc',
diff --git a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
index fe2e805..22b2363 100644
--- a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
@@ -41,9 +41,9 @@
-
-
-
+
+
+
@@ -65,7 +65,6 @@ import crudDevice from '@/api/wms/pdm/device'
export default {
name: 'EndPointDialog',
components: { rrOperation, pagination },
- dicts: ['sch_area_type', 'sch_point_type'],
cruds() {
return CRUD({ title: '设备', url: 'api/device', crudMethod: { ...crudDevice }, optShow: {}})
},
diff --git a/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue b/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
index e9588ce..0916e1e 100644
--- a/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
@@ -41,7 +41,7 @@
-
+
{{ dict.label.sch_point_type[scope.row.point_type] }}
@@ -68,7 +68,7 @@ import crudPoint from '@/api/wms/sch/point'
export default {
name: 'EndPointDialog',
components: { rrOperation, pagination },
- dicts: ['sch_area_type', 'sch_point_type'],
+ dicts: ['sch_point_type'],
cruds() {
return CRUD({ title: '终点点位', url: 'api/point/selectPoint', crudMethod: { ...crudPoint }, optShow: {}})
},