代码更新

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