opt:仓位表添加载具id字段

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/Structattr.java

@@ -158,6 +158,11 @@ public class Structattr implements Serializable {
      */
     private String is_used;
 
+    /**
+     * 存储载具号
+     */
+    private String storagevehicle_id;
+
     /**
      * 存储载具号
      */

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dto/StructattrDto.java

@@ -155,6 +155,8 @@ public class StructattrDto implements Serializable {
      */
     private String is_used;
 
+    private String storagevehicle_id;
+
     /**
      * 存储载具号
      */

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java

@@ -195,7 +195,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
             if (ObjectUtil.isEmpty(obj)) {
                 throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息");
             }
-
+            dto.setStoragevehicle_id(obj.getString("storagevehicle_id"));
             dto.setStoragevehicle_type(obj.getString("storagevehicle_type"));
         }
         structattrMapper.insert(BeanUtil.copyProperties(dto, Structattr.class));

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java

@@ -17,7 +17,6 @@ import org.nl.modules.wql.core.content.HttpContext;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.pda.mps.service.FeedingService;

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java

@@ -23,7 +23,6 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.customer.service.dao.Customerbase;
 import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleex;
 import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper;
 import org.nl.wms.basedata.st.structattr.service.dao.Structattr;

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
-import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.*;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussManageService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.LashManageService;

lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/CheckDialog.vue

@@ -116,16 +116,6 @@
 
         <!--左侧插槽-->
         <slot name="left"/>
-        <!--        <el-button
-                  slot="left"
-                  class="filter-item"
-                  type="primary"
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="queryDtl()"
-                >
-                  添加库存物料
-                </el-button>-->
       </span>
 
     </div>

lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue

@@ -120,7 +120,7 @@
         @select-all="onSelectAll"
       >
         <el-table-column
-          v-permission="[]"
+          v-permission="['admin','recutplan:del','recutplan:edit']"
           label="操作"
           width="160"
           align="center"
@@ -190,7 +190,11 @@ export default {
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {},
+      permission: {
+        add: ['admin', 'recutplan:add'],
+        edit: ['admin', 'recutplan:edit'],
+        del: ['admin', 'recutplan:del']
+      },
       work_flag: true,
       confirm_flag: true,
       checkShow: false,