现场联调优化

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDetailDto.java

@@ -25,6 +25,8 @@ public class VehicleDetailDto implements Serializable {
     private String product_code;
     /** 点位编码(窑号1/2) */
     private String point_code;
+    /** 点位编码(窑号1/2) */
+    private String kiln_code;
     /** 区域编码 0-缓存区 1-窑内 2-窑外冷却区 3-已拆垛*/
     private String region_code;
     /** 顺序号 */

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java

@@ -40,7 +40,9 @@ public class VehicleDetailServiceImpl implements VehicleDetailService {
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         JSONObject pageQuery = WQL.getWO("QMD_PB_VEHICLE_GROUP").addParamMap(MapOf.of("flag", "1"
-                        , "vehicle_code", whereJson.get("vehicle_code")))
+                        , "vehicle_code", whereJson.get("vehicle_code")
+                ,"region_code",whereJson.get("region_code")
+                ,"is_delete",whereJson.get("is_delete")))
                 .pageQuery(WqlUtil.getHttpContext(page), "vehicle_code asc");
         return pageQuery;
     }

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

@@ -17,6 +17,8 @@
 	输入.vehicle_code				  TYPEAS s_string
 	输入.vehicle_type   				  TYPEAS s_string
 	输入.vehicle_status   			  TYPEAS s_string
+	输入.region_code   			      TYPEAS s_string
+	输入.is_delete   			      TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -52,6 +54,12 @@
                 1 = 1
                 OPTION 输入.vehicle_code <> ""
                     vd.vehicle_code LIKE '%' 输入.vehicle_code '%'
+                ENDOPTION
+                OPTION 输入.region_code <> ""
+                    vd.region_code LIKE '%' 输入.region_code '%'
+                ENDOPTION
+                OPTION 输入.is_delete <> ""
+                    vd.is_delete LIKE '%' 输入.is_delete '%'
                 ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java

@@ -90,4 +90,22 @@ public class WorkorderDto implements Serializable {
 
     /** 修改时间 */
     private String update_time;
+
+    //A长边
+    private String a;
+
+    //B短边
+    private String b;
+
+    //H梯形高
+    private String h;
+
+    //W厚度
+    private String w;
+
+    //产品编号
+    private String product_code;
+
+    //托盘砖数量
+    private String number;
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java

@@ -215,12 +215,12 @@ public class WorkorderServiceImpl implements WorkordeService {
         map.put("material_code", jsonObject.getString("material_code"));
         map.put("device_code", json.getString("device_code"));
         map.put("material_name",jsonObject.getString("material_name"));
-        map.put("a",jsonObject.getString("a"));
-        map.put("b",jsonObject.getString("b"));
-        map.put("h",jsonObject.getString("h"));
-        map.put("w",jsonObject.getString("w"));
-        map.put("product_code",jsonObject.getString("product_code"));
-        map.put("number",jsonObject.getString("number"));
+        map.put("a",json.getString("a"));
+        map.put("b",json.getString("b"));
+        map.put("h",json.getString("h"));
+        map.put("w",json.getString("w"));
+        map.put("product_code",json.getString("product_code"));
+        map.put("number",json.getString("number"));
         array.add(map);
         Map<String, Object> resp = wmsToAcsService.order(array);
         if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java

@@ -289,7 +289,7 @@ public class PalletizingTask extends AbstractAcsTask {
                 .vehicle_code(pointObj.getString("vehicle_code"))
                 .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                 .point_code1("YWHC0"+pointObj.getString("order_seq"))
-                .point_code2("YWHC0"+ (pointObj.getInteger("order_seq")>21?42:21))
+                .point_code2((pointObj.getInteger("order_seq")>21?"FLW01":"FLW02"))
                 .priority("1")
                 .handle_class(THIS_CLASS)
                 .is_auto_issue(is_auto_issue)