修改定时任务触发方式，不是以固定时间执行，以执行完成任务，间隔多少时间在此执行

zhangchao

2024-11-22 611a816801c58abcc81d511a7dfc368f8d8fb24e

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

@@ -116,6 +116,9 @@
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.get操作单据();
        if (Cools.isEmpty(docName)) {
            docName = param.getOrderType();
        }
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
@@ -123,7 +126,7 @@
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外生产材料出库单");
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "OM":
@@ -156,8 +159,16 @@
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;

            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", docName);
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -211,15 +222,15 @@
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外生产材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座生产订单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "采购入库单退货":
@@ -247,7 +258,8 @@
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            default:
                log.info("未知的单据类型:{}", docName);
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -307,13 +319,15 @@

        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param,orderDetl);
        Synchro.Copy(param, orderDetl);
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());

        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -350,10 +364,11 @@
            //orderDetl.setiQuantity(childInfo.getIQuantity());
            orderDetl.setCsocode(param.getCsocode());
            //orderDetl.setbFree1(childInfo.getBFree1());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());


            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);
@@ -368,6 +383,7 @@

        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
        Synchro.Copy(param, orderSyncParam);
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setCPOID(child.get(0).getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());

@@ -380,8 +396,10 @@
            orderDetl.setCDefine22(param.getIvouchrowno());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());

            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);