rev：空托盘出入库

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

@@ -82,7 +82,7 @@ public class TwoOutEmpTask extends AbstractAcsTask {
             map.put("task_status", TaskStatusEnum.FINISHED.getCode());
 
             // 更新仓位
-            JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
+            JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
             jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttr.put("storagevehicle_code","");
             jsonAttr.put("storagevehicle_type","");

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

@@ -0,0 +1,22 @@
+package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBoxManageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 木箱入库业务处理 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-10
+ */
+@Service
+public class InBoxManageServiceImpl implements InBoxManageService {
+
+    @Override
+    public void inBox(JSONObject whereJson) {
+
+    }
+}

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

@@ -278,6 +278,10 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
         List<JSONObject> allRowList = WQL.getWO("BST_OUTVEHICLE").addParamMap(whereJson)
                 .process().getResultJSONArray(0).toJavaList(JSONObject.class);
 
+        if (ObjectUtil.isEmpty(allRowList)) {
+            throw new BadRequestException("请当前排列任务执行完后在试!");
+        }
+
         // 查询某一巷道所有相同托盘类型排的仓位
         String row_num_in = allRowList.stream()
                 .map(row -> row.getString("row_num"))

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

@@ -0,0 +1,28 @@
+package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 木箱入库业务处理 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
+public interface InBoxManageService {
+
+    /**
+     * 木箱入库
+     * @param whereJson：{
+     *          box_no： 木箱号
+     *          vehicle_code：托盘号
+     *          device_code：起点点位
+     *          box_length：木箱长度
+     *          box_width：木箱宽度
+     *          box_high：木箱高度
+     * }
+     */
+    void inBox(JSONObject whereJson);
+
+}

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -228,6 +228,16 @@
             {{ dict.label.placement_type[scope.row.placement_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="zdepth" label="深度" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.zdepth[scope.row.zdepth] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="storagevehicle_type" label="托盘类型" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -322,7 +332,7 @@ const defaultForm = {
 }
 export default {
   name: 'Structattr',
-  dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type'],
+  dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type', 'zdepth', 'storagevehicle_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {