#

zjj

2024-12-16 45d41c932cce59215648306a4fc98fa3f1673eda

#

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -17,6 +17,8 @@
    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    List<Order> selectComplete();
    List<Order> selectComplete1();
    List<Order> selectComplete2();

    int addToLogTable(Order order);


 src/main/java/com/zy/asrs/service/OrderService.java

@@ -20,7 +20,12 @@

    void remove(Long orderId);

    //完成
    List<Order> selectComplete();
    //保存
    List<Order> selectComplete1();
    //提交
    List<Order> selectComplete2();

    boolean addToLogTable(Order order);


 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -152,6 +152,16 @@
    }

    @Override
    public List<Order> selectComplete1() {
        return this.baseMapper.selectComplete1();
    }

    @Override
    public List<Order> selectComplete2() {
        return this.baseMapper.selectComplete2();
    }

    @Override
    public boolean addToLogTable(Order order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }
@@ -206,7 +216,7 @@

    @Override
    public List<Order> selectToBeHistoryOrder(boolean isERP) {
        int settle = isERP ? 6 : 4;
        int settle = isERP ? 7 : 4;
        return this.baseMapper.selectToBeHistoryOrder(settle);
    }


 src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java

@@ -29,13 +29,13 @@
    @Value("${erp.switch.ReviewOrderSwitch}")
    private boolean ReviewOrderSwitch;

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){
            return;
        }
        List<Order> orders = orderService.selectComplete();
        List<Order> orders = orderService.selectComplete2();
        for (Order order : orders) {
            try{
                ReturnT<String> result = reviewOrderSyncHandler.start(order);

 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java

@@ -39,7 +39,7 @@
            try{
                ReturnT<String> result = saveOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]提交至erp失败", order.getOrderNo());
                    log.error("单据[orderNo={}]保存至erp失败", order.getOrderNo());
                }
            }catch (Exception e){
                Order order1 = orderService.selectById(order.getId());

 src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java

@@ -30,18 +30,18 @@
    @Value("${erp.switch.SubmitOrderSwitch}")
    private boolean SubmitOrderSwitch;

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!SubmitOrderSwitch){
            return;
        }
        List<Order> orders = orderService.selectComplete();
        List<Order> orders = orderService.selectComplete1();
        for (Order order : orders) {
            try{
                ReturnT<String> result = submitOrderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]保存至erp失败", order.getOrderNo());
                    log.error("单据[orderNo={}]提交至erp失败", order.getOrderNo());
                }
            }catch (Exception e){
                Order order1 = orderService.selectById(order.getId());

 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java

@@ -83,16 +83,16 @@
            JSONObject data = JSON.parseObject(response);
            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
            String bool1=IsSuccess.toString();
            //审核完成原订单4转6  6.上报完成

            if(bool1.equals("true")){
                ObjectMapper objectMapper =  new ObjectMapper();
                JsonNode rootNode = objectMapper.readTree(response);
                boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
                log.info("审核bool:"+bool);
                //审核完成原订单4转6  6.上报完成
                //审核完成原订单6转7  7.审核完成
                if(bool){
                    success = true;
                    order.setSettle(6L);
                    order.setSettle(10L);
                    order.setUpdateTime(new Date());
                    orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
                }

 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java

@@ -153,7 +153,7 @@
            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
            String bool1=IsSuccess.toString();
            boolean bool = false;
            //保存完成原订单8转6
            //保存完成原订单4转5 6.保存完成
            if(bool1.equals("true")){
                ObjectMapper objectMapper =  new ObjectMapper();
                JsonNode rootNode = objectMapper.readTree(response);

 src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java

@@ -90,10 +90,10 @@
                JsonNode rootNode = objectMapper.readTree(response);
                boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
                log.info("审核bool:"+bool);
                //提交完成原订单4转6  6.上报完成
                //提交完成原订单5转6  6.提交完成
                if(bool){
                    success = true;
                    order.setSettle(6L);
                    order.setSettle(5L);
                    order.setUpdateTime(new Date());
                    orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
                }

 src/main/resources/application.yml

@@ -65,11 +65,11 @@
    InboundOrderSwitch: false
    #登录接口开关
    LoginAuthenticationSwitch: true
    #审核单据开关 米多无用
    ReviewOrderSwitch: false
    #保存单据开关
    #3审核单据开关 米多无用
    ReviewOrderSwitch: true
    #2提交单据开关
    SaveOrderSwitch: true
    #提交单据开关 米多无用
    #1保存
    SubmitOrderSwitch: false
    #下推单据开关
    PushDowmOrderSwitch: true

 src/main/resources/mapper/OrderMapper.xml

@@ -67,6 +67,25 @@
        and status = 1
        order by update_time asc
    </select>

    <select id="selectComplete1" resultMap="BaseResultMap">
        select top 5 *
        from man_order
        where 1=1
        and settle = 5
        and status = 1
        order by update_time asc
    </select>

    <select id="selectComplete2" resultMap="BaseResultMap">
        select top 5 *
        from man_order
        where 1=1
        and settle = 6
        and status = 1
        order by update_time asc
    </select>

    <select id="selectInOrOutOrders" resultMap="BaseResultMap">
        SELECT * FROM man_order o left join man_doc_type d on o.doc_type = d.doc_id WHERE d.pakin = #{flag} and o.settle in (1,2)
    </select>