liuxy/HuaDongYiYaoWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-02-02 10:15:25 +08:00
parent 1311bfb8ab
commit 9019b243e0
10 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java
View File

@@ -29,7 +29,7 @@ public class Init implements ApplicationRunner {
public void run(ApplicationArguments args) throws Exception {
// initTwoAttr(4,30,3,2, "2");
// createAttr();
// initTwoAttr2(9,11,3);
// initTwoAttr2(4,10,3);
}
@@ -66,15 +66,15 @@ public class Init implements ApplicationRunner {
col_num = "0" + i;
}
String struct_code = "B" + row + "-" + col_num + "-" + layer_num + "";
String struct_code = "Z" + row + "-" + col_num + "-" + layer_num + "";
// 新增仓位
json.setSect_id("1945408460665524224");
json.setSect_code("ZC01");
json.setSect_name("主存区");
json.setStor_id("1582991156504039424");
json.setStor_code("BA01");
json.setStor_name("北安仓库");
json.setSect_id("1993215690856861696");
json.setSect_code("ZZC01");
json.setSect_name("中间站（2）主存区");
json.setStor_id("1582991156504039423");
json.setStor_code("ZJZ01");
json.setStor_name("中间站（2）仓库");
json.setLock_type("0");
json.setRow_num(BigDecimal.valueOf(row_num));
@@ -83,17 +83,9 @@ public class Init implements ApplicationRunner {
json.setBlock_num(BigDecimal.valueOf(1));
json.setStruct_code(struct_code);
json.setStruct_name(row + "排" + col_num+ "列"+ layer_num +"层");
json.setStruct_name("Z"+row + "排" + col_num+ "列"+ layer_num +"层");
json.setSimple_name(json.getStruct_name());
// 长宽高
json.setZdepth(BigDecimal.valueOf(2700));
json.setWidth(BigDecimal.valueOf(1100));
json.setHeight(BigDecimal.valueOf(4000));
// 载具类型
json.setStoragevehicle_type("3");
json.setCreate_id("1");
json.setCreate_name("管理员");
json.setCreate_time(DateUtil.now());

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java
View File

@@ -138,9 +138,4 @@ public class MdCsSupplierbase implements Serializable {
*/
private String remark;
/**
* 质量代码
*/
private String quality_code;
}

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
View File

@@ -192,5 +192,10 @@ public class MdMeMaterialbase implements Serializable {
*/
private String supp_code;
/**
* 质量代码
*/
private String quality_code;
}

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml
View File

@@ -6,8 +6,7 @@
SELECT
mater.*,
class.class_name,
supp.supp_name,
supp.quality_code
supp.supp_name
FROM
md_me_materialbase mater
LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
@@ -30,8 +29,7 @@
class.class_code,
unit.unit_code,
unit.unit_name,
supp.supp_name,
supp.quality_code
supp.supp_name
FROM
md_me_materialbase mater
LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
@@ -44,6 +42,7 @@
AND
(mater.material_code LIKE '%${param.class_code}%' or
mater.material_name LIKE '%${param.class_code}%'or
mater.quality_code LIKE '%${param.class_code}%'or
class.class_code LIKE '%${param.class_code}%')
</if>

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java
View File

@@ -22,7 +22,6 @@ public class AssemblyBagParam {
private String bagNo;
@NotBlank(message = "物料不能为空")
private String materialId;
@NotBlank(message = "供应商不能为空")
private String suppCode;
@NotBlank(message = "批次号不能为空")
private String pcsn;

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java
View File

@@ -21,7 +21,6 @@ public class AssemblyBucketParam {
private String material_id;
@NotBlank(message = "批次号不能为空")
private String pcsn;
@NotNull(message = "数量不能为空")
private BigDecimal qty;
}