root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：字段类型更新-Long -> String

Browse Source
This commit is contained in:
liuxy
2024-03-25 15:37:11 +08:00
parent 83ef66968b
commit 2faebed078
12 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java
View File

@@ -23,13 +23,13 @@ import java.math.BigDecimal;
@TableName("st_ivt_bsrealstorattr") @TableName("st_ivt_bsrealstorattr")
public class StIvtBsrealstorattr implements Serializable { public class StIvtBsrealstorattr implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 仓库标识 * 仓库标识
*/ */
@TableId @TableId
private Long stor_id; private String stor_id;
/** /**
* 仓库编码 * 仓库编码
@@ -154,7 +154,7 @@ public class StIvtBsrealstorattr implements Serializable {
/** /**
* 创建人 * 创建人
*/ */
private Long create_id; private String create_id;
/** /**
* 创建人姓名 * 创建人姓名
@@ -169,7 +169,7 @@ public class StIvtBsrealstorattr implements Serializable {
/** /**
* 修改人 * 修改人
*/ */
private Long update_optid; private String update_optid;
/** /**
* 修改人姓名 * 修改人姓名
@@ -184,17 +184,17 @@ public class StIvtBsrealstorattr implements Serializable {
/** /**
* 拥有者ID * 拥有者ID
*/ */
private Long sysownerid; private String sysownerid;
/** /**
* 部门ID * 部门ID
*/ */
private Long sysdeptid; private String sysdeptid;
/** /**
* 公司ID * 公司ID
*/ */
private Long syscompanyid; private String syscompanyid;
/** /**
* 是否删除 * 是否删除

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java
View File

@@ -23,13 +23,13 @@ import lombok.experimental.Accessors;
@TableName("st_ivt_sectattr") @TableName("st_ivt_sectattr")
public class StIvtSectattr implements Serializable { public class StIvtSectattr implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 库区标识 * 库区标识
*/ */
@TableId @TableId
private Long sect_id; private String sect_id;
/** /**
* 库区编码 * 库区编码
@@ -54,7 +54,7 @@ public class StIvtSectattr implements Serializable {
/** /**
* 仓库标识 * 仓库标识
*/ */
private Long stor_id; private String stor_id;
/** /**
* 仓库类型 * 仓库类型
@@ -114,7 +114,7 @@ public class StIvtSectattr implements Serializable {
/** /**
* 创建人 * 创建人
*/ */
private Long create_id; private String create_id;
/** /**
* 创建人姓名 * 创建人姓名
@@ -129,7 +129,7 @@ public class StIvtSectattr implements Serializable {
/** /**
* 修改人 * 修改人
*/ */
private Long update_optid; private String update_optid;
/** /**
* 修改人姓名 * 修改人姓名

18
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java
View File

@@ -23,13 +23,13 @@ import lombok.experimental.Accessors;
@TableName("st_ivt_structattr") @TableName("st_ivt_structattr")
public class StIvtStructattr implements Serializable { public class StIvtStructattr implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 仓位标识 * 仓位标识
*/ */
@TableId @TableId
private Long struct_id; private String struct_id;
/** /**
* 仓位编码 * 仓位编码
@@ -49,7 +49,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 区域标识 * 区域标识
*/ */
private Long sect_id; private String sect_id;
/** /**
* 区域编码 * 区域编码
@@ -64,7 +64,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 仓库标识 * 仓库标识
*/ */
private Long stor_id; private String stor_id;
/** /**
* 仓库编码 * 仓库编码
@@ -174,7 +174,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 创建人 * 创建人
*/ */
private Long create_id; private String create_id;
/** /**
* 创建人姓名 * 创建人姓名
@@ -189,7 +189,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 修改人 * 修改人
*/ */
private Long update_optid; private String update_optid;
/** /**
* 修改人姓名 * 修改人姓名
@@ -239,7 +239,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 存储载具标识 * 存储载具标识
*/ */
private Long storagevehicle_id; private String storagevehicle_id;
/** /**
* 存储载具号 * 存储载具号
@@ -269,7 +269,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 锁定任务明细标识 * 锁定任务明细标识
*/ */
private Long taskdtl_id; private String taskdtl_id;
/** /**
* 锁定任务编码 * 锁定任务编码
@@ -284,7 +284,7 @@ public class StIvtStructattr implements Serializable {
/** /**
* 锁定单据标识 * 锁定单据标识
*/ */
private Long inv_id; private String inv_id;
/** /**
* 锁定单据编码 * 锁定单据编码

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtUserstor.java
View File

@@ -28,12 +28,12 @@ public class StIvtUserstor implements Serializable {
* 仓库标识 * 仓库标识
*/ */
@TableId @TableId
private Long stor_id; private String stor_id;
/** /**
* 人员标识 * 人员标识
*/ */
private Long user_id; private String user_id;
} }

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
View File

@@ -25,7 +25,7 @@ public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
* @param tableDataList 、 * @param tableDataList 、
* @return 、 * @return 、
*/ */
ArrayList<StIvtIostorinvdtl> insertDtl(Long iostorinv_id, List<JSONObject> tableDataList); ArrayList<StIvtIostorinvdtl> insertDtl(String iostorinv_id, List<JSONObject> tableDataList);
/** /**
* 获取单据明细 * 获取单据明细

26
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java
View File

@@ -24,13 +24,13 @@ import java.math.BigDecimal;
public class StIvtIostorinv implements Serializable { public class StIvtIostorinv implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 出入单标识 * 出入单标识
*/ */
@TableId @TableId
private Long iostorinv_id; private String iostorinv_id;
/** /**
* 单据编号 * 单据编号
@@ -60,7 +60,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 仓库标识 * 仓库标识
*/ */
private Long stor_id; private String stor_id;
/** /**
* 仓库编码 * 仓库编码
@@ -75,7 +75,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 来源方标识 * 来源方标识
*/ */
private Long source_id; private String source_id;
/** /**
* 来源方名称 * 来源方名称
@@ -120,7 +120,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 制单人 * 制单人
*/ */
private Long input_optid; private String input_optid;
/** /**
* 制单人姓名 * 制单人姓名
@@ -135,7 +135,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 修改人 * 修改人
*/ */
private Long update_optid; private String update_optid;
/** /**
* 修改人姓名 * 修改人姓名
@@ -150,7 +150,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 分配人 * 分配人
*/ */
private Long dis_optid; private String dis_optid;
/** /**
* 分配人姓名 * 分配人姓名
@@ -165,7 +165,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 确认人 * 确认人
*/ */
private Long confirm_optid; private String confirm_optid;
/** /**
* 确认人姓名 * 确认人姓名
@@ -180,12 +180,12 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 部门ID * 部门ID
*/ */
private Long sysdeptid; private String sysdeptid;
/** /**
* 公司ID * 公司ID
*/ */
private Long syscompanyid; private String syscompanyid;
/** /**
* 是否删除 * 是否删除
@@ -200,7 +200,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 回传人 * 回传人
*/ */
private Long upload_optid; private String upload_optid;
/** /**
* 回传时间 * 回传时间
@@ -215,7 +215,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 冲销人 * 冲销人
*/ */
private Long writeoff_optid; private String writeoff_optid;
/** /**
* 冲销时间 * 冲销时间
@@ -305,7 +305,7 @@ public class StIvtIostorinv implements Serializable {
/** /**
* 移入仓库标识 * 移入仓库标识
*/ */
private Long out_stor_id; private String out_stor_id;
/** /**
* 回传MES * 回传MES

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java
View File

@@ -23,23 +23,23 @@ import java.math.BigDecimal;
@Builder @Builder
public class StIvtIostorinvdis implements Serializable { public class StIvtIostorinvdis implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 出入单分配标识 * 出入单分配标识
*/ */
@TableId @TableId
private Long iostorinvdis_id; private String iostorinvdis_id;
/** /**
* 出入单标识 * 出入单标识
*/ */
private Long iostorinv_id; private String iostorinv_id;
/** /**
* 出入单明细标识 * 出入单明细标识
*/ */
private Long iostorinvdtl_id; private String iostorinvdtl_id;
/** /**
* 明细序号 * 明细序号
@@ -49,7 +49,7 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 库区标识 * 库区标识
*/ */
private Long sect_id; private String sect_id;
/** /**
* 库区编码 * 库区编码
@@ -64,7 +64,7 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 仓位标识 * 仓位标识
*/ */
private Long struct_id; private String struct_id;
/** /**
* 仓位编码 * 仓位编码
@@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 物料标识 * 物料标识
*/ */
private Long material_id; private String material_id;
/** /**
* 批次 * 批次
@@ -99,12 +99,12 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 任务标识 * 任务标识
*/ */
private Long task_id; private String task_id;
/** /**
* 存储载具标识 * 存储载具标识
*/ */
private Long storagevehicle_id; private String storagevehicle_id;
/** /**
* 存储载具编码 * 存储载具编码
@@ -119,7 +119,7 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 数量计量单位标识 * 数量计量单位标识
*/ */
private Long qty_unit_id; private String qty_unit_id;
/** /**
* 数量计量单位名称 * 数量计量单位名称
@@ -139,7 +139,7 @@ public class StIvtIostorinvdis implements Serializable {
/** /**
* 出入点位标识 * 出入点位标识
*/ */
private Long point_id; private String point_id;
/** /**
* 箱号 * 箱号

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java
View File

@@ -23,18 +23,18 @@ import java.math.BigDecimal;
@TableName("st_ivt_iostorinvdtl") @TableName("st_ivt_iostorinvdtl")
public class StIvtIostorinvdtl implements Serializable { public class StIvtIostorinvdtl implements Serializable {
private static final long serialVersionUID = 1L; private static final Long serialVersionUID = 1L;
/** /**
* 出入单明细标识 * 出入单明细标识
*/ */
@TableId @TableId
private Long iostorinvdtl_id; private String iostorinvdtl_id;
/** /**
* 出入单标识 * 出入单标识
*/ */
private Long iostorinv_id; private String iostorinv_id;
/** /**
* 明细序号 * 明细序号
@@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable {
/** /**
* 物料标识 * 物料标识
*/ */
private Long material_id; private String material_id;
/** /**
* 批次 * 批次
@@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable {
/** /**
* 数量计量单位标识 * 数量计量单位标识
*/ */
private Long qty_unit_id; private String qty_unit_id;
/** /**
* 数量计量单位名称 * 数量计量单位名称
@@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable {
/** /**
* 来源单据明细标识 * 来源单据明细标识
*/ */
private Long source_billdtl_id; private String source_billdtl_id;
/** /**
* 来源单据类型 * 来源单据类型
@@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable {
/** /**
* 基础单据明细标识 * 基础单据明细标识
*/ */
private Long base_billdtl_id; private String base_billdtl_id;
/** /**
* 基础单据类型 * 基础单据类型

26
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -123,12 +123,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// 组织主表数据 // 组织主表数据
StIvtIostorinv mstDao = StIvtIostorinv.builder() StIvtIostorinv mstDao = StIvtIostorinv.builder()
.iostorinv_id(IdUtil.getLongId()) .iostorinv_id(IdUtil.getStringId())
.bill_code(CodeUtil.getNewCode("IO_CODE")) .bill_code(CodeUtil.getNewCode("IO_CODE"))
.bill_status(IOSEnum.BILL_STATUS.code("生成")) .bill_status(IOSEnum.BILL_STATUS.code("生成"))
.create_mode(IOSEnum.CREATE_MODE.code("PC产生")) .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
.io_type(IOSEnum.IO_TYPE.code("出库")) .io_type(IOSEnum.IO_TYPE.code("出库"))
.input_optid(Long.valueOf(SecurityUtils.getCurrentUserId())) .input_optid(SecurityUtils.getCurrentUserId())
.input_optname(SecurityUtils.getCurrentNickName()) .input_optname(SecurityUtils.getCurrentNickName())
.input_time(DateUtil.now()) .input_time(DateUtil.now())
.build(); .build();
@@ -165,7 +165,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// 组织主表数据 // 组织主表数据
updateMst(mstDao, whereJson); updateMst(mstDao, whereJson);
mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName()); mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
mstDao.setUpdate_time(DateUtil.now()); mstDao.setUpdate_time(DateUtil.now());
this.updateById(mstDao); this.updateById(mstDao);
@@ -217,7 +217,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// JSONObject转实体类 // JSONObject转实体类
StIvtIostorinv mstDao = BeanUtil.copyProperties(whereJson,StIvtIostorinv.class); StIvtIostorinv mstDao = BeanUtil.copyProperties(whereJson,StIvtIostorinv.class);
mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName()); mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
mstDao.setUpdate_time(DateUtil.now()); mstDao.setUpdate_time(DateUtil.now());
this.updateById(mstDao); this.updateById(mstDao);
@@ -363,7 +363,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
.eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id")) .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
); );
updateMstStatus(whereJson.getLongValue("iostorinv_id")); updateMstStatus(whereJson.getString("iostorinv_id"));
} }
@Override @Override
@@ -432,7 +432,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
iStIvtIostorinvdtlService.updateBatchById(dtlDaoList); iStIvtIostorinvdtlService.updateBatchById(dtlDaoList);
// 更新主表状态 // 更新主表状态
updateMstStatus(whereJson.getLongValue("iostorinv_id")); updateMstStatus(whereJson.getString("iostorinv_id"));
} }
@@ -513,17 +513,17 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
mstDao.setBuss_type(whereJson.getString("bill_type")); mstDao.setBuss_type(whereJson.getString("bill_type"));
mstDao.setBill_type(whereJson.getString("bill_type")); mstDao.setBill_type(whereJson.getString("bill_type"));
mstDao.setBiz_date(whereJson.getString("biz_date").substring(0,10)); mstDao.setBiz_date(whereJson.getString("biz_date").substring(0,10));
mstDao.setStor_id(whereJson.getLongValue("stor_id")); mstDao.setStor_id(whereJson.getString("stor_id"));
mstDao.setStor_code(whereJson.getString("stor_code")); mstDao.setStor_code(whereJson.getString("stor_code"));
mstDao.setStor_name(whereJson.getString("stor_name")); mstDao.setStor_name(whereJson.getString("stor_name"));
mstDao.setSource_id(whereJson.getLongValue("source_id")); mstDao.setSource_id(whereJson.getString("source_id"));
mstDao.setSource_name(whereJson.getString("source_name")); mstDao.setSource_name(whereJson.getString("source_name"));
mstDao.setSource_type(whereJson.getString("source_type")); mstDao.setSource_type(whereJson.getString("source_type"));
mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty")); mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty"));
mstDao.setDetail_count(whereJson.getBigDecimal("detail_count")); mstDao.setDetail_count(whereJson.getBigDecimal("detail_count"));
mstDao.setRemark(whereJson.getString("remark")); mstDao.setRemark(whereJson.getString("remark"));
mstDao.setSyscompanyid(1L); mstDao.setSyscompanyid("1");
mstDao.setSysdeptid(1L); mstDao.setSysdeptid("1");
mstDao.setIs_delete("0"); mstDao.setIs_delete("0");
mstDao.setIs_upload("0"); mstDao.setIs_upload("0");
mstDao.setIs_writeoff("0"); mstDao.setIs_writeoff("0");
@@ -563,7 +563,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
* 更新主表状态 * 更新主表状态
* @param iostorinv_id 、 * @param iostorinv_id 、
*/ */
private void updateMstStatus(Long iostorinv_id) { private void updateMstStatus(String iostorinv_id) {
StIvtIostorinv mstDao = this.getById(iostorinv_id); StIvtIostorinv mstDao = this.getById(iostorinv_id);
// 查询所有明细是否都为完成、分配中、分配完 // 查询所有明细是否都为完成、分配中、分配完
@@ -634,11 +634,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
* 更新库存 * 更新库存
* @param iostorinv_id 、 * @param iostorinv_id 、
*/ */
private void updateIvt(Long iostorinv_id) { private void updateIvt(String iostorinv_id) {
// 更新主表状态为完成 // 更新主表状态为完成
StIvtIostorinv mstDao = this.getById(iostorinv_id); StIvtIostorinv mstDao = this.getById(iostorinv_id);
mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成")); mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
mstDao.setConfirm_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId());
mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName()); mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
mstDao.setConfirm_time(DateUtil.now()); mstDao.setConfirm_time(DateUtil.now());
this.updateById(mstDao); this.updateById(mstDao);

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -141,12 +141,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// 组织主表数据 // 组织主表数据
StIvtIostorinv mstDao = StIvtIostorinv.builder() StIvtIostorinv mstDao = StIvtIostorinv.builder()
.iostorinv_id(IdUtil.getLongId()) .iostorinv_id(IdUtil.getStringId())
.bill_code(CodeUtil.getNewCode("IO_CODE")) .bill_code(CodeUtil.getNewCode("IO_CODE"))
.bill_status(IOSEnum.BILL_STATUS.code("生成")) .bill_status(IOSEnum.BILL_STATUS.code("生成"))
.create_mode(IOSEnum.CREATE_MODE.code("PC产生")) .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
.io_type(IOSEnum.IO_TYPE.code("入库")) .io_type(IOSEnum.IO_TYPE.code("入库"))
.input_optid(Long.valueOf(SecurityUtils.getCurrentUserId())) .input_optid(SecurityUtils.getCurrentUserId())
.input_optname(SecurityUtils.getCurrentNickName()) .input_optname(SecurityUtils.getCurrentNickName())
.input_time(DateUtil.now()) .input_time(DateUtil.now())
.build(); .build();
@@ -207,7 +207,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// 组织主表数据 // 组织主表数据
updateMst(mstDao, whereJson); updateMst(mstDao, whereJson);
mstDao.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName()); mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
mstDao.setUpdate_time(DateUtil.now()); mstDao.setUpdate_time(DateUtil.now());
this.updateById(mstDao); this.updateById(mstDao);
@@ -374,7 +374,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
.set(StIvtIostorinv::getDis_time,DateUtil.now()) .set(StIvtIostorinv::getDis_time,DateUtil.now())
.eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id")) .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
); );
updateMstStatus(whereJson.getLongValue("iostorinv_id")); updateMstStatus(whereJson.getString("iostorinv_id"));
// 锁定点位/解锁点位 // 锁定点位/解锁点位
ArrayList<SchBasePoint> paramList = new ArrayList<>(); ArrayList<SchBasePoint> paramList = new ArrayList<>();
@@ -428,7 +428,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
.set(StIvtIostorinv::getDis_time,"") .set(StIvtIostorinv::getDis_time,"")
.eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id")) .eq(StIvtIostorinv::getIostorinv_id, whereJson.getString("iostorinv_id"))
); );
updateMstStatus(whereJson.getLongValue("iostorinv_id")); updateMstStatus(whereJson.getString("iostorinv_id"));
// 锁定点位/解锁点位 // 锁定点位/解锁点位
ArrayList<SchBasePoint> paramList = new ArrayList<>(); ArrayList<SchBasePoint> paramList = new ArrayList<>();
@@ -535,7 +535,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
* 更新主表状态 * 更新主表状态
* @param iostorinv_id 、 * @param iostorinv_id 、
*/ */
private void updateMstStatus(Long iostorinv_id) { private void updateMstStatus(String iostorinv_id) {
StIvtIostorinv mstDao = this.getById(iostorinv_id); StIvtIostorinv mstDao = this.getById(iostorinv_id);
// 查询所有明细是否都为完成、分配中、分配完 // 查询所有明细是否都为完成、分配中、分配完
@@ -606,11 +606,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
* 更新库存 * 更新库存
* @param iostorinv_id 、 * @param iostorinv_id 、
*/ */
private void updateIvt(Long iostorinv_id) { private void updateIvt(String iostorinv_id) {
// 更新主表状态为完成 // 更新主表状态为完成
StIvtIostorinv mstDao = this.getById(iostorinv_id); StIvtIostorinv mstDao = this.getById(iostorinv_id);
mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成")); mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
mstDao.setConfirm_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId());
mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName()); mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
mstDao.setConfirm_time(DateUtil.now()); mstDao.setConfirm_time(DateUtil.now());
this.updateById(mstDao); this.updateById(mstDao);
@@ -633,14 +633,14 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
mstDao.setStor_code(storDao.getStor_code()); mstDao.setStor_code(storDao.getStor_code());
mstDao.setStor_name(storDao.getStor_name()); mstDao.setStor_name(storDao.getStor_name());
} }
mstDao.setSource_id(whereJson.getLongValue("source_id")); mstDao.setSource_id(whereJson.getString("source_id"));
mstDao.setSource_name(whereJson.getString("source_name")); mstDao.setSource_name(whereJson.getString("source_name"));
mstDao.setSource_type(whereJson.getString("source_type")); mstDao.setSource_type(whereJson.getString("source_type"));
mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty")); mstDao.setTotal_qty(whereJson.getBigDecimal("total_qty"));
mstDao.setDetail_count(whereJson.getBigDecimal("detail_count")); mstDao.setDetail_count(whereJson.getBigDecimal("detail_count"));
mstDao.setRemark(whereJson.getString("remark")); mstDao.setRemark(whereJson.getString("remark"));
mstDao.setSyscompanyid(1L); mstDao.setSyscompanyid("1");
mstDao.setSysdeptid(1L); mstDao.setSysdeptid("1");
mstDao.setIs_delete("0"); mstDao.setIs_delete("0");
mstDao.setIs_upload("0"); mstDao.setIs_upload("0");
mstDao.setIs_writeoff("0"); mstDao.setIs_writeoff("0");

18
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
View File

@@ -37,25 +37,25 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
JSONObject json = collect.get(i); JSONObject json = collect.get(i);
StIvtIostorinvdis disDao = StIvtIostorinvdis.builder() StIvtIostorinvdis disDao = StIvtIostorinvdis.builder()
.iostorinvdis_id(IdUtil.getLongId()) .iostorinvdis_id(IdUtil.getStringId())
.iostorinv_id(json.getLongValue("iostorinv_id")) .iostorinv_id(json.getString("iostorinv_id"))
.iostorinvdtl_id(json.getLongValue("iostorinvdtl_id")) .iostorinvdtl_id(json.getString("iostorinvdtl_id"))
.seq_no(BigDecimal.valueOf(i)) .seq_no(BigDecimal.valueOf(i))
.sect_id(json.getLongValue("sect_id")) .sect_id(json.getString("sect_id"))
.sect_code(json.getString("sect_code")) .sect_code(json.getString("sect_code"))
.sect_name(json.getString("sect_name")) .sect_name(json.getString("sect_name"))
.struct_id(json.getLongValue("struct_id")) .struct_id(json.getString("struct_id"))
.struct_code(json.getString("struct_code")) .struct_code(json.getString("struct_code"))
.struct_name(json.getString("struct_name")) .struct_name(json.getString("struct_name"))
.material_id(json.getLongValue("material_id")) .material_id(json.getString("material_id"))
.pcsn(json.getString("pcsn")) .pcsn(json.getString("pcsn"))
.quality_scode(json.getString("quality_scode")) .quality_scode(json.getString("quality_scode"))
.work_status(IOSEnum.WORK_STATUS.code("未生成")) .work_status(IOSEnum.WORK_STATUS.code("未生成"))
.task_id(json.getLongValue("task_id")) .task_id(json.getString("task_id"))
.storagevehicle_id(json.getLongValue("storagevehicle_id")) .storagevehicle_id(json.getString("storagevehicle_id"))
.storagevehicle_code(json.getString("storagevehicle_code")) .storagevehicle_code(json.getString("storagevehicle_code"))
.is_issued("0") .is_issued("0")
.qty_unit_id(json.getLongValue("qty_unit_id")) .qty_unit_id(json.getString("qty_unit_id"))
.qty_unit_name(json.getString("qty_unit_name")) .qty_unit_name(json.getString("qty_unit_name"))
.plan_qty(json.getBigDecimal("plan_qty")) .plan_qty(json.getBigDecimal("plan_qty"))
.real_qty(json.getBigDecimal("real_qty")) .real_qty(json.getBigDecimal("real_qty"))

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ArrayList<StIvtIostorinvdtl> insertDtl(Long iostorinv_id, List<JSONObject> tableDataList) { public ArrayList<StIvtIostorinvdtl> insertDtl(String iostorinv_id, List<JSONObject> tableDataList) {
// 查询所有对应物料集合 // 查询所有对应物料集合
List<MdBaseMaterial> materialList = iMdBaseMaterialService.list( 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")); if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在"+json.getString("material_code"));
StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder() StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder()
.iostorinvdtl_id(IdUtil.getLongId()) .iostorinvdtl_id(IdUtil.getStringId())
.iostorinv_id(iostorinv_id) .iostorinv_id(iostorinv_id)
.seq_no(BigDecimal.valueOf(i)) .seq_no(BigDecimal.valueOf(i))
.material_id(Long.valueOf(materDao.getMaterial_id())) .material_id(materDao.getMaterial_id())
.pcsn(json.getString("pcsn")) .pcsn(json.getString("pcsn"))
.quality_scode("00") .quality_scode("00")
.bill_status(IOSEnum.BILL_STATUS.code("生成")) .bill_status(IOSEnum.BILL_STATUS.code("生成"))
.qty_unit_id(1L) .qty_unit_id("1")
.qty_unit_name("KG") .qty_unit_name("KG")
.plan_qty(json.getBigDecimal("plan_qty")) .plan_qty(json.getBigDecimal("plan_qty"))
.source_billdtl_id(json.getLongValue("source_billdtl_id")) .source_billdtl_id(json.getString("source_billdtl_id"))
.source_bill_type(json.getString("source_bill_type")) .source_bill_type(json.getString("source_bill_type"))
.source_bill_code(json.getString("source_bill_code")) .source_bill_code(json.getString("source_bill_code"))
.source_bill_table(json.getString("source_bill_table")) .source_bill_table(json.getString("source_bill_table"))
.base_billdtl_id(json.getLongValue("base_billdtl_id")) .base_billdtl_id(json.getString("base_billdtl_id"))
.base_bill_type(json.getString("base_bill_type")) .base_bill_type(json.getString("base_bill_type"))
.base_bill_code(json.getString("base_bill_code")) .base_bill_code(json.getString("base_bill_code"))
.base_bill_table(json.getString("base_bill_table")) .base_bill_table(json.getString("base_bill_table"))