更新

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

@@ -91,6 +91,19 @@ public class StructFindUtil {
         if (StrUtil.isEmpty(area_type)) {
             throw new BadRequestException("区域不能为空！");
         }
+        if (ObjectUtil.isNotEmpty(vehicle_type)) {
+            if (vehicle_type.equals("1")) {
+                vehicle_type = "03";
+            } else if (vehicle_type.equals("2")) {
+                vehicle_type = "04";
+            } else if (vehicle_type.equals("3")) {
+                vehicle_type = "05";
+            } else if (vehicle_type.equals("4")) {
+                vehicle_type = "06";
+            } else if (vehicle_type.equals("5")) {
+                vehicle_type = "07";
+            }
+        }
         JSONObject result = new JSONObject();
         if (StrUtil.equals("05", area_type)) {
             result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "11")

wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java

@@ -55,6 +55,19 @@ public class MaterialServiceImpl implements MaterialService {
         for (int i = 0; i < content.size(); i++) {
             JSONObject jo = (JSONObject) content.get(i);
             Integer stewing_time = jo.getInteger("stewing_time");
+            String vehicle_type = jo.getString("vehicle_type");
+            if (vehicle_type.equals("03")) {
+                vehicle_type = "1";
+            } else if (vehicle_type.equals("04")) {
+                vehicle_type = "2";
+            } else if (vehicle_type.equals("05")) {
+                vehicle_type = "3";
+            } else if (vehicle_type.equals("06")) {
+                vehicle_type = "4";
+            } else if (vehicle_type.equals("07")) {
+                vehicle_type = "5";
+            }
+            jo.put("vehicle_type",vehicle_type);
             if (stewing_time != 0) {
                 jo.put("stewing_time",stewing_time/60);
             }
@@ -96,6 +109,17 @@ public class MaterialServiceImpl implements MaterialService {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
+        if (dto.getVehicle_type().equals("1")) {
+            dto.setVehicle_type("03");
+        } else if (dto.getVehicle_type().equals("2")) {
+            dto.setVehicle_type("04");
+        } else if (dto.getVehicle_type().equals("3")) {
+            dto.setVehicle_type("05");
+        } else if (dto.getVehicle_type().equals("4")) {
+            dto.setVehicle_type("06");
+        } else if (dto.getVehicle_type().equals("5")) {
+            dto.setVehicle_type("07");
+        }
         //将静置时间从小时改为分钟
         dto.setStewing_time(String.valueOf(Integer.valueOf(dto.getStewing_time())*60));
         dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId());
@@ -129,6 +153,17 @@ public class MaterialServiceImpl implements MaterialService {
         dto.setUpdate_optname(nickName);
         Long material_uuid = dto.getMaterial_id();
         String material_code = dto.getMaterial_code();
+        if (dto.getVehicle_type().equals("1")) {
+            dto.setVehicle_type("03");
+        } else if (dto.getVehicle_type().equals("2")) {
+            dto.setVehicle_type("04");
+        } else if (dto.getVehicle_type().equals("3")) {
+            dto.setVehicle_type("05");
+        } else if (dto.getVehicle_type().equals("4")) {
+            dto.setVehicle_type("06");
+        } else if (dto.getVehicle_type().equals("5")) {
+            dto.setVehicle_type("07");
+        }
         //将静置时间从小时改为分钟
         dto.setStewing_time(String.valueOf(Integer.valueOf(dto.getStewing_time())*60));
         WQLObject wo = WQLObject.getWQLObject("md_me_material");

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -426,7 +426,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
         WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
 
-        String task_id = taskTable.query("task_code='" + task_code + "'").uniqueResult(0).getString("task_id");
+        JSONObject taskobj = taskTable.query("task_code='" + task_code + "'").uniqueResult(0);
+        String task_id = "";
+        if (ObjectUtil.isNotEmpty(taskobj)) {
+            task_id = taskobj.getString("task_id");
+        } else {
+            throw new BadRequestException("未找到指令号'" + task_id);
+        }
         //将之前的托盘信息删除
         groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
         JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);

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

@@ -104,7 +104,7 @@
             FROM
             	sch_base_point point
             WHERE
-            	point.point_code IN ( 'FJJXSXLW301', 'FJJXSXLW302' )
+            	point.point_code IN ( 'FJJXSSLW301', 'FJJXSSLW302' )
         		ENDSELECT
         	ENDQUERY
         ENDIF
@@ -117,7 +117,7 @@ IF 输入.flag = "5"
       FROM
       	sch_base_point point
       WHERE
-      	point.point_code IN ( 'FJJXSXLW201', 'FJJXSXLW202' )
+      	point.point_code IN ( 'FJJXSSLW201', 'FJJXSSLW202' )
             ENDSELECT
         ENDQUERY
     ENDIF