From 45d41c932cce59215648306a4fc98fa3f1673eda Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 16 十二月 2024 08:15:50 +0800 Subject: [PATCH] # --- src/main/resources/mapper/OrderMapper.xml | 19 +++++++++ src/main/java/com/zy/asrs/service/OrderService.java | 5 ++ src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 2 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 2 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 12 +++++ src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 4 +- src/main/java/com/zy/asrs/mapper/OrderMapper.java | 2 + src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 6 +- src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java | 4 +- src/main/resources/application.yml | 8 ++-- src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 6 +- 11 files changed, 53 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java index e7692c6..b2c495e 100644 --- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java +++ b/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); diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index ae33263..ac7e83c 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/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); diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java index 5012aa0..86dd859 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java +++ b/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); } diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java index 9e16279..38c10e3 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java +++ b/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); diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java index 2ffb8de..6e57bd2 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java +++ b/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={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo()); + log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo()); } }catch (Exception e){ Order order1 = orderService.selectById(order.getId()); diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java index 1c4e3c6..64fff3e 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java +++ b/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={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo()); + log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo()); } }catch (Exception e){ Order order1 = orderService.selectById(order.getId()); diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java index 6e1b12a..5a4692d 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java +++ b/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())); } diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java index 3363251..66a804a 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java +++ b/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); diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java index 3e0f4a4..46883a2 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java +++ b/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())); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5ef1ed2..5eaa14e 100644 --- a/src/main/resources/application.yml +++ b/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 diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index 6a13a72..7658a08 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/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> -- Gitblit v1.9.1