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

opt:子卷装箱测试

Browse Source
This commit is contained in:
baoge
2024-05-15 19:19:58 +08:00
parent cf60ace60f
commit e6b3461cd9
16 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,7 +300,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* 4.出库口申请入发货区任务
*/
if ("1".equals(type)) {
boolean checked = true;
boolean auto_div = false;
if (ObjectUtil.isEmpty(vehicle_code)) {
@@ -308,34 +307,27 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
//通过该木箱码查询对应的分配明细
JSONArray dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("box_no", vehicle_code).addParam("flag", "28").process().getResultJSONArray(0);
// 校验木箱高度
String height = whereJson.getString("height"); // 高度类型
JSONObject jsonSub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
double box_high = jsonSub.getDoubleValue("box_high");
// 入库木箱下限
String in_download_box_high = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("in_download_box_high").getValue();
// 入库木箱上线
String in_up_box_high = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("in_up_box_high").getValue();
String box_type = "";
if (Double.parseDouble(in_download_box_high) < box_high && box_high <= Double.parseDouble(in_up_box_high)) {
box_type = "2";
}
if (Double.parseDouble(in_download_box_high) > box_high) {
box_type = "1";
}
if (ObjectUtil.isEmpty(box_type)) {
throw new BadRequestException("木箱高度超出指定范围，比对失败！");
}
if (!StrUtil.equals(box_type, height)) {
throw new BadRequestException("木箱高度类型错误：当前类型为" + height + ",实际类型应为" + box_type);
}
if (ObjectUtil.isEmpty(dis_rows)) {
throw new BadRequestException("未查询到木箱：" + vehicle_code + "相关入库分配明细记录！");
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -49,7 +49,8 @@ public class AcsUtil {
log.info(product_area);
throw new BadRequestException("未查询到区域对应的acs地址！");
}
String url = acs_url + api;
//String url =acs_url + api;
String url ="10.1.3.96:8011/"+ api;
try {
JSONArray rows = new JSONArray();
rows.add(jo);