add:手持海柔出入库顺序表2

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.MapOf;
 import org.nl.wms.storage_manage.pda.service.PdaStHrBcpInService;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvOrderService;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvOrder;
@@ -55,10 +56,11 @@ public class PdaStHrBcpOrderController {
             query.setBar_code(bar_code);
         }
         Page<StIvtIostorinvOrder> result = iStIvtIostorinvOrderService.page(new Page<>(param.getInteger("page"),param.getInteger("size")), query.build());
-        return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
+        return new ResponseEntity<>(MapOf.of("message","操作成功","totalCount",result.getTotal(),"data",result.getRecords()), HttpStatus.OK);
     }
 
 
+
     @PostMapping
     @Log("update顺序表")
     @SaIgnore

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java

@@ -304,7 +304,9 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl<StIvtIostorinv
                 .set(MdPbStoragevehicleext::getMaterial_id, mst.getMaterial_id())
                 .set(MdPbStoragevehicleext::getStorage_qty, mst.getPlan_qty())
         );
-
+        if (StringUtils.isNotEmpty(mst.getStoragevehicle_code())){
+            iStIvtIostorinvOrderService.remove(new QueryWrapper<StIvtIostorinvOrder>().eq("bar_code",mst.getStoragevehicle_code()));
+        }
         // 更新任务为完成
         iSchBaseTaskService.update(
                 new UpdateWrapper<SchBaseTask>().lambda()

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java

@@ -239,6 +239,9 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
                 new QueryWrapper<MdPbStoragevehicleext>().lambda()
                         .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code())
         );
+        if (StringUtils.isNotEmpty(mst.getStoragevehicle_code())){
+            iStIvtIostorinvOrderService.remove(new QueryWrapper<StIvtIostorinvOrder>().eq("bar_code",mst.getStoragevehicle_code()));
+        }
 
         // 插入出入库顺序表
         StIvtIostorinvOrder dao = new StIvtIostorinvOrder();

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml

@@ -126,7 +126,8 @@
             attr.sect_code,
             attr.sect_name,
             attr.stor_name,
-            attr.storagevehicle_code
+            attr.storagevehicle_code,
+            attr.lock_type
         FROM
         st_ivt_structivt_hr_bcp ivt
         LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id

mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIvt/index.vue

@@ -91,6 +91,7 @@
         <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="lock_type" label="锁定类型" />
         <el-table-column show-overflow-tooltip min-width="120" prop="workprocedure_id" label="所属工序" >
           <template slot-scope="scope">
             {{ getprocedurename(scope.row) }}