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-04-02 14:03:36 +08:00
parent 620dba9b38
commit 26e6207e61
14 changed files with 29 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java
View File

@@ -21,13 +21,13 @@ import java.math.BigDecimal;
@TableName("pdm_bi_subpackagerelation")
public class PdmBiSubpackagerelation implements Serializable {
private static final long serialVersionUID = 1L;
private static final Long serialVersionUID = 1L;
/**
* 子卷包装标识
*/
@TableId
private Long workorder_id;
private String workorder_id;
/**
* 木箱唯一码
@@ -142,7 +142,7 @@ public class PdmBiSubpackagerelation implements Serializable {
/**
* 创建人
*/
private Long create_id;
private String create_id;
/**
* 创建人姓名

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

@@ -142,7 +142,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// 组织主表数据
StIvtIostorinv mstDao = StIvtIostorinv.builder()
.iostorinv_id(IdUtil.getStringId())
.bill_code(CodeUtil.getNewCode("IO_CODE"))
.bill_code(CodeUtil.getNewCode("IN_IVN_CODE"))
.bill_status(IOSEnum.BILL_STATUS.code("生成"))
.create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
.io_type(IOSEnum.IO_TYPE.code("入库"))

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

@@ -83,8 +83,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
MdBaseMaterial materDao = materialList.stream()
.filter(row -> row.getMaterial_code().equals(json.getString("material_code")))
.collect(Collectors.toList()).get(0);
if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在"+json.getString("material_code"));
.findFirst().orElse(null);
if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在：【"+json.getString("material_code") +"】");
StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder()
.iostorinvdtl_id(IdUtil.getStringId())