rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-953 PDA删除【钢构件上架】菜单，钢构件收货直接过账到SAP

This commit is contained in:
曹鹏飞 2025-12-02 17:04:03 +08:00
parent 8a0074247d
commit 3d474f3e7d
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -731,11 +731,15 @@ public class StructuralPackageOrderController extends BaseController {
*/ */
@GetMapping("getInfoByDeliverOrderNo") @GetMapping("getInfoByDeliverOrderNo")
public ApiResult<DeliverStructuralPackageOrderForPackageVO> getInfoByDeliverOrderNo(@Valid @RequestParam @NotBlank String orderNo) { public ApiResult<DeliverStructuralPackageOrderForPackageVO> getInfoByDeliverOrderNo(@Valid @RequestParam @NotBlank String orderNo) {
WmsStructuralPackageDeliverOrder order = structuralPackageDeliverOrderService.lambdaQuery().eq(WmsStructuralPackageDeliverOrder::getNo, orderNo).one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
VUtil.trueThrowBusinessError(Objects.equals(order.getState(), (short) 2)).throwMessage("该订单已收货");
List<DeliverStructuralPackageOrderForPackageItemVO> datas = deliverStructuralPackageOrderService.getInfoByDeliverOrderNo(orderNo); List<DeliverStructuralPackageOrderForPackageItemVO> datas = deliverStructuralPackageOrderService.getInfoByDeliverOrderNo(orderNo);
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("未找到数据"); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("未找到数据");
datas.forEach(it -> { datas.forEach(it -> {
it.setTrayNos(deliverStructuralPackageOrderTrayService.lambdaQuery() it.setTrayNos(deliverStructuralPackageOrderTrayService.lambdaQuery()
.select(WmsStructuralPackageOrderTray::getNo) .select(WmsStructuralPackageOrderTray::getNo)
.eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
.eq(WmsStructuralPackageOrderTray::getOrderId, it.getId()) .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId())
.list() .list()
.stream() .stream()

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java
View File

@ -27,7 +27,7 @@ public interface WmsStructuralPackageDeliverOrderMapper extends BaseMapper<WmsSt
String getNoByOrderId(Long id); String getNoByOrderId(Long id);
boolean allReceived(Long deliverId); boolean hasNotReceived(Long deliverId);
List<DeliverStructuralPackageOrderVO> getInfo(Long id); List<DeliverStructuralPackageOrderVO> getInfo(Long id);

11
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java
View File

@ -24,9 +24,8 @@ import java.util.Optional;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
* </p> * </p>
*
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
@ -39,10 +38,10 @@ public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl<Wms
@Override @Override
public IPage<StructuralPackageDeliverOrderVO> search(StructuralPackageDeliverOrderSearchQO request) { public IPage<StructuralPackageDeliverOrderVO> search(StructuralPackageDeliverOrderSearchQO request) {
List<Long> externalOrderIds = null; List<Long> externalOrderIds = null;
if (StrUtil.isNotBlank(request.getExternalOrderNo())){ if (StrUtil.isNotBlank(request.getExternalOrderNo())) {
externalOrderIds = Optional.ofNullable(baseMapper.getIdsByExternalOrderNo(request.getExternalOrderNo())).orElse(Collections.emptyList()); externalOrderIds = Optional.ofNullable(baseMapper.getIdsByExternalOrderNo(request.getExternalOrderNo())).orElse(Collections.emptyList());
} }
return baseMapper.search(request,externalOrderIds,new Page<>(request.getPage(),request.getPageSize())); return baseMapper.search(request, externalOrderIds, new Page<>(request.getPage(), request.getPageSize()));
} }
@Override @Override
@ -52,9 +51,9 @@ public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl<Wms
@Override @Override
public void updateStateByOrderId(Long orderId) { public void updateStateByOrderId(Long orderId) {
WmsStructuralPackageDeliverOrderMap map=wmsStructuralPackageDeliverOrderMapService.lambdaQuery().eq(WmsStructuralPackageDeliverOrderMap::getOrderId, orderId).one(); WmsStructuralPackageDeliverOrderMap map = wmsStructuralPackageDeliverOrderMapService.lambdaQuery().eq(WmsStructuralPackageDeliverOrderMap::getOrderId, orderId).one();
lambdaUpdate() lambdaUpdate()
.set(WmsStructuralPackageDeliverOrder::getState, baseMapper.allReceived(map.getDeliverId())?2:1) .set(WmsStructuralPackageDeliverOrder::getState, baseMapper.hasNotReceived(map.getDeliverId()) ? 1 : 2)
.set(WmsStructuralPackageDeliverOrder::getUpdateTime, LocalDateTime.now()) .set(WmsStructuralPackageDeliverOrder::getUpdateTime, LocalDateTime.now())
.set(WmsStructuralPackageDeliverOrder::getUpdateBy, UserUtil.getUserName()) .set(WmsStructuralPackageDeliverOrder::getUpdateBy, UserUtil.getUserName())
.eq(WmsStructuralPackageDeliverOrder::getId, map.getDeliverId()) .eq(WmsStructuralPackageDeliverOrder::getId, map.getDeliverId())

4
nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
View File

@ -57,11 +57,11 @@
where pdom.order_id=#{id} where pdom.order_id=#{id}
</select> </select>
<select id="allReceived" resultType="boolean"> <select id="hasNotReceived" resultType="boolean">
SELECT EXISTS SELECT EXISTS
( (
SELECT SELECT
om.* 1
FROM FROM
wms_structural_package_deliver_order_map om wms_structural_package_deliver_order_map om
INNER JOIN wms_structural_package_order_tray ot ON om.order_id = ot.order_id INNER JOIN wms_structural_package_order_tray ot ON om.order_id = ot.order_id