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

fix:干燥剂模板

Browse Source
This commit is contained in:
zhouz
2024-07-14 18:37:39 +08:00
parent 3ebe629301
commit c916dad331
2 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
View File

@@ -150,6 +150,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
/**
* 找一个空仓位（空托盘区）
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
@@ -225,6 +226,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
/**
* 确定巷道
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
@@ -282,6 +284,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
/**
* 获取最小排
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
@@ -346,6 +349,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
/**
* 确定仓位
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
@@ -380,6 +384,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
/**
* 获取一个货位公共方法
*
* @param jsonParam {
* sect_id：库区
* stor_id：仓库

14
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -2360,7 +2360,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String material_barcode = param.getString("material_barcode");
String vehicle_code = param.getString("vehicle_code");
//干燥剂模板
String desiccantTemplate = "4";
String desiccantTemplate = "6";
//是否开盖
String isUncap = "1";
JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + material_barcode + "'").uniqueResult(0);
@@ -2373,6 +2373,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, material_barcode)
);
//获取包装关系
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + material_barcode + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(sub_jo)) {
String material_type = sub_jo.getString("material_type");
if (material_type.equals("FG1")) {
desiccantTemplate = "6";
}
if (material_type.equals("FG2")) {
desiccantTemplate = "4";
}
}
//根据木箱高度，判断入库仓位的高度
String height = "";
String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();