rev;木箱入库修改

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java

@@ -46,7 +46,7 @@ public class TwoInBoxTask extends AbstractAcsTask {
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
                     .next_device_code(json.getString("point_code2"))
-                    .vehicle_code(json.getString("vehicle_code"))
+                    .vehicle_code(json.getString("vehicle_code2"))
                     .priority(json.getString("priority"))
                     .class_type(json.getString("task_type"))
                     .dtl_type(String.valueOf(dtl_type))
@@ -156,6 +156,7 @@ public class TwoInBoxTask extends AbstractAcsTask {
         json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_type", form.getString("task_type"));
         json.put("vehicle_code", form.getString("vehicle_code"));
+        json.put("vehicle_code2", form.getString("vehicle_code2"));
         json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
         json.put("point_code1", form.getString("start_device_code"));
         json.put("point_code2", form.getString("next_device_code"));

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java

@@ -99,6 +99,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
         jsonParam.put("box_high", boxDao.getBox_high());
+        jsonParam.put("vehicle_type", boxDao.getVehicle_type());
 
         JSONObject jsonAttr = getStruct(jsonParam);
 
@@ -114,6 +115,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         jsonTaskParam.put("start_device_code", whereJson.getString("device_code"));
         jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code"));
         jsonTaskParam.put("vehicle_code", whereJson.getString("box_no"));
+        jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
 
         TwoInBoxTask taskBean = new TwoInBoxTask();
         taskBean.createTask(jsonTaskParam);
@@ -240,6 +242,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
      * 找一个空仓位（木箱区）
+     *
      * @param jsonParam {
      *                  stor_id：仓库标识
      *                  sect_id：库区标识
@@ -259,6 +262,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
          */
         JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
                 "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
+                "AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" +
                 "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " +
                 "AND sect_id = '" + jsonParam.getString("sect_id") + "'").getResultJSONArray(0);
 
@@ -318,6 +322,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
      * 确定巷道
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -376,6 +381,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
      * 确定排
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -443,6 +449,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
      * 确定仓位
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -479,6 +486,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
      * 获取一个货位公共方法
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识