Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2025-01-18 548d32793451d756dad9412d285dd22e2fe64afd

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

@@ -51,11 +51,6 @@
    @Autowired
    private AgvLocMastService agvLocMastService;


    @Autowired
    private AgvWrkMastService agvWrkMastService;


    @Value("${spring.profiles.active}")
    private String active;

@@ -67,6 +62,7 @@

    @Value("${u8.orderReportPath}")
    private String orderReportPath;


    @Transactional
    public ReturnT<String> start(Order order) {
@@ -128,7 +124,6 @@
                    }
                }
            }

            if (Cools.isEmpty(order.getPltType())) {
                return;
            }
@@ -186,7 +181,7 @@
            childInfo.setIrowno(orderDetl.getItemNum());
            childInfo.setCInvCode(orderDetl.getMatnr());
            childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
            String batch = orderDetl.getBrand();
            String batch = orderDetl.getBatch();
            if (Cools.isEmpty(batch)) {
                childInfo.setCBatch("");
                childInfo.setBFree1("");