diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java index 8ea7c4852..a22ba2469 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.pda.service.VehicleTwoService; +import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.modules.logging.annotation.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** * @author liuxy * @date 2022-05-25 @@ -26,6 +29,10 @@ public class VehicleTwoController { @Autowired private VehicleTwoService vehicleTwoService; + @Resource + private IbstIvtPackageinfoivtService bstIvtPackageInfoIvtService; + + @PostMapping("/vehicleIn") @Log("入空载具") @SaIgnore @@ -53,4 +60,13 @@ public class VehicleTwoController { public ResponseEntity reback(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(vehicleTwoService.reback(whereJson), HttpStatus.OK); } + + + @PostMapping("/updatePackageInfo") + @Log("一楼待检区-管制区子卷质检") + @SaIgnore + public ResponseEntity updatePackageInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(bstIvtPackageInfoIvtService.update(whereJson), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java index 315554a65..c269fc620 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java @@ -28,4 +28,6 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper queryContainerNameBySaleOrder( @Param("sale_order_name") String sale_order_name); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index b2dd6d33c..032d3abad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -72,5 +72,17 @@ ORDER BY MAX(create_time) DESC + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index bb2774e37..131c91337 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -153,25 +153,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl queryContainerNameBySaleOrder(Map whereJson) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (whereJson.containsKey("customer_description")) { - queryWrapper.like(PdmBiSubpackagerelation::getCustomer_description, whereJson.get("customer_description")); + if (!whereJson.containsKey("sale_order_name")) { + return null; } - if (whereJson.containsKey("sale_order_name")) { - queryWrapper.eq(PdmBiSubpackagerelation::getSale_order_name, whereJson.get("sale_order_name")); - } - if (whereJson.containsKey("customer_name")) { - queryWrapper.like(PdmBiSubpackagerelation::getCustomer_name, whereJson.get("customer_name")); - } - if (whereJson.containsKey("status")) { - if ("99".equals(whereJson.get("status"))) { - queryWrapper.eq(PdmBiSubpackagerelation::getStatus, whereJson.get("status")); - } else { - queryWrapper.ge(PdmBiSubpackagerelation::getStatus, whereJson.get("status")); - } - } - queryWrapper.orderByDesc(PdmBiSubpackagerelation::getBox_group); - List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.selectList(queryWrapper); + List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(whereJson.get("sale_order_name").toString()); Map countByGroup = pdmBiSubpackagerelationList.stream() .filter(item -> item.getBox_group() != null) .collect(Collectors.groupingBy(PdmBiSubpackagerelation::getBox_group, Collectors.counting())); @@ -404,9 +389,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class); List isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList()); - if (isOutBox.size() > 0) { - throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷"); - } + if (isOutBox.size() > 0) { + throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷"); + } JSONArray jsonArray = whereJson.getJSONArray("tableMater"); if (jsonArray == null || jsonArray.size() == 0) { throw new BadRequestException("无选中子卷信息"); @@ -459,7 +444,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl 装箱对接位,木箱码不能为空！"); } //更新子卷包装关系更新木箱号 - CompletableFuture.runAsync(() -> { + CompletableFuture.runAsync(() -> { try { updateBoxInfo(entityList, boxSn); } catch (Exception e) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java new file mode 100644 index 000000000..07e2471a9 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java @@ -0,0 +1,59 @@ +package org.nl.b_lms.sch.point.controller; +import java.util.Set; +import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; +import org.springframework.web.bind.annotation.*; +import lombok.RequiredArgsConstructor; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; + + +/** + * {@code @Description:} 装箱区点位库存表(BstIvtPackageinfoivt)控制层 + * {@code @Author:} gbx + * + * @since 2024-06-18 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/bstIvtPackageinfoivt") +@Slf4j +public class BstIvtPackageinfoivtController { + + + @Resource + private IbstIvtPackageinfoivtService bstIvtPackageinfoivtService; + + + /** + * 新增数据 + * + * @param params 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseEntity create(@RequestBody BstIvtPackageinfoivt params) { + bstIvtPackageinfoivtService.create(params); + return new ResponseEntity<>(HttpStatus.OK); + } + + + + + /** + * 删除数据 + * + * @param ids 多个主键Id + * @return 删除结果 + */ + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + bstIvtPackageinfoivtService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml index 5457c2ae2..1d2286b20 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml @@ -106,7 +106,7 @@ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num WHERE IFNULL( point2.vehicle_code, '' ) != '' - AND point2.out_order_seq > point1.out_order_seq + AND point1.out_order_seq > point2.out_order_seq AND point1.point_code= #{point_code} @@ -125,7 +125,7 @@ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num WHERE IFNULL( point2.vehicle_code, '' ) = '' - AND point2.out_order_seq > point1.out_order_seq + AND point1.out_order_seq > point2.out_order_seq AND point1.point_code= #{point_code} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java index 7dcabe2df..6e962a804 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IbstIvtPackageinfoivtService.java @@ -1,5 +1,6 @@ package org.nl.b_lms.sch.point.service; +import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import com.baomidou.mybatisplus.extension.service.IService; @@ -54,9 +55,9 @@ public interface IbstIvtPackageinfoivtService extends IService().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name"))); + if (dto == null) { + result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); + result.put("message", "不存在该数据！"); + return result; + } + dto.setIvt_status(whereJson.getString("ivt_status")); + bstIvtPackageinfoivtMapper.updateById(getBasicInfo(dto, false)); + result.put("status", org.springframework.http.HttpStatus.OK.value()); + result.put("message", "检验成功!"); + return result; } @@ -170,14 +185,14 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2",""); + List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", ""); String pointCode1 = null; JSONObject toKzjHcwTask = new JSONObject(); if (StringUtils.isNotBlank(pointCode)) { @@ -255,21 +255,23 @@ public class KzjhcwTask extends AbstractAcsTask { public void toKzjHcw(String pointCode) { //存在空载具缓存位无空载具的点位 - List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2",""); + List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", ""); String pointCode1 = null; JSONObject toKzjHcwTask = new JSONObject(); if (StringUtils.isNotBlank(pointCode)) { pointCode1 = pointCode; } else { //查询装箱区有空载具 - List zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1",""); + List zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", ""); //装箱区有空载具 if (CollectionUtils.isNotEmpty(zxqPointList)) { pointCode1 = zxqPointList.get(0).getPoint_code(); } else { //待检区有空载具 - List djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1",""); - pointCode1 = djqPointList.get(0).getPoint_code(); + List djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", ""); + if (CollectionUtils.isNotEmpty(djqPointList)) { + pointCode1 = djqPointList.get(0).getPoint_code(); + } } } //去装箱区搬运空载具 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index ff459e99d..8647258a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java @@ -135,7 +135,6 @@ public class MzhcwTask extends AbstractAcsTask { toSsxTask.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); toSsxTask.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")); toSsxTask.put("vehicle_code", schBaseTask.getVehicle_code()); - //toSsxTask.put("vehicle_code", containerInfo.getContainer_name()); //判断空载具缓存位是否有空载具库存,有就叫桁架去任一位置搬空载具 if (CollectionUtils.isNotEmpty(kzjPointList)) { //直接创建搬运空载具任务 @@ -327,7 +326,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")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java index 7e17dc23f..1212b86aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java @@ -146,7 +146,7 @@ public class SendKzjTask 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")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java index de5b828e7..65eb95275 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java @@ -165,7 +165,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")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index 67c80e0b4..e829f8d1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java @@ -196,7 +196,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")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index ed1bcfbd7..eac540018 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -270,7 +270,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")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 3cc003f8b..600a4ca50 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -1270,6 +1270,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl row.getString("task_id").equals(json.getString("task_code"))) .collect(Collectors.toList()).get(0); + // 完成 if (jsonTask.getString("task_status").equals(TaskStatusEnum.FINISHED.getCode())) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 57ba4aea5..67444f733 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -240,11 +240,7 @@ public class InBussManageServiceImpl implements InBussManageService { } List pcsnList = Arrays.asList(material_barcode.split(",")); // 查询子卷包装关系 -// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')") -// .getResultJSONArray(0).toJavaList(JSONObject.class); -// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')") -// .getResultJSONArray(0).toJavaList(JSONObject.class); - List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1')") + List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1','99')") .getResultJSONArray(0).toJavaList(JSONObject.class); if (ObjectUtil.isEmpty(subList)) { throw new BadRequestException("未查询到子卷包装信息!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index 09408f133..511e36ddc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -1,11 +1,13 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; import org.nl.b_lms.sch.point.service.IschBasePointService; @@ -20,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -58,7 +61,6 @@ public class SendOutManageServiceImpl implements SendOutManageService { * 1）有相同订单号有空位的：相同订单号的放在一排 * 2）没有相同订单号的：新开一排 * 3）有相同订单号的但是没有空位：新开一排 - * 2.删除载具对应木箱记录 */ CutConveyorTask cutConveyorTask = new CutConveyorTask(); @@ -70,8 +72,9 @@ public class SendOutManageServiceImpl implements SendOutManageService { .eq(SchBasePoint::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) ); - // 1.查询此木箱号的子卷包装关系 - JSONObject jsonSub = subTab.query("package_box_sn = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); + //木箱号可能用逗号隔开 + String vehicleCode = Arrays.asList(whereJson.getString("vehicle_code").split(",")).get(0); + JSONObject jsonSub = subTab.query("package_box_sn = '" + vehicleCode + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSub)) { throw new BadRequestException("未查询到该木箱对应的包装关系！"); } @@ -93,7 +96,7 @@ public class SendOutManageServiceImpl implements SendOutManageService { ObjectUtil.isEmpty(row.getVehicle_code()) && row.getLock_type().equals(IOSEnum.LOCK_TYPE.code("未锁定")) ) - .sorted(Comparator.comparing(SchBasePoint::getOut_order_seq)) + .sorted(Comparator.comparing(SchBasePoint::getIn_order_seq)) .collect(Collectors.toList()); joArr.addAll(rowPointList); @@ -116,19 +119,17 @@ public class SendOutManageServiceImpl implements SendOutManageService { ObjectUtil.isEmpty(row.getVehicle_code()) && row.getLock_type().equals(IOSEnum.LOCK_TYPE.code("未锁定")) ) - .sorted(Comparator.comparing(SchBasePoint::getOut_order_seq)) + .sorted(Comparator.comparing(SchBasePoint::getIn_order_seq)) .collect(Collectors.toList()); - if (rowPointList.size() == 4) { - JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0))); + JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0))); - if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { - continue; - } - - point_code = jsonNewRow.getString("point_code"); - break; + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; } + + point_code = jsonNewRow.getString("point_code"); + break; } } else { // 校验此货位是否被堵住：1.如果被堵住则判断下一个是否被堵住 2.如果全部被堵住则新开一排 @@ -172,19 +173,17 @@ public class SendOutManageServiceImpl implements SendOutManageService { ObjectUtil.isEmpty(row.getVehicle_code()) && row.getLock_type().equals(IOSEnum.LOCK_TYPE.code("未锁定")) ) - .sorted(Comparator.comparing(SchBasePoint::getOut_order_seq)) + .sorted(Comparator.comparing(SchBasePoint::getIn_order_seq)) .collect(Collectors.toList()); - if (rowPointList.size() == 4) { - JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0))); + JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0))); - if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { - continue; - } - - point_code = jsonNewRow.getString("point_code"); - break; + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; } + + point_code = jsonNewRow.getString("point_code"); + break; } } @@ -194,8 +193,8 @@ public class SendOutManageServiceImpl implements SendOutManageService { //创建任务 JSONObject task_jo = new JSONObject(); task_jo.put("point_code1", whereJson.getString("device_code")); - task_jo.put("point_code2", "CK2023"); - task_jo.put("vehicle_code", whereJson.getString("vehicle_code")); + task_jo.put("point_code2", point_code); + task_jo.put("vehicle_code", vehicleCode); task_jo.put("task_type", "010708"); TwoSendOutTask taskBean = new TwoSendOutTask(); taskBean.createTask(task_jo); @@ -203,9 +202,9 @@ public class SendOutManageServiceImpl implements SendOutManageService { // 锁住点位 ischBasePointService.update( new UpdateWrapper().lambda() - .eq(SchBasePoint::getPoint_code, "CK2023") + .eq(SchBasePoint::getPoint_code, point_code) .set(SchBasePoint::getLock_type, IOSEnum.LOCK_TYPE.code("其它")) - .set(SchBasePoint::getVehicle_code, whereJson.getString("vehicle_code")) + .set(SchBasePoint::getVehicle_code, vehicleCode) ); // 删除载具对应木箱记录 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ea8d1d595..1c130a4d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -67,10 +67,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -1795,7 +1792,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("二楼到一楼，成品子卷到达一楼输送线，sendProductToFirstFloor--------------------------：" + whereJson.toString()); JSONObject result = new JSONObject(); if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) { - throw new BadRequestException("接口sendProductToFirstFloor，任务号或子卷号参数为空！"); + throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为空！"); + } + if (whereJson.getString("device_code").equals("null") || whereJson.getString("material_barcode").equals("null")) { + throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为null！"); } RLock lock = redissonClient.getLock(whereJson.getString("material_barcode")); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); @@ -1819,7 +1819,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jo.put("point_code2", mzPointList.get(0).getPoint_code()); List kzjPointList = bstIvtPackageinfoivtList.stream() .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位").equals(r.getPoint_status()) - && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status())).collect(Collectors.toList()); + && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status())) + .sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed()).collect(Collectors.toList()); //空载具缓存位有空载具 if (CollectionUtils.isNotEmpty(kzjPointList)) { jo.put("point_code3", kzjPointList.get(0).getPoint_code()); @@ -1836,6 +1837,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))); if (CollectionUtils.isEmpty(existTaskList)) { JSONObject jo1 = new JSONObject(); + //创建确定终点任务 jo1.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务")); jo1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)")); jo1.put("point_code2", "NBJ1002"); @@ -1947,7 +1949,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 6-退货入库 whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库")); whereJson.put("box_no", whereJson.getString("material_barcode")); - JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0); + JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1','99')").getResultJSONArray(0); if (ObjectUtil.isEmpty(resultJSONArray)) { throw new BadRequestException("未查询到子卷包装信息!"); } @@ -1968,8 +1970,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("applyTwo返回参数：---------------------------------------------" + result.toString()); return result; } - } - finally { + } finally { if (tryLock) { lock.unlock(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 79a096006..7b7bd1623 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -117,7 +117,9 @@ public class AcsUtil { throw new BadRequestException("未查询到区域对应的acs地址！"); } - String url = acs_url + api; + //String url = acs_url + api; + //String url ="10.1.3.96:8011/"+ api; + String url ="10.21.1.196:8011/"+ api; try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(list)) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index f157990bb..7b7b7f3a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -108,12 +108,13 @@ public abstract class AbstractAcsTask { * */ public JSONObject immediateNotifyAcs(String task_id) { - List taskList = this.schedule(); - if (ObjectUtil.isNotEmpty(taskList)) { - JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - return AcsUtil.notifyAcs("api/wms/task", arr); - } + List taskList = this.schedule(); + if (ObjectUtil.isNotEmpty(taskList)) { + JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); + return AcsUtil.notifyAcs("api/wms/task", arr); + } return null; + } /** diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue index 8c03808d8..06c1e9791 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue @@ -46,7 +46,6 @@ -
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue index 7313a8da2..a39f5ea29 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue @@ -66,7 +66,7 @@ export default { url: 'api/Materialbase', idField: 'material_id', sort: 'material_id,desc', - query: { box: '木箱', material_id: '' }, + query: { box: '木箱', search: 'MX', material_id: '' }, crudMethod: { ...crudMaterattr } }) },