From 6204f3a465fa402f2080f7c863aa15fbbd2562f0 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 15 Jan 2024 19:55:39 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/IStIvtIostorinvdtlService.java  |  2 +-
 .../service/iostorInv/dao/StIvtIostorinv.java | 34 +++++++--------
 .../iostorInv/dao/StIvtIostorinvdis.java      | 23 +++++------
 .../iostorInv/dao/StIvtIostorinvdtl.java      | 12 +++---
 .../impl/StIvtIostorinvOutServiceImpl.java    | 41 +++++++++----------
 .../impl/StIvtIostorinvServiceImpl.java       | 36 ++++++++--------
 .../impl/StIvtIostorinvdisServiceImpl.java    | 20 ++++-----
 .../impl/StIvtIostorinvdtlServiceImpl.java    | 12 +++---
 .../storage_manage/ios/inbill/AddDialog.vue   |  4 +-
 .../storage_manage/ios/inbill/DivDialog.vue   |  4 +-
 .../storage_manage/ios/inbill/TaskDialog.vue  |  4 +-
 .../storage_manage/ios/inbill/ViewDialog.vue  | 10 ++---
 .../wms/storage_manage/ios/inbill/index.vue   |  6 +--
 .../storage_manage/ios/outbill/AddDialog.vue  |  4 +-
 .../storage_manage/ios/outbill/DivDialog.vue  |  6 +--
 .../storage_manage/ios/outbill/TaskDialog.vue |  6 +--
 .../storage_manage/ios/outbill/ViewDialog.vue | 10 ++---
 .../wms/storage_manage/ios/outbill/index.vue  |  6 +--
 18 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
index 28f52d8..720c0d1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
@@ -25,7 +25,7 @@ public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
      * @param tableDataList 、
      * @return 、
      */
-    ArrayList<StIvtIostorinvdtl> insertDtl(String iostorinv_id, List<JSONObject> tableDataList);
+    ArrayList<StIvtIostorinvdtl> insertDtl(Long iostorinv_id, List<JSONObject> tableDataList);
 
     /**
      * 获取单据明细
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java
index d8a266c..06dc2fb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java
@@ -30,7 +30,7 @@ public class StIvtIostorinv implements Serializable {
      * 出入单标识
      */
     @TableId
-    private String iostorinv_id;
+    private Long iostorinv_id;
 
     /**
      * 单据编号
@@ -60,7 +60,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 仓库标识
      */
-    private String stor_id;
+    private Long stor_id;
 
     /**
      * 仓库编码
@@ -75,7 +75,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 来源方标识
      */
-    private String source_id;
+    private Long source_id;
 
     /**
      * 来源方名称
@@ -120,7 +120,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 制单人
      */
-    private String input_optid;
+    private Long input_optid;
 
     /**
      * 制单人姓名
@@ -135,7 +135,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 修改人
      */
-    private String update_optid;
+    private Long update_optid;
 
     /**
      * 修改人姓名
@@ -150,7 +150,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 分配人
      */
-    private String dis_optid;
+    private Long dis_optid;
 
     /**
      * 分配人姓名
@@ -165,7 +165,7 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 确认人
      */
-    private String confirm_optid;
+    private Long confirm_optid;
 
     /**
      * 确认人姓名
@@ -180,27 +180,27 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 部门ID
      */
-    private String sysdeptid;
+    private Long sysdeptid;
 
     /**
      * 公司ID
      */
-    private String syscompanyid;
+    private Long syscompanyid;
 
     /**
      * 是否删除
      */
-    private Boolean is_delete;
+    private String is_delete;
 
     /**
      * 是否已上传
      */
-    private Boolean is_upload;
+    private String is_upload;
 
     /**
      * 回传人
      */
-    private String upload_optid;
+    private Long upload_optid;
 
     /**
      * 回传时间
@@ -210,12 +210,12 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 是否冲销
      */
-    private Boolean is_writeoff;
+    private String is_writeoff;
 
     /**
      * 冲销人
      */
-    private String writeoff_optid;
+    private Long writeoff_optid;
 
     /**
      * 冲销时间
@@ -305,17 +305,17 @@ public class StIvtIostorinv implements Serializable {
     /**
      * 移入仓库标识
      */
-    private String out_stor_id;
+    private Long out_stor_id;
 
     /**
      * 回传MES
      */
-    private Boolean upload_mes;
+    private String upload_mes;
 
     /**
      * 回传SAP
      */
-    private Boolean upload_sap;
+    private String upload_sap;
 
     /**
      * 运转费
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java
index e798133..3b2f2d1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java
@@ -29,17 +29,17 @@ public class StIvtIostorinvdis implements Serializable {
      * 出入单分配标识
      */
     @TableId
-    private String iostorinvdis_id;
+    private Long iostorinvdis_id;
 
     /**
      * 出入单标识
      */
-    private String iostorinv_id;
+    private Long iostorinv_id;
 
     /**
      * 出入单明细标识
      */
-    private String iostorinvdtl_id;
+    private Long iostorinvdtl_id;
 
     /**
      * 明细序号
@@ -49,7 +49,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 库区标识
      */
-    private String sect_id;
+    private Long sect_id;
 
     /**
      * 库区编码
@@ -64,7 +64,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 仓位标识
      */
-    private String struct_id;
+    private Long struct_id;
 
     /**
      * 仓位编码
@@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 物料标识
      */
-    private String material_id;
+    private Long material_id;
 
     /**
      * 批次
@@ -99,12 +99,12 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 任务标识
      */
-    private String task_id;
+    private Long task_id;
 
     /**
      * 存储载具标识
      */
-    private String storagevehicle_id;
+    private Long storagevehicle_id;
 
     /**
      * 存储载具编码
@@ -114,12 +114,12 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 是否已下发
      */
-    private Boolean is_issued;
+    private String is_issued;
 
     /**
      * 数量计量单位标识
      */
-    private String qty_unit_id;
+    private Long qty_unit_id;
 
     /**
      * 数量计量单位名称
@@ -139,12 +139,11 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 出入点位标识
      */
-    private String point_id;
+    private Long point_id;
 
     /**
      * 箱号
      */
     private String box_no;
 
-
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java
index 9b6e179..904642d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java
@@ -29,12 +29,12 @@ public class StIvtIostorinvdtl implements Serializable {
      * 出入单明细标识
      */
     @TableId
-    private String iostorinvdtl_id;
+    private Long iostorinvdtl_id;
 
     /**
      * 出入单标识
      */
-    private String iostorinv_id;
+    private Long iostorinv_id;
 
     /**
      * 明细序号
@@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 物料标识
      */
-    private String material_id;
+    private Long material_id;
 
     /**
      * 批次
@@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 数量计量单位标识
      */
-    private String qty_unit_id;
+    private Long qty_unit_id;
 
     /**
      * 数量计量单位名称
@@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 来源单据明细标识
      */
-    private String source_billdtl_id;
+    private Long source_billdtl_id;
 
     /**
      * 来源单据类型
@@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 基础单据明细标识
      */
-    private String base_billdtl_id;
+    private Long base_billdtl_id;
 
     /**
      * 基础单据类型
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 6ce873d..1cbd9ee 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -123,12 +123,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
         // 组织主表数据
         StIvtIostorinv mstDao = StIvtIostorinv.builder()
-                .iostorinv_id(IdUtil.getStringId())
-                .bill_code(CodeUtil.getNewCode("OUT_IVN_CODE"))
+                .iostorinv_id(IdUtil.getLongId())
+                .bill_code(CodeUtil.getNewCode("IO_CODE"))
                 .bill_status(IOSEnum.BILL_STATUS.code("生成"))
                 .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
                 .io_type(IOSEnum.IO_TYPE.code("出库"))
-                .input_optid(SecurityUtils.getCurrentUserId())
+                .input_optid(Long.valueOf(SecurityUtils.getCurrentUserId()))
                 .input_optname(SecurityUtils.getCurrentNickName())
                 .input_time(DateUtil.now())
                 .build();
@@ -165,7 +165,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // 组织主表数据
         updateMst(mstDao, whereJson);
 
-        mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
+        mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
         mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
         mstDao.setUpdate_time(DateUtil.now());
         this.updateById(mstDao);
@@ -217,7 +217,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // JSONObject转实体类
         StIvtIostorinv mstDao = BeanUtil.copyProperties(whereJson,StIvtIostorinv.class);
 
-        mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
+        mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
         mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
         mstDao.setUpdate_time(DateUtil.now());
         this.updateById(mstDao);
@@ -363,7 +363,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                         .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
         );
 
-        updateMstStatus(whereJson.getString("iostorinv_id"));
+        updateMstStatus(whereJson.getLongValue("iostorinv_id"));
     }
 
     @Override
@@ -390,7 +390,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
         // 查询出所有分配明细
         String id_in = dtlDaoList.stream()
-                .map(StIvtIostorinvdtl::getIostorinvdtl_id)
+                .map(row -> row.getIostorinv_id().toString())
                 .collect(Collectors.joining("','"));
 
         List<StIvtIostorinvdis> disDaoList = iStIvtIostorinvdisService.list(
@@ -432,7 +432,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         iStIvtIostorinvdtlService.updateBatchById(dtlDaoList);
 
         // 更新主表状态
-        updateMstStatus(whereJson.getString("iostorinv_id"));
+        updateMstStatus(whereJson.getLongValue("iostorinv_id"));
 
     }
 
@@ -458,7 +458,6 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
         // 更新分配明细
         disDaoList.forEach(row -> {
-            row.setTask_id("");
             row.setWork_status(IOSEnum.WORK_STATUS.code("生成"));
         });
         iStIvtIostorinvdisService.updateBatchById(disDaoList);
@@ -514,22 +513,22 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         mstDao.setBuss_type(whereJson.getString("bill_type"));
         mstDao.setBill_type(whereJson.getString("bill_type"));
         mstDao.setBiz_date(whereJson.getString("biz_date").substring(0,10));
-        mstDao.setStor_id(whereJson.getString("stor_id"));
+        mstDao.setStor_id(whereJson.getLongValue("stor_id"));
         mstDao.setStor_code(whereJson.getString("stor_code"));
         mstDao.setStor_name(whereJson.getString("stor_name"));
-        mstDao.setSource_id(whereJson.getString("source_id"));
+        mstDao.setSource_id(whereJson.getLongValue("source_id"));
         mstDao.setSource_name(whereJson.getString("source_name"));
         mstDao.setSource_type(whereJson.getString("source_type"));
         mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty"));
         mstDao.setDetail_count(whereJson.getBigDecimal("detail_count"));
         mstDao.setRemark(whereJson.getString("remark"));
-        mstDao.setSyscompanyid("1");
-        mstDao.setSysdeptid("1");
-        mstDao.setIs_delete(false);
-        mstDao.setIs_upload(false);
-        mstDao.setIs_writeoff(false);
-        mstDao.setUpload_mes(false);
-        mstDao.setUpload_sap(false);
+        mstDao.setSyscompanyid(1L);
+        mstDao.setSysdeptid(1L);
+        mstDao.setIs_delete("0");
+        mstDao.setIs_upload("0");
+        mstDao.setIs_writeoff("0");
+        mstDao.setUpload_mes("0");
+        mstDao.setUpload_sap("0");
     }
 
     /**
@@ -564,7 +563,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
      * 更新主表状态
      * @param iostorinv_id 、
      */
-    private void updateMstStatus(String iostorinv_id) {
+    private void updateMstStatus(Long iostorinv_id) {
         StIvtIostorinv mstDao = this.getById(iostorinv_id);
 
         // 查询所有明细是否都为完成、分配中、分配完
@@ -635,11 +634,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
      *  更新库存
      * @param iostorinv_id 、
      */
-    private void updateIvt(String iostorinv_id) {
+    private void updateIvt(Long iostorinv_id) {
         // 更新主表状态为完成
         StIvtIostorinv mstDao = this.getById(iostorinv_id);
         mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
-        mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId());
+        mstDao.setConfirm_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
         mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
         mstDao.setConfirm_time(DateUtil.now());
         this.updateById(mstDao);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 864719c..347390e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -124,12 +124,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
 
         // 组织主表数据
         StIvtIostorinv mstDao = StIvtIostorinv.builder()
-                .iostorinv_id(IdUtil.getStringId())
-                .bill_code(CodeUtil.getNewCode("IN_IVN_CODE"))
+                .iostorinv_id(IdUtil.getLongId())
+                .bill_code(CodeUtil.getNewCode("IO_CODE"))
                 .bill_status(IOSEnum.BILL_STATUS.code("生成"))
                 .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
                 .io_type(IOSEnum.IO_TYPE.code("入库"))
-                .input_optid(SecurityUtils.getCurrentUserId())
+                .input_optid(Long.valueOf(SecurityUtils.getCurrentUserId()))
                 .input_optname(SecurityUtils.getCurrentNickName())
                 .input_time(DateUtil.now())
                 .build();
@@ -166,7 +166,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         // 组织主表数据
         updateMst(mstDao, whereJson);
 
-        mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
+        mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
         mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
         mstDao.setUpdate_time(DateUtil.now());
         this.updateById(mstDao);
@@ -293,7 +293,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                     .set(StIvtIostorinv::getDis_time,DateUtil.now())
                     .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
         );
-        updateMstStatus(whereJson.getString("iostorinv_id"));
+        updateMstStatus(whereJson.getLongValue("iostorinv_id"));
 
         // 锁定点位/解锁点位
         ArrayList<SchBasePoint> paramList = new ArrayList<>();
@@ -347,7 +347,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                         .set(StIvtIostorinv::getDis_time,"")
                         .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
         );
-        updateMstStatus(whereJson.getString("iostorinv_id"));
+        updateMstStatus(whereJson.getLongValue("iostorinv_id"));
 
         // 锁定点位/解锁点位
         ArrayList<SchBasePoint> paramList = new ArrayList<>();
@@ -454,7 +454,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
      * 更新主表状态
      * @param iostorinv_id 、
      */
-    private void updateMstStatus(String iostorinv_id) {
+    private void updateMstStatus(Long iostorinv_id) {
         StIvtIostorinv mstDao = this.getById(iostorinv_id);
 
         // 查询所有明细是否都为完成、分配中、分配完
@@ -525,11 +525,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
      * 更新库存
      * @param iostorinv_id 、
      */
-    private void updateIvt(String iostorinv_id) {
+    private void updateIvt(Long iostorinv_id) {
         // 更新主表状态为完成
         StIvtIostorinv mstDao = this.getById(iostorinv_id);
         mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
-        mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId());
+        mstDao.setConfirm_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
         mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
         mstDao.setConfirm_time(DateUtil.now());
         this.updateById(mstDao);
@@ -546,21 +546,21 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         mstDao.setBuss_type(whereJson.getString("bill_type"));
         mstDao.setBill_type(whereJson.getString("bill_type"));
         mstDao.setBiz_date(whereJson.getString("biz_date").substring(0,10));
-        mstDao.setStor_id(whereJson.getString("stor_id"));
+        mstDao.setStor_id(whereJson.getLongValue("stor_id"));
         mstDao.setStor_code(whereJson.getString("stor_code"));
         mstDao.setStor_name(whereJson.getString("stor_name"));
-        mstDao.setSource_id(whereJson.getString("source_id"));
+        mstDao.setSource_id(whereJson.getLongValue("source_id"));
         mstDao.setSource_name(whereJson.getString("source_name"));
         mstDao.setSource_type(whereJson.getString("source_type"));
         mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty"));
         mstDao.setDetail_count(whereJson.getBigDecimal("detail_count"));
         mstDao.setRemark(whereJson.getString("remark"));
-        mstDao.setSyscompanyid("1");
-        mstDao.setSysdeptid("1");
-        mstDao.setIs_delete(false);
-        mstDao.setIs_upload(false);
-        mstDao.setIs_writeoff(false);
-        mstDao.setUpload_mes(false);
-        mstDao.setUpload_sap(false);
+        mstDao.setSyscompanyid(1L);
+        mstDao.setSysdeptid(1L);
+        mstDao.setIs_delete("0");
+        mstDao.setIs_upload("0");
+        mstDao.setIs_writeoff("0");
+        mstDao.setUpload_mes("0");
+        mstDao.setUpload_sap("0");
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
index 966cf22..7a40565 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
@@ -37,25 +37,25 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
             JSONObject json = collect.get(i);
 
             StIvtIostorinvdis disDao = StIvtIostorinvdis.builder()
-                    .iostorinvdis_id(IdUtil.getStringId())
-                    .iostorinv_id(json.getString("iostorinv_id"))
-                    .iostorinvdtl_id(json.getString("iostorinvdtl_id"))
+                    .iostorinvdis_id(IdUtil.getLongId())
+                    .iostorinv_id(json.getLongValue("iostorinv_id"))
+                    .iostorinvdtl_id(json.getLongValue("iostorinvdtl_id"))
                     .seq_no(BigDecimal.valueOf(i))
-                    .sect_id(json.getString("sect_id"))
+                    .sect_id(json.getLongValue("sect_id"))
                     .sect_code(json.getString("sect_code"))
                     .sect_name(json.getString("sect_name"))
-                    .struct_id(json.getString("struct_id"))
+                    .struct_id(json.getLongValue("struct_id"))
                     .struct_code(json.getString("struct_code"))
                     .struct_name(json.getString("struct_name"))
-                    .material_id(json.getString("material_id"))
+                    .material_id(json.getLongValue("material_id"))
                     .pcsn(json.getString("pcsn"))
                     .quality_scode(json.getString("quality_scode"))
                     .work_status(IOSEnum.WORK_STATUS.code("未生成"))
-                    .task_id(json.getString("task_id"))
-                    .storagevehicle_id(json.getString("storagevehicle_id"))
+                    .task_id(json.getLongValue("task_id"))
+                    .storagevehicle_id(json.getLongValue("storagevehicle_id"))
                     .storagevehicle_code(json.getString("storagevehicle_code"))
-                    .is_issued(false)
-                    .qty_unit_id(json.getString("qty_unit_id"))
+                    .is_issued("0")
+                    .qty_unit_id(json.getLongValue("qty_unit_id"))
                     .qty_unit_name(json.getString("qty_unit_name"))
                     .plan_qty(json.getBigDecimal("plan_qty"))
                     .real_qty(json.getBigDecimal("real_qty"))
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
index 32c0566..52ffb5d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
@@ -57,7 +57,7 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ArrayList<StIvtIostorinvdtl>  insertDtl(String iostorinv_id, List<JSONObject> tableDataList) {
+    public ArrayList<StIvtIostorinvdtl>  insertDtl(Long iostorinv_id, List<JSONObject> tableDataList) {
 
         // 查询所有对应物料集合
         List<MdBaseMaterial> materialList = iMdBaseMaterialService.list(
@@ -87,21 +87,21 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
             if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在"+json.getString("material_code"));
 
             StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder()
-                    .iostorinvdtl_id(IdUtil.getStringId())
+                    .iostorinvdtl_id(IdUtil.getLongId())
                     .iostorinv_id(iostorinv_id)
                     .seq_no(BigDecimal.valueOf(i))
-                    .material_id(materDao.getMaterial_id())
+                    .material_id(Long.valueOf(materDao.getMaterial_id()))
                     .pcsn(json.getString("pcsn"))
                     .quality_scode("00")
                     .bill_status(IOSEnum.BILL_STATUS.code("生成"))
-                    .qty_unit_id("1")
+                    .qty_unit_id(1L)
                     .qty_unit_name("KG")
                     .plan_qty(json.getBigDecimal("plan_qty"))
-                    .source_billdtl_id(json.getString("source_billdtl_id"))
+                    .source_billdtl_id(json.getLongValue("source_billdtl_id"))
                     .source_bill_type(json.getString("source_bill_type"))
                     .source_bill_code(json.getString("source_bill_code"))
                     .source_bill_table(json.getString("source_bill_table"))
-                    .base_billdtl_id(json.getString("base_billdtl_id"))
+                    .base_billdtl_id(json.getLongValue("base_billdtl_id"))
                     .base_bill_type(json.getString("base_bill_type"))
                     .base_bill_code(json.getString("base_bill_code"))
                     .base_bill_table(json.getString("base_bill_table"))
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
index 7c0d05b..5e73023 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
@@ -72,7 +72,7 @@
           disabled
         >
           <el-option
-            v-for="item in dict.IO_BILL_STATUS"
+            v-for="item in dict.io_bill_status"
             :key="item.id"
             :label="item.label"
             :value="item.value"
@@ -189,7 +189,7 @@ export default {
   name: 'AddDialog',
   components: { AddDtl },
   mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE'],
+  dicts: ['io_bill_status', 'ST_INV_IN_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
index 19c833f..661b803 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
@@ -54,7 +54,7 @@
               :disabled="true"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
+                v-for="item in dict.io_bill_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -189,7 +189,7 @@ export default {
   name: 'DivDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['IO_BILL_STATUS'],
+  dicts: ['io_bill_status'],
   props: {
     dialogShow: {
       type: Boolean,
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
index 9be4e0c..0d76a02 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
@@ -125,7 +125,7 @@ export default {
   name: 'TaskDialog',
   components: {},
   mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'TASK_STATUS'],
+  dicts: ['io_bill_status', 'task_status'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -226,7 +226,7 @@ export default {
     checkedChange(val) {
     },
     statusFormat(row, column) {
-      return this.dict.label.TASK_STATUS[row.work_status]
+      return this.dict.label.task_status[row.work_status]
     },
     clcikDisRow(row, column, event) {
       this.dis_row = row
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
index fdb6f9e..4503fb9 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
@@ -58,7 +58,7 @@
           disabled
         >
           <el-option
-            v-for="item in dict.IO_BILL_STATUS"
+            v-for="item in dict.io_bill_status"
             :key="item.id"
             :label="item.label"
             :value="item.value"
@@ -159,7 +159,7 @@ export default {
   name: 'ViewDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'WORK_STATUS', 'TASK_STATUS', 'ST_INV_IN_TYPE'],
+  dicts: ['io_bill_status', 'work_status', 'task_status', 'ST_INV_IN_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -214,13 +214,13 @@ export default {
       this.$emit('TaskChanged')
     },
     bill_statusFormat(row) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     task_statusFormat(row) {
-      return this.dict.label.TASK_STATUS[row.TASK_STATUS]
+      return this.dict.label.task_status[row.task_status]
     },
     work_statusFormat(row) {
-      return this.dict.label.WORK_STATUS[row.WORK_STATUS]
+      return this.dict.label.work_status[row.work_status]
     },
     handleDtlCurrentChange(current) {
       if (current !== null) {
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
index ab8a929..0d916d7 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
@@ -77,7 +77,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
+                v-for="item in dict.io_bill_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -249,7 +249,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_IN_TYPE'],
+  dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_IN_TYPE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -330,7 +330,7 @@ export default {
       })
     },
     stateFormat(row, column) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     create_modeFormat(row, column) {
       return this.dict.label.ST_CREATE_MODE[row.create_mode]
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/AddDialog.vue
index 27d2018..34e1ab9 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/AddDialog.vue
@@ -73,7 +73,7 @@
           disabled
         >
           <el-option
-            v-for="item in dict.IO_BILL_STATUS"
+            v-for="item in dict.io_bill_status"
             :key="item.id"
             :label="item.label"
             :value="item.value"
@@ -208,7 +208,7 @@ export default {
       default: false
     }
   },
-  dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE'],
+  dicts: ['io_bill_status', 'ST_INV_OUT_TYPE'],
   data() {
     return {
       dialogVisible: false,
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/DivDialog.vue
index b773c4b..00e3835 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/DivDialog.vue
@@ -226,7 +226,7 @@
               :disabled="true"
             >
               <el-option
-                v-for="item in dict.WORK_STATUS"
+                v-for="item in dict.work_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -265,7 +265,7 @@ export default {
   name: 'DivDialog',
   components: { StructIvt },
   mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'WORK_STATUS'],
+  dicts: ['io_bill_status', 'work_status'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -349,7 +349,7 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     bill_statusFormat(row, column) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     invtypeFormat(row, column) {
       for (const item of this.invtypelist) {
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/TaskDialog.vue
index 5d60588..a1e8305 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/TaskDialog.vue
@@ -125,7 +125,7 @@ export default {
   name: 'TaskDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['TASK_STATUS', 'IO_BILL_STATUS'],
+  dicts: ['task_status', 'io_bill_status'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -185,10 +185,10 @@ export default {
       this.$emit('TaskChanged')
     },
     bill_statusFormat(row) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     task_statusFormat(row) {
-      return this.dict.label.TASK_STATUS[row.task_status]
+      return this.dict.label.task_status[row.task_status]
     },
     tabledisabled(row) {
       if (row.task_status === '01' && row.is_issued === '0') {
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/ViewDialog.vue
index 8df8b20..df7f491 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/ViewDialog.vue
@@ -59,7 +59,7 @@
           disabled
         >
           <el-option
-            v-for="item in dict.IO_BILL_STATUS"
+            v-for="item in dict.io_bill_status"
             :key="item.id"
             :label="item.label"
             :value="item.value"
@@ -180,7 +180,7 @@ export default {
   name: 'ViewDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'WORK_STATUS', 'TASK_STATUS', 'ST_INV_OUT_TYPE'],
+  dicts: ['io_bill_status', 'work_status', 'task_status', 'ST_INV_OUT_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -228,13 +228,13 @@ export default {
       this.$emit('AddChanged')
     },
     bill_statusFormat(row) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     task_statusFormat(row) {
-      return this.dict.label.TASK_STATUS[row.task_status]
+      return this.dict.label.task_status[row.task_status]
     },
     work_statusFormat(row) {
-      return this.dict.label.WORK_STATUS[row.work_status]
+      return this.dict.label.work_status[row.work_status]
     },
     handleDtlCurrentChange(current) {
       if (current !== null) {
diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/index.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/index.vue
index a539ecf..da1c0ec 100644
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/index.vue
@@ -48,7 +48,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
+                v-for="item in dict.io_bill_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -299,7 +299,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'TrueOrFalse'],
+  dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'TrueOrFalse'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -391,7 +391,7 @@ export default {
       }
     },
     stateFormat(row) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+      return this.dict.label.io_bill_status[row.bill_status]
     },
     bill_typeFormat(row) {
       return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]