#

luxiaotao1123

2022-12-13 bd79749641c8ea4d6d2f6dccaf831c8b732cf6b3

#

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

@@ -115,7 +115,7 @@
        for (LocDto locDto : locDtos) {
            if (!isJSON(locDto.getOrderNo())) {
                if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
                OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
                OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
                if (OrderDto.has(orderDtos, orderDto)) {
                    OrderDto dto = OrderDto.find(orderDtos, orderDto);
                    assert dto != null;
@@ -127,7 +127,7 @@
                // 订单合并出库
                List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
                for (OrderDto one : orderDtoList) {
                    OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme());
                    OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), one.getAnfme());
                    if (OrderDto.has(orderDtos, orderDto)) {
                        OrderDto dto = OrderDto.find(orderDtos, orderDto);
                        assert dto != null;
@@ -143,7 +143,7 @@
            if (order.getSettle() > 2) {
                return R.error(orderDto.getOrderNo() + "订单已失效，请及时刷新页面");
            }
            OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
            OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), orderDto.getBatch());
            if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
                return R.ok(orderDto.getOrderNo() + "订单已作业，请及时刷新页面");
            }

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -121,7 +121,7 @@
                    // 修改 erp Goods 表
                    List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    for (WrkDetl wrkDetl : wrkDetls0) {
                        Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
                        Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                        if (!Cools.isEmpty(goods)) {
                            if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                                log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
@@ -142,7 +142,7 @@
                // 修改 erp Goods 表
                List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                for (WrkDetl wrkDetl : wrkDetls0) {
                    Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
                    Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                    if (!Cools.isEmpty(goods)) {
                        if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                            log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());

 src/main/java/com/zy/common/model/OrderDto.java

@@ -15,11 +15,14 @@

    private String matnr;

    private String batch;

    private Double anfme;

    public OrderDto(String orderNo, String matnr, Double anfme) {
    public OrderDto(String orderNo, String matnr, String batch, Double anfme) {
        this.orderNo = orderNo;
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
    }

@@ -28,7 +31,7 @@
            return false;
        }
        for (OrderDto orderDto : list) {
            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(orderDto.getBatch(), dto.getBatch())) {
                return true;
            }
        }
@@ -40,7 +43,7 @@
            return null;
        }
        for (OrderDto orderDto : list) {
            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(dto.getBatch(), orderDto.getBatch())) {
                return orderDto;
            }
        }