#orderDetlService.selectItem+hostid

zjj

2024-05-30 6f7f9e6fe40ffb1fc2cf26db39c4546bbb844d08

#orderDetlService.selectItem+hostid

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java

@@ -17,7 +17,7 @@

    List<OrderDetl> selectWorkingDetls(Long orderId);

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);

    OrderDetl selectItem2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);


 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java

@@ -8,7 +8,7 @@

public interface OrderDetlService extends IService<OrderDetl> {

    OrderDetl selectItem(Long orderId, String matnr, String batch);
    OrderDetl selectItem(Long orderId, String matnr, String batch,Long hostId);

    OrderDetl selectItem(String orderNo, String matnr, String batch, Long hostId);


 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java

@@ -113,7 +113,7 @@
            param.getCombMats().forEach(elem -> {

                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),hostId);
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                }
@@ -272,7 +272,7 @@
                if (Cools.isEmpty(order)){
                    continue;
                }
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), waitPakin.getMatnr(), waitPakin.getBatch());
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), waitPakin.getMatnr(), waitPakin.getBatch(),hostId);
                if (Cools.isEmpty(orderDetl)){
                    continue;
                }

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java

@@ -14,8 +14,8 @@
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {

    @Override
    public OrderDetl selectItem(Long orderId, String matnr, String batch) {
        return this.baseMapper.selectItem(orderId, matnr, batch);
    public OrderDetl selectItem(Long orderId, String matnr, String batch, Long hostId) {
        return this.baseMapper.selectItem(orderId, matnr, batch,hostId);
    }

    @Override

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java

@@ -458,9 +458,9 @@
            Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
                    .eq(Order::getOrderNo, locDto.getOrderNo())
                    .eq(Order::getHostId, hostId));
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), locDto.getBatch());
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), locDto.getBatch(),hostId);
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), null);
                orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), null,hostId);
            }
            LocDetl locDetl = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), hostId);
            if (locDetl == null || locDetl.getAnfme() < locDto.getAnfme()) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java

@@ -320,7 +320,7 @@
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),getHostId());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java

@@ -121,7 +121,7 @@
            if (order.getSettle() > 2) {
                return R.error(orderDto.getOrderNo() + "订单已失效，请及时刷新页面");
            }
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null);
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null,getHostId());
            if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
                return R.ok(orderDto.getOrderNo() + "订单已作业，请及时刷新页面");
            }