opt：优化移库单功能

nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java

@@ -144,10 +144,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      * @throws BadRequestException
      */
     public void applyInTask(JSONObject param) throws BadRequestException {
-        JSONObject result = new JSONObject();
         log.info("ACS请求apply参数: {}", param);
-        // 申请任务
-        SchBaseTask task = new SchBaseTask(); // 任务实体
         //起点
         String device_code = param.getString("device_code"); // 请求点
         String vehicle_code = param.getString("vehicle_code");//子托盘

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java

@@ -803,7 +803,8 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         JSONObject dis_form = new JSONObject();
         dis_form.put("tableMater",dis);
         dis_form.put("stor_code",storDao.getStor_code());
-        dis_form.put("sect_code","");
+        //todo 需要指定一个库区
+        dis_form.put("sect_code","1582991348217286656");
         //分配货位
         this.divStruct(dis_form);
         dis_form.put("point_code",device_code);

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java

@@ -50,7 +50,7 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
     /**
      * 载具扩展属性mapper
      */
-    @Autowired
+    @Resource
     private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper;
 
     /**
@@ -196,6 +196,7 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
     }
 
     @Override
+    @Transactional
     public void confirmTask(StIvtMoveinvdtl dtlDao) {
         // 需要更新库存集合
         List<JSONObject> updateIvtList = new ArrayList<>();
@@ -214,15 +215,6 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
         jsonIvt.put("qty_unit_name", dtlDao.getQty_unit_name());
         jsonIvt.put("change_qty", dtlDao.getQty());
         updateIvtList.add(jsonIvt);
-        JSONObject jsonIvtTwo = new JSONObject();
-        jsonIvtTwo.put("type", IOSConstant.UPDATE_IVT_TYPE_ADD_CANUSE);
-        jsonIvtTwo.put("storagevehicle_code", dtlDao.getStoragevehicle_code());
-        jsonIvtTwo.put("material_id", materDao.getMaterial_id());
-        jsonIvtTwo.put("pcsn", dtlDao.getPcsn());
-        jsonIvtTwo.put("qty_unit_id", dtlDao.getQty_unit_id());
-        jsonIvtTwo.put("qty_unit_name", dtlDao.getQty_unit_name());
-        jsonIvtTwo.put("change_qty", dtlDao.getQty());
-        updateIvtList.add(jsonIvtTwo);
         iMdPbGroupPlateService.updateIvt(updateIvtList);
 
         // 更新起点

nladmin-ui/src/views/wms/statement/structivt/index.vue

@@ -86,11 +86,11 @@
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
         <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
-        <el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="qty" label="库存数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="frozen_qty" label="冻结数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="qty_unit_name" label="计量单位" :min-width="flexWidth('qty_unit_name',crud.data,'计量单位')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
-        <el-table-column prop="insert_time" label="入库时间" :min-width="flexWidth('insert_time',crud.data,'入库时间')" />
+        <el-table-column prop="create_time" label="入库时间" :min-width="flexWidth('create_time',crud.data,'入库时间')" />
       </el-table>
       <!--分页组件-->
       <pagination />