上报逻辑调整

ZY

2024-12-18 ebb22c0ee5c8c00b89515a50daf0e49103fa4f14

上报逻辑调整

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

@@ -329,6 +329,10 @@
            orderSyncParam.setDdate(param.getOrderTime());
        }

        if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) {
            return;
        }

        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);

 src/main/java/com/zy/asrs/entity/Order.java

@@ -270,7 +270,7 @@
     */
    @ApiModelProperty(value = "入库日期")
    @TableField("in_time")
    private String InTime;
    private String inTime;


    @TableField("Upstreamcode")

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

@@ -713,30 +713,24 @@
        if (Cools.isEmpty(agvWrkDetls)) {
            return;
        }
        List<AgvWrkDetl> data = new ArrayList<>();
        //区分不同任务类型的上报方式

        if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
            String barcode = agvWrkMast.getBarcode();
            if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) {
                reportMesPakinOrder(agvWrkMast, agvWrkDetls);
        for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
            if (agvWrkDetl.getMatnr().startsWith("10") || agvWrkDetl.getMatnr().startsWith("20") || agvWrkDetl.getMatnr().startsWith("30")) {
                data.add(agvWrkDetl);
            }
        }
        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
            String barcode = agvWrkMast.getBarcode();
            if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) {
                reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
        if (!Cools.isEmpty(data)) {
            if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
                reportMesPakinOrder(agvWrkMast, data);
            }
            if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
                reportMesPakoutOrder(agvWrkMast, data);
            }
            if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
                generateMesParam(agvWrkMast, data);
            }
        }
        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
            String barcode = agvWrkMast.getBarcode();
            if (agvWrkMast == null || agvWrkMast.getBarcode() == null) {
                return;
            }
            if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) {
                generateMesParam(agvWrkMast, agvWrkDetls);
            }
        }


    }