代码更新

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);
+
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql

@@ -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
-
-
-

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 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 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 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 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 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

lms/nladmin-ui/src/views/loki/view/index.vue

@@ -12,6 +12,8 @@
           />
         </el-form-item>
         <el-form-item label="关键字">
+          <label slot="label">关&nbsp;&nbsp;键&nbsp;字:</label>
+
           <el-input
             v-model="text"
             size="mini"
@@ -49,6 +51,7 @@
           </el-tooltip>
         </el-form-item>
         <el-form-item label="方向">
+          <label slot="label">方&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;向:</label>
           <el-radio-group v-model="direction" size="mini" @change="queryData">
             <el-radio label="backward">backward</el-radio>
             <el-radio label="forward">forward</el-radio>

lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue

@@ -15,7 +15,7 @@
         <el-form-item label="工单类型">
           <el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
             <el-option
-              v-for="item in dict.PDM_BI_ORDERTYPE"
+              v-for="item in dict.pdm_workorder_type"
               :key="item.id"
               :label="item.label"
               :value="item.value"
@@ -89,9 +89,6 @@
             style="width: 200px;"
           />
         </el-form-item>
-        <el-form-item label="报工数量">
-          <el-input v-model="form.report_qty" style="width: 200px;" />
-        </el-form-item>
         <el-form-item label="实际开始时间">
           <el-date-picker
             v-model="form.realproducestart_date"
@@ -124,7 +121,7 @@
         </el-form-item>
         <el-form-item label="是否搬运">
           <el-radio
-            v-for="item in dict.IS_OR_NOT"
+            v-for="item in dict.is_or_not"
             :key="item.id"
             v-model="form.is_needmove"
             :label="item.value"
@@ -134,7 +131,7 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <el-form-item label="允许修改报工数量">
           <el-radio
-            v-for="item in dict.IS_OR_NOT"
+            v-for="item in dict.is_or_not"
             :key="item.id"
             v-model="form.is_canupdate_update"
             :label="item.value"
@@ -167,7 +164,6 @@
       <el-table-column prop="init_qty" label="期初数量" align="center" />
       <el-table-column prop="finish_qty" label="期末数量" align="center" />
       <el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
-      <el-table-column prop="report_qty" label="报工数量" align="center" />
       <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
       <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
       <el-table-column prop="nick_name" label="操作人" align="center" />
@@ -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,

lms/nladmin-ui/src/views/wms/pdm/produce/index.vue

@@ -31,17 +31,6 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="工单类型">
             <el-select
               v-model="query.order_type_scode"
@@ -52,7 +41,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.PDM_BI_ORDERTYPE"
+                v-for="item in dict.pdm_workorder_type"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -74,7 +63,7 @@
                 value="-1"
               />
               <el-option
-                v-for="item in dict.MPS_BD_ORDERSTATUS"
+                v-for="item in dict.pdm_workorder_status"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -88,7 +77,7 @@
               filterable
               size="mini"
               class="filter-item"
-              style="width: 185px;"
+              style="width: 200px"
               @change="crud.toQuery"
             >
               <el-option
@@ -98,6 +87,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00','23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -138,7 +138,7 @@
           <el-form-item label="工单类型" prop="order_type_scode">
             <el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
               <el-option
-                v-for="item in dict.PDM_BI_ORDERTYPE"
+                v-for="item in dict.pdm_workorder_type"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -227,12 +227,9 @@
               style="width: 200px;"
             />
           </el-form-item>
-          <el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
-            <el-input v-model="form.report_qty" style="width: 200px;" />
-          </el-form-item>
           <el-form-item label="是否搬运" prop="is_needmove">
             <el-radio
-              v-for="item in dict.IS_OR_NOT"
+              v-for="item in dict.is_or_not"
               :key="item.id"
               v-model="form.is_needmove"
               :label="item.value"
@@ -258,19 +255,18 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
         <el-table-column prop="workorder_code" label="工单编号" width="120px">
-<!--          <template slot-scope="scope">-->
+          <!--          <template slot-scope="scope">-->
-<!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
+          <!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
-<!--          </template>-->
+          <!--          </template>-->
         </el-table-column>
         <el-table-column prop="order_status" label="工单状态">
           <template slot-scope="scope">
-            {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
+            {{ dict.label.pdm_workorder_status[scope.row.order_status] }}
           </template>
         </el-table-column>
         <el-table-column prop="produce_date" label="生产日期" width="100px" />
         <el-table-column prop="plan_qty" label="计划数量" />
         <el-table-column prop="real_qty" label="实际数量" />
-        <el-table-column prop="report_qty" label="报工数量" />
         <el-table-column v-if="false" prop="material_id" label="物料标识" />
         <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
         <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
@@ -287,12 +283,12 @@
         </el-table-column>
         <el-table-column prop="is_needmove" label="是否搬运">
           <template slot-scope="scope">
-            {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
+            {{ dict.label.is_or_not[scope.row.is_needmove] }}
           </template>
         </el-table-column>
         <el-table-column prop="order_type_scode" label="工单类型">
           <template slot-scope="scope">
-            {{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
+            {{ dict.label.pdm_workorder_type[scope.row.order_type_scode] }}
           </template>
         </el-table-column>
         <el-table-column prop="create_name" label="创建人" />
@@ -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',

lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue

@@ -41,9 +41,9 @@
 
       <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
       <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
-      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip/>
+      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
-      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip/>
+      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
-      <el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip/>
+      <el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
     </el-table>
     <!--分页组件-->
     <pagination />
@@ -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: {}})
   },

lms/nladmin-ui/src/views/wms/pub/PointDialog.vue

@@ -41,7 +41,7 @@
 
       <el-table-column prop="point_code" label="终点点位编码" show-overflow-tooltip />
       <el-table-column prop="point_name" label="终点点位名称" show-overflow-tooltip />
-      <el-table-column prop="region_name" label="所属区域" show-overflow-tooltip/>
+      <el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
       <el-table-column prop="point_type" label="点位类型">
         <template slot-scope="scope">
           {{ 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: {}})
   },