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

4
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java
View File

@@ -110,12 +110,10 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
// 判断点位状态
device_jo.put("device_code", "CK2005");
JSONArray device_ja2 = new JSONArray();
device_ja2.add(device_jo);
JSONObject device_data2 = wmsToAcsService.getPointStatus(device_ja2);
JSONObject data2 = device_data2.getJSONArray("data").getJSONObject(0);
/*// 判断是否有货 且数量小于5
if (data2.getString("move").equals(IOSEnum.IS_NOTANDYES.code("否")) ||
(data2.getString("move").equals(IOSEnum.IS_NOTANDYES.code("是"))
@@ -131,7 +129,6 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
JSONObject param = new JSONObject();
param.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("request_param", param.toString());
TwoInEmpExcepTask taskBean = new TwoInEmpExcepTask();
taskBean.createTask(jsonTaskParam);
taskBean.immediateNotifyAcs(null);
@@ -139,7 +136,6 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
result.put("message", "入库失败! 出库叠盘位已叠满!" + next_device_code);
return result;
}*/
result.put("message", "入库成功!");
return result;
}

98
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
@@ -22,6 +24,8 @@ import org.nl.common.utils.SecurityUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.pdm.service.SlittingproductionplanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
@@ -43,11 +47,12 @@ import java.util.stream.Collectors;
public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpackagerelationMapper, PdmBiSubpackagerelation> implements IpdmBiSubpackagerelationService {
@Resource
private ZxqTask zxqTask;
@Resource
private OutBoxManageService outBoxManageService;
@Resource
private PdmBiSlittingproductionplanMapper pdmBiSlittingproductionplanMapper;
@Resource
private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper;
@@ -172,7 +177,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEntityList(JSONObject whereJson) {
List<PdmBiSubpackagerelation> packagerelationList= JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class);
List<PdmBiSubpackagerelation> packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class);
List<String> entityList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class).stream()
.map(PdmBiSubpackagerelation::getWorkorder_id)
.map(String::valueOf)
@@ -197,40 +202,58 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
updateWrapper.in("workorder_id", entityList);
pdmBiSubpackagerelationMapper.update(null, updateWrapper);
//下发空木箱出库任务
JSONObject boxInfo = new JSONObject();
//todo 测试，暂时默认ZXQ_1_1
boxInfo.put("device_code", "ZXQ_1_1");
boxInfo.put("material_code", boxType);
boxInfo.put("num", entityList.size());
// String boxSn = outBoxManageService.outBox(boxInfo);
String boxSn = "111";
if (StringUtils.isBlank(boxSn)) {
throw new BadRequestException("满轴缓存位 -> 待检区,木箱码不能为空！");
// JSONObject boxInfo = new JSONObject();
// //todo 测试，暂时默认ZXQ_1_1
// boxInfo.put("device_code", "ZXQ_1_1");
// boxInfo.put("material_code", boxType);
// boxInfo.put("num", entityList.size());
// String boxSn = outBoxManageService.outBox(boxInfo);
// if (StringUtils.isBlank(boxSn)) {
// throw new BadRequestException("满轴缓存位 -> 待检区,木箱码不能为空！");
// }
// //更新子卷包装关系更新木箱号
// UpdateWrapper<PdmBiSubpackagerelation> updateWrapper1 = new UpdateWrapper<>();
// updateWrapper1.set("package_box_sn", boxSn);
// updateWrapper1.in("workorder_id", entityList);
// pdmBiSubpackagerelationMapper.update(null, updateWrapper1);
transferToPacking(packagerelationList);
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
}
}
private void transferToPacking(List<PdmBiSubpackagerelation> packagerelationList) {
//创建子卷搬运到装箱区任务
// List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService
// .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
// .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱区"))
// .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
// .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空"))
// .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
// //装箱区有点位，就下发
// if (CollectionUtils.isNotEmpty(zxqPointList)) {
//下发装箱区->装箱对接位桁架任务
JSONObject jo = new JSONObject();
jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
//todo 测试，装箱点位-1-1
jo.put("point_code1", "ZXQ_1_2");
//todo 测试，装箱对接位01
jo.put("point_code2", "ZXQ_1_1");
jo.put("vehicle_code", packagerelationList.get(0).getContainer_name());
jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
jo.put("is_send", "1");
List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, packagerelationList.get(0).getContainer_name()));
if (productionPlanList.isEmpty()) {
throw new BadRequestException("该子卷暂无分切计划信息");
}
//获取纸管长度
String containerLength = productionPlanList.get(0).getPaper_tube_or_FRP().equals("1") ? productionPlanList.get(0).getPaper_tube_description() : productionPlanList.get(0).getFRP_description();
int maxNum = 0;
for (String p : containerLength.split("\\|")) {
int num = Integer.parseInt(p.replaceAll("[^0-9]", ""));
if (num > maxNum) {
maxNum = num;
}
//更新子卷包装关系更新木箱号
UpdateWrapper<PdmBiSubpackagerelation> updateWrapper1 = new UpdateWrapper<>();
updateWrapper1.set("package_box_sn", boxSn);
updateWrapper1.in("workorder_id", entityList);
pdmBiSubpackagerelationMapper.update(null, updateWrapper1);
//创建子卷搬运到装箱区任务
// List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService
// .list(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
// .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱区"))
// .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
// .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空"))
// .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
// //装箱区有点位，就下发
// if (CollectionUtils.isNotEmpty(zxqPointList)) {
//下发装箱区->装箱对接位桁架任务
JSONObject jo = new JSONObject();
jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
//todo 测试，装箱点位-1-1
jo.put("point_code1", "ZXQ_1_2");
//todo 测试，装箱对接位01
jo.put("point_code2", "ZXQ_1_1");
jo.put("vehicle_code", packagerelationList.get(0).getContainer_name());
jo.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
jo.put("is_send", "1");
//todo 测试,扩展参数
JSONObject param = new JSONObject();
//木箱最大数量
@@ -242,7 +265,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
//子卷号
param.put("barcode", packagerelationList.get(0).getContainer_name());
//子卷长度
param.put("len", packagerelationList.get(0).getLength());
param.put("len", num);
//托盘类型 1小托盘 2大托盘
param.put("containerType", "2");
jo.put("request_param", param.toString());
@@ -250,12 +273,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
// } else {
// throw new BadRequestException("装箱区暂无空余库位!");
// }
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
}
}
/**
* 多选删除
*

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
View File

@@ -63,7 +63,8 @@ public class TwoInTask extends AbstractAcsTask {
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code"))
.vehicle_code(json.getString("vehicle_code2"))
.interaction_json(json.getJSONObject("request_param"))
.priority(json.getString("priority"))
.class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type))
@@ -168,6 +169,7 @@ public class TwoInTask extends AbstractAcsTask {
json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("start_device_code"));
json.put("point_code2", form.getString("next_device_code"));

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
View File

@@ -175,7 +175,7 @@ public class DjqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
View File

@@ -159,7 +159,7 @@ public class GzqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java
View File

@@ -176,7 +176,7 @@ public class KzjhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
View File

@@ -280,7 +280,7 @@ public class MzhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
View File

@@ -170,7 +170,7 @@ public class SsxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
View File

@@ -180,7 +180,7 @@ public class ZxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
View File

@@ -193,7 +193,7 @@ public class ZxqTask extends AbstractAcsTask {
.request_param(form.getString("request_param"))
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "A1" : form.getString("product_area"))
//.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);

26
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -15,6 +15,8 @@ import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.pdm_manage.enums.SUBEnum;
import org.nl.b_lms.sch.tasks.TwoInTask;
import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
@@ -63,6 +65,12 @@ import java.util.stream.Collectors;
@Slf4j
public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinv> implements IStIvtIostorinvService {
/**
* 木箱信息服务
*/
@Autowired
private IBstIvtBoxinfoService iBstIvtBoxinfoService;
/**
* 仓库服务
*/
@@ -366,12 +374,21 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
.eq(StIvtIostorinvdis::getIostorinv_id, mst.getIostorinv_id())
).stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row), LinkedHashMap.class))
.collect(Collectors.toList());
// 查询木箱信息
BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, whereJson.get("box_no"))
);
jsonSend.put("dtl_row",JSONObject.parseObject(JSON.toJSONString(dtlDao)));
jsonSend.put("tableMater", disList);
jsonSend.put("point_code", jsonObject.getString("point_code"));
jsonSend.put("stor_id", mst.getStor_id());
//成品入库托盘类型
jsonSend.put("vehicle_code",jsonObject.getString("box_no"));
jsonSend.put("vehicle_code2",jsonObject.getString("vehicle_code"));
JSONObject param = new JSONObject();
param.put("containerType", boxDao.getVehicle_type());
jsonSend.put("request_param", param.toString());
String task_id1 = this.setPoint(jsonSend);
// 下发任务
@@ -476,11 +493,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
jsonTaskParam.put("task_type", "010703");
jsonTaskParam.put("start_device_code", pointDto.getPoint_code());
jsonTaskParam.put("next_device_code", jsonDis.getString("struct_code"));
jsonTaskParam.put("vehicle_code", jsonDis.getString("box_no"));
jsonTaskParam.put("vehicle_code", whereJson.get("vehicle_code"));
jsonTaskParam.put("vehicle_code2", whereJson.get("vehicle_code2"));
jsonTaskParam.put("inv_type", mstDao.getBill_type());
jsonTaskParam.put("inv_id", mstDao.getIostorinv_id());
jsonTaskParam.put("inv_code", mstDao.getBill_code());
jsonTaskParam.put("request_param", whereJson.get("request_param"));
String task_id = new TwoInTask().createTask(jsonTaskParam);
// 更新分配明细

10
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql
View File

@@ -18,6 +18,7 @@
输入.sect_id TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.vehicle_type TYPEAS s_string
输入.block_in TYPEAS f_string
输入.row_in TYPEAS f_string
输入.not_row_in TYPEAS f_string
@@ -58,7 +59,7 @@
AND IFNULL(attr.storagevehicle_code,'') = ''
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND attr.storagevehicle_type = 输入.vehicle_type
OPTION 输入.not_block <> ""
attr.block_num NOT IN 输入.not_block
ENDOPTION
@@ -82,7 +83,7 @@
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND IFNULL(attr.storagevehicle_code,'') <> ''
AND attr.storagevehicle_type = 输入.vehicle_type
OPTION 输入.block_in <> ""
attr.block_num in 输入.block_in
ENDOPTION
@@ -108,7 +109,7 @@
AND IFNULL(attr.storagevehicle_code,'') = ''
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND attr.storagevehicle_type = 输入.vehicle_type
OPTION 输入.block_num <> ""
attr.block_num = 输入.block_num
ENDOPTION
@@ -139,7 +140,7 @@
AND attr.sect_id = 输入.sect_id
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.storagevehicle_type = 输入.vehicle_type
order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC
ENDSELECT
@@ -160,6 +161,7 @@
AND attr.sect_id = 输入.sect_id
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.storagevehicle_type = 输入.vehicle_type
ENDSELECT
ENDQUERY

21
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql
View File

@@ -16,7 +16,8 @@
输入.flag TYPEAS s_string
输入.stor_id TYPEAS s_string
输入.sect_id TYPEAS s_string
输入.block_num TYPEAS s_string
输入.block_num TYPEAS s_string
输入.material_code TYPEAS s_string
输入.row_num TYPEAS s_string
输入.block_num_in TYPEAS f_string
输入.row_num_in TYPEAS f_string
@@ -91,6 +92,10 @@
box.num = 输入.num
ENDOPTION
OPTION 输入.material_code <> ""
box.material_code = 输入.material_code
ENDOPTION
OPTION 输入.num <> ""
box.material_code = 输入.material_code
ENDOPTION
@@ -129,6 +134,9 @@
attr.row_num in 输入.row_num_in
ENDOPTION
OPTION 输入.material_code <> ""
box.material_code = 输入.material_code
ENDOPTION
OPTION 输入.box_length <> ""
box.box_length = 输入.box_length
@@ -182,6 +190,10 @@
box.box_width = 输入.box_width
ENDOPTION
OPTION 输入.material_code <> ""
box.material_code = 输入.material_code
ENDOPTION
OPTION 输入.box_high <> ""
box.box_high = 输入.box_high
ENDOPTION
@@ -216,6 +228,9 @@
attr.block_num = 输入.block_num
ENDOPTION
OPTION 输入.material_code <> ""
box.material_code = 输入.material_code
ENDOPTION
OPTION 输入.row_num <> ""
attr.row_num = 输入.row_num
@@ -294,6 +309,10 @@
box.box_high = 输入.box_high
ENDOPTION
OPTION 输入.material_code <> ""
box.material_code = 输入.material_code
ENDOPTION
OPTION 输入.num <> ""
box.num = 输入.num
ENDOPTION

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