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

rev：出入库表结构更改

Browse Source
This commit is contained in:
liuxy
2024-01-15 19:55:39 +08:00
parent 9382c6ffe2
commit 6204f3a465
18 changed files with 119 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 、
* @return 、
*/
ArrayList<StIvtIostorinvdtl> insertDtl(String iostorinv_id, List<JSONObject> tableDataList);
ArrayList<StIvtIostorinvdtl> insertDtl(Long iostorinv_id, List<JSONObject> tableDataList);
/**
* 获取单据明细

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

@@ -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;
/**
* 运转费

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

@@ -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;
}

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

@@ -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;
/**
* 基础单据类型

41
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()
.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);

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

@@ -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");
}
}

20
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);
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"))

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
@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"))