#

ytfl

6 天以前 1ea41a22eadfb3eef3d434bef7d2efff3bae331c

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

@@ -7,6 +7,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,12 @@
    @Autowired
    private OrderDetlService orderDetlService;

    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;

@@ -63,7 +70,7 @@
                continue;
            }
            orderDetl.setWorkQty(orderDetl.getQty());
            orderDetl.setAnfme(orderDetl.getAnfme() - orderDetl.getQty());
            orderDetl.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getQty()));
            orderDetl.setQty(0D);
            orderDetlService.updateById(orderDetl);
        }
@@ -89,16 +96,15 @@
        List<OrderDetl> orderDetlList = new ArrayList<>();

        for (OrderDetl detail : orderDetls) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(),
                    detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
                detlDto.setAnfme(MathUtils.add(detlDto.getAnfme(), detail.getAnfme()));

                OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
                assert orderDetl != null;
                orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
                orderDetl.setAnfme(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
            } else {
                list.add(dto);
                orderDetlList.add(detail);
@@ -121,9 +127,9 @@
        if (null == docType) {
            return SUCCESS;
        }
//        if (docType.getDocName().equals("销售发货")) {
//            return SUCCESS;
//        }
        if (docType.getDocName().equals("销售发货")) {
            return SUCCESS;
        }
        Order orderSou = orderService.selectByNo(order.getOrderNo());
        if (!orderSou.getSettle().equals(2L)) {
            return FAIL.setMsg("订单状态不正确，请联系管理员");
@@ -137,29 +143,15 @@
                if (orderDetl.getQty().equals(0D)) {
                    continue;
                }
                if (!Cools.isEmpty(orderDetlSou.getBatch())){
                    if (orderDetlSou.beSimilar(orderDetl)) {
                        double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
                        if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
                            orderDetlSou.setQty(orderDetlSou.getAnfme());
                            orderDetl.setQty(orderDetl.getQty() - v);
                            break;
                        } else {
                            orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
                            orderDetl.setQty(0D);
                        }
                    }
                }else {
                    if (orderDetlSou.beSimilar2(orderDetl)) {
                        double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
                        if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
                            orderDetlSou.setQty(orderDetlSou.getAnfme());
                            orderDetl.setQty(orderDetl.getQty() - v);
                            break;
                        } else {
                            orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
                            orderDetl.setQty(0D);
                        }
                if (orderDetlSou.beSimilar(orderDetl)) {
                    double v = MathUtils.subtract(orderDetlSou.getAnfme(), orderDetlSou.getQty());
                    if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
                        orderDetlSou.setQty(orderDetlSou.getAnfme());
                        orderDetl.setQty(orderDetl.getQty() - v);
                        break;
                    } else {
                        orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
                        orderDetl.setQty(0D);
                    }
                }
            }
@@ -199,6 +191,41 @@
            }
        }
        if (complete) {
            List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
                throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
            for (WrkDetl wrkDetl : wrkDetls) {
                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(wrkDetl);
                orderDetl.setQty(wrkDetl.getAnfme());
                orderDetl.setOrderId(orderSou.getId());
                orderDetl.setOrderNo(orderSou.getOrderNo());
                orderDetl.setStatus(1);
                orderDetl.setCreateTime(orderSou.getCreateTime());
                orderDetl.setCreateBy(orderSou.getCreateBy());
                orderDetl.setUpdateTime(orderSou.getUpdateTime());
                orderDetl.setUpdateBy(orderSou.getUpdateBy());
                orderDetl.setId(null);
                //先按照批次匹配，再按照无批次号批次，因为销售发货，批次号可能带，有可能不携带，所以就会有问题；而且考虑到一条订单里如果相同物料，一条带批次，一条不带批次，情况
                for (OrderDetl xxx : old) {
                    if (xxx.beSimilar(wrkDetl)) {
                        orderDetl.setRemark(xxx.getRemark());
                    }
                }
                if (Cools.isEmpty(orderDetl.getRemark())) {
                    for (OrderDetl xxx : old) {
                        if (xxx.beSimilarByWrkDetl(wrkDetl)) {
                            orderDetl.setRemark(xxx.getRemark());
                        }
                    }
                }
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
            }

            // 修改订单状态 2.作业中 ===>> 4.待上报
            if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");