钢托前缀改为 KGTDDW05

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java

@@ -95,8 +95,8 @@ public class StructFindUtil {
         String vehicle_type = jsonObject.getString("vehicle_type");
         String point_code  = jsonObject.getString("point_code");
         //如果是堆叠位5 需要更新 设备状态
-        if(StrUtil.equals(point_code,"KGTPDDW05")){
+        if(StrUtil.equals(point_code,"KGTDDW05")){
-            JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0);
+            JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0);
             PointUpdateUtil.updatePoint(pointarr);
         }
         if (StrUtil.isEmpty(area_type)) {

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -36,7 +36,7 @@ public class AcsToWmsController {
     public ResponseEntity<Object> receiveTaskFromAcs(@RequestBody Map whereJson) {
         acsToWmsService.receiveTaskFromAcs(whereJson);
         JSONObject result = new JSONObject();
-        result.put("status", "200");
+        result.put("status", HttpStatus.OK.value());
         result.put("message", "发送任务成功");
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
@@ -47,7 +47,7 @@ public class AcsToWmsController {
     public ResponseEntity<Object> manipulatorApply(@RequestBody Map whereJson) {
         acsToWmsService.manipulatorApply(whereJson);
         JSONObject result = new JSONObject();
-        result.put("status", "200");
+        result.put("status", HttpStatus.OK.value());
         result.put("message", "发送任务成功");
         return new ResponseEntity<>(result, HttpStatus.OK);
     }

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql

@@ -13,9 +13,11 @@
 	#################################################
 	##			表字段对应输入参数
 	#################################################
-	输入.flag					                        TYPEAS s_string
+	输入.flag					                    TYPEAS s_string
-	输入.workprocedure_id					            TYPEAS s_string
+	输入.workprocedure_id					        TYPEAS s_string
 	输入.material_id					                TYPEAS s_string
+	输入.area_type					                TYPEAS s_string
+	输入.point_code					                TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -71,6 +73,7 @@
                 	sch_base_point point
                 WHERE
                1=1
+               AND point.is_delete = '0'
                 OPTION 输入.area_type <> ""
                         point.area_type = 输入.area_type
                ENDOPTION

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java

@@ -213,7 +213,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
                 case YZGX:
                     vehicle_type = VehicleTypeEnum.GTP.getCode();
                     start_area = AreaEnum.KGTDDQ.getCode();
-                    start_point_code = "KGTPDDW05";
+                    start_point_code = "KGTDDW05";
                     break;
                 //烧制工序
                 case SZGX: