代码更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -209,13 +209,13 @@ public class MesToLmsServiceImpl implements MesToLmsService {
 
             // 更新工单状态
             JSONObject jsonRaw = rawTab.query("container_name = '" + containerName + "'").uniqueResult(0);
-            jsonRaw.put("status", "03");
+            jsonRaw.put("status", "04");
             rawTab.update(jsonRaw);
 
             result.put("RTYPE", "S");
             result.put("RTMSG", "操作成功!");
             result.put("RTOAL", 1);
-            result.put("RTDAT", resultAcs);
+            result.put("RTDAT", null);
         } catch (Exception e) {
             result.put("RTYPE", "1");
             result.put("RTMSG", "操作失败!"+e.getMessage());

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -78,7 +78,12 @@ public class BakingServiceImpl implements BakingService {
                  * 暂存区入烘箱
                  */
                 // 1.查询烘箱对应的空位
-                JSONObject jsonHotIvt = hosIvtTab.query("product_area = '" + jsonPointZc.getString("product_area") + "' and temperature = '" + temperature + "' and point_location = '" + jsonPointZc.getString("point_location") + "' and is_used = '1' and point_status = '01' order by point_code ASC").uniqueResult(0);
+                JSONObject jsonMap = new JSONObject();
+                jsonMap.put("flag", "1");
+                jsonMap.put("product_area",jsonPointZc.getString("product_area"));
+                jsonMap.put("temperature",temperature);
+                jsonMap.put("point_location",jsonPointZc.getString("point_location"));
+                JSONObject jsonHotIvt = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().uniqueResult(0);
                 if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有对应空位");
                 // 2.创建暂存位 --> 烘烤区任务
                 JSONObject param = new JSONObject();
@@ -162,7 +167,13 @@ public class BakingServiceImpl implements BakingService {
                 if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有空暂存位");
 
                 // 查询烘箱对应的空位
-                JSONObject jsonHotIvt = hosIvtTab.query("product_area = '" + product_area + "' and temperature = '" + temperature + "' and point_location = '" + map.getString("point_location") + "' and is_used = '1' and point_status = '01' order by point_code ASC").uniqueResult(0);
+
+                JSONObject jsonMap = new JSONObject();
+                jsonMap.put("flag", "1");
+                jsonMap.put("product_area",product_area);
+                jsonMap.put("temperature",temperature);
+                jsonMap.put("point_location",map.getString("point_location"));
+                JSONObject jsonHotIvt = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().uniqueResult(0);
                 if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有对应空位");
 
                 // 3.创建冷却区 --> 烘烤区任务
@@ -271,6 +282,7 @@ public class BakingServiceImpl implements BakingService {
                     break;
                 }
             }
+            if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有空暂存位");
             // 3.创建任务
             JSONObject param = new JSONObject();
             param.put("point_code1", point_code1);

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_BAKING_01.wql

@@ -0,0 +1,82 @@
+[交易说明]
+	交易名：	手持接口
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.product_area					TYPEAS s_string
+	输入.point_location					TYPEAS s_string
+	输入.temperature					    TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		QUERY
+			SELECT
+            	ivt.*
+            FROM
+            	ST_IVT_HotPointIvt ivt
+            WHERE
+                ivt.is_used = '1'
+                AND point_status = '01'
+
+                AND NOT EXISTS (
+                   SELECT
+                      *
+                   FROM
+                      sch_base_task
+                   WHERE
+                      ( point_code3 = ivt.point_code OR point_code1 = ivt.point_code OR point_code2 = ivt.point_code )
+                      AND task_status < '07'
+                   AND is_delete = '0'
+                )
+
+                OPTION 输入.product_area <> ""
+                    ivt.product_area = 输入.product_area
+                ENDOPTION
+
+                OPTION 输入.point_location <> ""
+                    ivt.point_location = 输入.point_location
+                ENDOPTION
+
+                OPTION 输入.temperature <> ""
+                    ivt.temperature = 输入.temperature
+                ENDOPTION
+
+                order by ivt.point_code ASC
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql

@@ -77,6 +77,17 @@
                 is_used = '1'
                 AND full_point_status = '01'
 
+                AND NOT EXISTS (
+                   SELECT
+                      *
+                   FROM
+                      sch_base_task
+                   WHERE
+                      ( point_code1 = full_point_code OR point_code2 = full_point_code )
+                      AND task_status < '07'
+                   AND is_delete = '0'
+                )
+
                 OPTION 输入.product_area <> ""
                     product_area = 输入.product_area
                 ENDOPTION

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql

@@ -52,6 +52,17 @@
             WHERE
                 ivt.empty_point_status = '02'
 
+                AND NOT EXISTS (
+                   SELECT
+                      *
+                   FROM
+                      sch_base_task
+                   WHERE
+                      ( point_code1 = ivt.empty_point_code OR point_code2 = ivt.empty_point_code )
+                      AND task_status < '07'
+                   AND is_delete = '0'
+                )
+
                 OPTION 输入.product_area <> ""
                     ivt.product_area = 输入.product_area
                 ENDOPTION
@@ -75,6 +86,17 @@
             WHERE
                 ivt.full_point_status = '01'
 
+                AND NOT EXISTS (
+                   SELECT
+                      *
+                   FROM
+                      sch_base_task
+                   WHERE
+                      ( point_code1 = ivt.full_point_code OR point_code4 = ivt.full_point_code )
+                      AND task_status < '07'
+                   AND is_delete = '0'
+                )
+
                 OPTION 输入.product_area <> ""
                     ivt.product_area = 输入.product_area
                 ENDOPTION
@@ -110,7 +132,7 @@
             FROM
             	PDM_BI_RawFoilWorkOrder der
             WHERE
-                der.status = '1'
+                der.status = '01'
                 AND der.is_delete = '0'
 
                 OPTION 输入.point_code <> ""