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

opt:6.15上线装箱区代码修改

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-15 14:18:28 +08:00
parent f4db63c3fe
commit 78fb4e7a5f
21 changed files with 65 additions and 56 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

@@ -88,7 +88,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
jsonTaskParam.put("task_type", "010715"); jsonTaskParam.put("task_type", "010715");
jsonTaskParam.put("start_device_code", point_code); jsonTaskParam.put("start_device_code", point_code);
jsonTaskParam.put("next_device_code", "RK1004"); jsonTaskParam.put("next_device_code", "RK1004");
jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("containerType", whereJson.getString("vehicle_type")); param.put("containerType", whereJson.getString("vehicle_type"));
@@ -132,7 +132,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
jsonTaskParam.put("start_device_code", point_code); jsonTaskParam.put("start_device_code", point_code);
jsonTaskParam.put("next_device_code", next_device_code); jsonTaskParam.put("next_device_code", next_device_code);
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("containerType", whereJson.getString("vehicle_type")); param.put("containerType", whereJson.getString("vehicle_type"));
param.put("heightLevel", "0"); param.put("heightLevel", "0");

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

@@ -166,7 +166,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
//下发空木箱出库任务 //下发空木箱出库任务
outBox1(); //outBox1();
//满轴->待检 //满轴->待检
//mzToDj(); //mzToDj();
@@ -384,9 +384,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
public void updateEntityList(JSONObject whereJson) { 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<PdmBiSubpackagerelation> isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList()); List<PdmBiSubpackagerelation> isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList());
if (isOutBox.size() > 0) { // if (isOutBox.size() > 0) {
throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷"); // throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷");
} // }
List<String> entityList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class).stream() List<String> entityList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class).stream()
.map(PdmBiSubpackagerelation::getWorkorder_id) .map(PdmBiSubpackagerelation::getWorkorder_id)
.map(String::valueOf) .map(String::valueOf)
@@ -411,7 +411,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
updateWrapper.set("status", "0"); updateWrapper.set("status", "0");
updateWrapper.in("workorder_id", entityList); updateWrapper.in("workorder_id", entityList);
pdmBiSubpackagerelationMapper.update(null, updateWrapper); pdmBiSubpackagerelationMapper.update(null, updateWrapper);
// outBox(entityList, packagerelationList, boxType); outBox(entityList, packagerelationList, boxType);
} catch (Exception e) { } catch (Exception e) {
throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
} }
@@ -437,27 +437,27 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
//获取装箱位任务数量 //获取装箱位任务数量
List<Map<String, Integer>> taskCount = bstIvtPackageinfoivtMapper.getPointTaskCount(); // List<Map<String, Integer>> taskCount = bstIvtPackageinfoivtMapper.getPointTaskCount();
if (CollectionUtils.isNotEmpty(taskCount)) { // if (CollectionUtils.isNotEmpty(taskCount)) {
for (Map<String, Integer> p : pointCodeList) { // for (Map<String, Integer> p : pointCodeList) {
for (Map.Entry<String, Integer> e : p.entrySet()) { // for (Map.Entry<String, Integer> e : p.entrySet()) {
String pointCode = e.getKey(); // String pointCode = e.getKey();
for (Map<String, Integer> taskMap : taskCount) { // for (Map<String, Integer> taskMap : taskCount) {
if (taskMap.containsKey(pointCode)) { // if (taskMap.containsKey(pointCode)) {
e.setValue(taskMap.get(pointCode)); // e.setValue(taskMap.get(pointCode));
break; // break;
} // }
} // }
} // }
} // }
//获取资源最少的装箱对接位 // //获取资源最少的装箱对接位
Optional<String> minPointKey = pointCodeList.stream() // Optional<String> minPointKey = pointCodeList.stream()
.min(Comparator.comparingInt(map -> map.entrySet().iterator().next().getValue())) // .min(Comparator.comparingInt(map -> map.entrySet().iterator().next().getValue()))
.map(map -> map.keySet().iterator().next()); // .map(map -> map.keySet().iterator().next());
deviceCode = minPointKey.orElse(""); // deviceCode = minPointKey.orElse("");
} else { // } else {
deviceCode = bstIvtPackageinfoivtList.get(0).getPoint_code(); deviceCode = bstIvtPackageinfoivtList.get(0).getPoint_code();
} // }
//确定装箱区终点 //确定装箱区终点
boxInfo.put("device_code", deviceCode); boxInfo.put("device_code", deviceCode);
boxInfo.put("material_code", boxType); boxInfo.put("material_code", boxType);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java
View File

@@ -37,7 +37,7 @@ public interface IbstIvtPackageinfoivtService extends IService<BstIvtPackageinfo
* @param ivtStatus 库存状态 * @param ivtStatus 库存状态
* @return List<BstIvtPackageinfoivt> * @return List<BstIvtPackageinfoivt>
*/ */
List<BstIvtPackageinfoivt> checkEndPointTask(String ivtType, String ivtStatus, String pointCode); List<BstIvtPackageinfoivt> checkEndPointTask(String ivtType, String ivtStatus, String pointCode,String taskType);

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -56,7 +56,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
@Override @Override
public List<BstIvtPackageinfoivt> checkEndPointTask(String ivtType, String ivtStatus, String pointCode) { public List<BstIvtPackageinfoivt> checkEndPointTask(String ivtType, String ivtStatus, String pointCode,String taskType) {
List<BstIvtPackageinfoivt> packageinfoivtList = bstIvtPackageinfoivtMapper List<BstIvtPackageinfoivt> packageinfoivtList = bstIvtPackageinfoivtMapper
.selectList(new LambdaUpdateWrapper<BstIvtPackageinfoivt>() .selectList(new LambdaUpdateWrapper<BstIvtPackageinfoivt>()
.eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")) .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
@@ -77,6 +77,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
List<SchBaseTask> taskList = taskService.list(new LambdaUpdateWrapper<SchBaseTask>() List<SchBaseTask> taskList = taskService.list(new LambdaUpdateWrapper<SchBaseTask>()
//终点未完成任务 //终点未完成任务
.lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
.eq(SchBaseTask::getTask_type,taskType)
.and( .and(
r -> r.in(SchBaseTask::getPoint_code2, pointIds) r -> r.in(SchBaseTask::getPoint_code2, pointIds)
)); ));

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

@@ -91,8 +91,8 @@ public class TwoLashTask extends AbstractAcsTask {
interaction_json.put("height",dao.get(0).getBox_high()); interaction_json.put("height",dao.get(0).getBox_high());
interaction_json.put("template","4"); interaction_json.put("template","4");
//第二次捆扎次数 //第二次捆扎次数
interaction_json.put("bindingTimes","1"); interaction_json.put("bindingTimes","3");
interaction_json.put("isBinding", IOSEnum.IS_SEND.code("否")); interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是"));
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))

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

@@ -194,7 +194,7 @@ public class DjqTask extends AbstractAcsTask {
public void sendDjqToZxq(SchBaseTask schBaseTask) { public void sendDjqToZxq(SchBaseTask schBaseTask) {
//装箱区有空位 //装箱区有空位
List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2"); List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2","");
if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream() Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream()
.collect(Collectors.groupingBy( .collect(Collectors.groupingBy(

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

@@ -217,7 +217,7 @@ public class KzjhcwTask extends AbstractAcsTask {
*/ */
public void toKzjHcw1(String pointCode) { public void toKzjHcw1(String pointCode) {
//存在空载具缓存位无空载具的点位 //存在空载具缓存位无空载具的点位
List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2"); List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
String pointCode1 = null; String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject(); JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) { if (StringUtils.isNotBlank(pointCode)) {
@@ -255,20 +255,20 @@ public class KzjhcwTask extends AbstractAcsTask {
public void toKzjHcw(String pointCode) { public void toKzjHcw(String pointCode) {
//存在空载具缓存位无空载具的点位 //存在空载具缓存位无空载具的点位
List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2"); List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
String pointCode1 = null; String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject(); JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) { if (StringUtils.isNotBlank(pointCode)) {
pointCode1 = pointCode; pointCode1 = pointCode;
} else { } else {
//查询装箱区有空载具 //查询装箱区有空载具
List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1"); List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1","");
//装箱区有空载具 //装箱区有空载具
if (CollectionUtils.isNotEmpty(zxqPointList)) { if (CollectionUtils.isNotEmpty(zxqPointList)) {
pointCode1 = zxqPointList.get(0).getPoint_code(); pointCode1 = zxqPointList.get(0).getPoint_code();
} else { } else {
//待检区有空载具 //待检区有空载具
List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1"); List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1","");
pointCode1 = djqPointList.get(0).getPoint_code(); pointCode1 = djqPointList.get(0).getPoint_code();
} }
} }

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

@@ -120,7 +120,7 @@ public class ZxDjwTask extends AbstractAcsTask {
//1.更改任务状态为完成 //1.更改任务状态为完成
schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
//2.改变起点点位状态 //2.改变起点点位状态
packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空载具")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
//更新库存记录 //更新库存记录
packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2())); packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));
//3.更改子卷信息状态为包装1，创建装箱区->装箱位桁架任务的时候判断是否最后一个子卷：相同木箱号如果生成状态0个数等于1且子卷号等于当前载具号，就是最后一个子卷 //3.更改子卷信息状态为包装1，创建装箱区->装箱位桁架任务的时候判断是否最后一个子卷：相同木箱号如果生成状态0个数等于1且子卷号等于当前载具号，就是最后一个子卷

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

@@ -34,8 +34,8 @@ public class AutoSendMzToDjq {
void sendMzqToDjq() { void sendMzqToDjq() {
JSONObject toDjqTask =new JSONObject(); JSONObject toDjqTask =new JSONObject();
//满轴有子卷且没有未完成任务 //满轴有子卷且没有未完成任务
List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1"); List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1","");
List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2"); List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)&&CollectionUtils.isNotEmpty(djqPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)&&CollectionUtils.isNotEmpty(djqPackageinfoivtList)) {
toDjqTask.put("vehicle_code", bstIvtPackageinfoivtList.get(0).getContainer_name()); toDjqTask.put("vehicle_code", bstIvtPackageinfoivtList.get(0).getContainer_name());
toDjqTask.put("point_code1", bstIvtPackageinfoivtList.get(0).getPoint_code()); toDjqTask.put("point_code1", bstIvtPackageinfoivtList.get(0).getPoint_code());

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java
View File

@@ -37,8 +37,8 @@ public class AutoSendToZxq {
void sendDjqToZxq() { void sendDjqToZxq() {
JSONObject toDjqTask =new JSONObject(); JSONObject toDjqTask =new JSONObject();
//待检区有子卷且没有未完成任务 //待检区有子卷且没有未完成任务
List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1"); List<BstIvtPackageinfoivt> djqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1","");
List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2"); List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)&&CollectionUtils.isNotEmpty(zxqPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(djqPackageinfoivtList)&&CollectionUtils.isNotEmpty(zxqPackageinfoivtList)) {
toDjqTask.put("vehicle_code", djqPackageinfoivtList.get(0).getContainer_name()); toDjqTask.put("vehicle_code", djqPackageinfoivtList.get(0).getContainer_name());
toDjqTask.put("point_code1", djqPackageinfoivtList.get(0).getPoint_code()); toDjqTask.put("point_code1", djqPackageinfoivtList.get(0).getPoint_code());
@@ -51,7 +51,7 @@ public class AutoSendToZxq {
void sendDjqToZxq1() { void sendDjqToZxq1() {
//装箱区有空位 //装箱区有空位
List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2"); List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2","");
if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(bstIvtPackageinfoivtList)) {
Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream() Map<String, List<String>> ivtList = bstIvtPackageinfoivtList.stream()
.collect(Collectors.groupingBy( .collect(Collectors.groupingBy(

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

@@ -36,12 +36,12 @@ public class AutoSendVehicleToDjq {
String pointCode1=null; String pointCode1=null;
String pointCode2; String pointCode2;
//待检区有空位 //待检区有空位
List<BstIvtPackageinfoivt> djqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2"); List<BstIvtPackageinfoivt> djqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2","");
if (CollectionUtils.isNotEmpty(djqList)) { if (CollectionUtils.isNotEmpty(djqList)) {
pointCode2=djqList.get(0).getPoint_code(); pointCode2=djqList.get(0).getPoint_code();
}else{ }else{
//管制区有空位 //管制区有空位
List<BstIvtPackageinfoivt> zxqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2"); List<BstIvtPackageinfoivt> zxqList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空"),"2","");
pointCode2=zxqList.get(0).getPoint_code(); pointCode2=zxqList.get(0).getPoint_code();
} }
//查询装箱区有空载具 //查询装箱区有空载具

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

@@ -58,8 +58,8 @@ public class AutoSendZxToDjw {
} }
void sendZxToDjw() { void sendZxToDjw() {
List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1"); List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "1","");
List<BstIvtPackageinfoivt> zxwPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "2"); List<BstIvtPackageinfoivt> zxwPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "2",PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位"));
if (CollectionUtils.isNotEmpty(zxqPackageinfoivtList) && CollectionUtils.isNotEmpty(zxwPackageinfoivtList)) { if (CollectionUtils.isNotEmpty(zxqPackageinfoivtList) && CollectionUtils.isNotEmpty(zxwPackageinfoivtList)) {
//3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务,否,什么都不做 //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务,否,什么都不做
PdmBiSubpackagerelation pdmBiSubpackagerelation = subpackageRelationService PdmBiSubpackagerelation pdmBiSubpackagerelation = subpackageRelationService

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
View File

@@ -96,12 +96,16 @@ public enum IOSEnum {
// 区域 // 区域
PRODUCT_AREA(MapOf.of("BLK", "BLK")), PRODUCT_AREA(MapOf.of("BLK", "BLK")),
// 入库 36 40 44
// 出库 38 42 46
// 出库堆垛机点位 // 出库堆垛机点位
OUT_POINT(MapOf.of("1","CK2036", "2","CK2038", "3","CK2040", "4","CK2042" ,"5","CK2044", OUT_POINT(MapOf.of("1","CK2038", "2","CK2038", "3","CK2042", "4","CK2042" ,"5","CK2046",
"6","CK2046", "7","7", "8","8", "9","9", "10","10")), "6","CK2046", "7","7", "8","8", "9","9", "10","10")),
// 行架点位 // 行架点位
OUT_HANGER(MapOf.of("行架位1", "CK2026","行架位2", "CK2027")), OUT_HANGER(MapOf.of("行架位1", "CK2013","行架位2", "CK2017")),
//acs申请任务 //acs申请任务
ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")), ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")),

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

@@ -1276,7 +1276,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
jsonTaskParam.put("point_code1", start_device_code); jsonTaskParam.put("point_code1", start_device_code);
jsonTaskParam.put("point_code2", end_device_code); jsonTaskParam.put("point_code2", end_device_code);
jsonTaskParam.put("vehicle_code", json.getString("storagevehicle_code")); jsonTaskParam.put("vehicle_code", json.getString("storagevehicle_code"));
jsonTaskParam.put("vehicle_type", json.getString("storagevehicle_type")); jsonTaskParam.put("containerType", json.getString("storagevehicle_type"));
if (ObjectUtil.isNotEmpty(jsonExt)) { if (ObjectUtil.isNotEmpty(jsonExt)) {
jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code")); jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code"));
} }

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

@@ -215,7 +215,9 @@ public class InBussManageServiceImpl implements InBussManageService {
} }
List<String> pcsnList = Arrays.asList(material_barcode.split(",")); List<String> pcsnList = Arrays.asList(material_barcode.split(","));
// 查询子卷包装关系 // 查询子卷包装关系
// List<JSONObject> subList = subTab.query("container_name ='A1262210272905A1' and status in ('0','1')") // List<JSONObject> subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')")
// .getResultJSONArray(0).toJavaList(JSONObject.class);
// List<JSONObject> subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')")
// .getResultJSONArray(0).toJavaList(JSONObject.class); // .getResultJSONArray(0).toJavaList(JSONObject.class);
List<JSONObject> subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1')") List<JSONObject> subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1')")
.getResultJSONArray(0).toJavaList(JSONObject.class); .getResultJSONArray(0).toJavaList(JSONObject.class);

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

@@ -88,7 +88,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
jsonTaskParam.put("start_device_code", whereJson.getString("device_code")); jsonTaskParam.put("start_device_code", whereJson.getString("device_code"));
jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code")); jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code"));
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("containerType", whereJson.getString("vehicle_type")); param.put("containerType", whereJson.getString("vehicle_type"));
//0表示为空托盘 //0表示为空托盘

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

@@ -216,7 +216,7 @@ public class LashManageServiceImpl implements LashManageService {
// 创建任务并下发 // 创建任务并下发
JSONObject jsonTaskParam = new JSONObject(); JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010720"); jsonTaskParam.put("task_type", "010720");
jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("point_code1", whereJson.getString("device_code")); jsonTaskParam.put("point_code1", whereJson.getString("device_code"));
jsonTaskParam.put("point_code2", next_device_code); jsonTaskParam.put("point_code2", next_device_code);
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
@@ -246,17 +246,17 @@ public class LashManageServiceImpl implements LashManageService {
result.put("width", boxDao.getBox_width()); result.put("width", boxDao.getBox_width());
result.put("height", boxDao.getBox_high()); result.put("height", boxDao.getBox_high());
result.put("case", boxDao.getMaterial_code()); result.put("case", boxDao.getMaterial_code());
//result.put("isBinding", IOSEnum.IS_SEND.code("否"));
result.put("isBinding", IOSEnum.IS_SEND.code("是")); result.put("isBinding", IOSEnum.IS_SEND.code("是"));
result.put("isLabeling", IOSEnum.IS_SEND.code("否")); result.put("isLabeling", IOSEnum.IS_SEND.code("否"));
result.put("labelingTemplate", boxDao.getLash_num()); result.put("labelingTemplate", boxDao.getLash_num());
//捆扎模板
result.put("bindingTemplate", boxDao.getLash_num()); result.put("bindingTemplate", boxDao.getLash_num());
result.put("printDevice", "1"); result.put("printDevice", "1");
result.put("printQty", "1"); result.put("printQty", "1");
//第一次捆扎次数 //第一次捆扎次数
result.put("bundleTimes", "1"); result.put("bundleTimes", "2");
return result; return result;
} }

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

@@ -93,7 +93,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
jsonTaskParam.put("start_device_code", jsonAttr.getString("struct_code")); jsonTaskParam.put("start_device_code", jsonAttr.getString("struct_code"));
jsonTaskParam.put("next_device_code", whereJson.getString("device_code")); jsonTaskParam.put("next_device_code", whereJson.getString("device_code"));
jsonTaskParam.put("vehicle_code", jsonAttr.getString("storagevehicle_code")); jsonTaskParam.put("vehicle_code", jsonAttr.getString("storagevehicle_code"));
jsonTaskParam.put("vehicle_type", whereJson.getString("vehicle_type")); jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("containerType", whereJson.getString("vehicle_type")); param.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("request_param", param.toString()); jsonTaskParam.put("request_param", param.toString());

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

@@ -1785,6 +1785,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jo.put("point_code4", whereJson.getString("device_code")); jo.put("point_code4", whereJson.getString("device_code"));
jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")); jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"));
} else { } else {
jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"));
//空载具缓存位缺少空载具，下发一个确定终点的空载具缓存位->输送线任务 //空载具缓存位缺少空载具，下发一个确定终点的空载具缓存位->输送线任务
// 创建前先判断是否有已创建相同任务 // 创建前先判断是否有已创建相同任务
List<SchBaseTask> existTaskList = taskService.list(new LambdaUpdateWrapper<SchBaseTask>() List<SchBaseTask> existTaskList = taskService.list(new LambdaUpdateWrapper<SchBaseTask>()

1
lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
View File

@@ -43,6 +43,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column show-overflow-tooltip prop="box_group" label="木箱组" align="center" /> <el-table-column show-overflow-tooltip prop="box_group" label="木箱组" align="center" />
<el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数" align="center" /> <el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数" align="center" />
<el-table-column show-overflow-tooltip prop="package_box_sn" label="木箱号" align="center" />
<el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" /> <el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" /> <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />

2
lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
View File

@@ -66,7 +66,7 @@ export default {
url: 'api/Materialbase', url: 'api/Materialbase',
idField: 'material_id', idField: 'material_id',
sort: 'material_id,desc', sort: 'material_id,desc',
query: { search: '木箱', material_id: '' }, query: { search: 'MX', material_id: '' },
crudMethod: { ...crudMaterattr } crudMethod: { ...crudMaterattr }
}) })
}, },