From 1d8a66556222beb4f2447c55437af4c4fdbaf5e7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 10:04:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/PlcLogScheduler.java | 2
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 5 +
src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java | 48 ++++++++++++++++
src/main/webapp/static/js/orderPakout/order.js | 2
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 2
src/main/java/com/zy/asrs/task/OverYearLogScheduler.java | 2
src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java | 1
src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java | 67 ++++++++++++++++++++++
src/main/resources/mapper/OrderPakoutMapper.xml | 9 +++
src/main/webapp/views/orderPakout/order.html | 4
src/main/java/com/zy/asrs/service/OrderPakoutService.java | 1
11 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
index a978485..bdb3d12 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
@@ -15,6 +15,7 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
List<OrderPakout> selectComplete();
+ List<OrderPakout> selectSettle(@Param("settle")Long settle);
void removeGroupGoodsNoUpdate(@Param("itemName")String itemName,@Param("orderNo")String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
index 3d59607..ac85f21 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -19,6 +19,7 @@
void remove(Long orderId);
List<OrderPakout> selectComplete();
+ List<OrderPakout> selectSettle(Long settle);
boolean addToLogTable(OrderPakout order);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index c13c6aa..d23c167 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -66,6 +66,11 @@
}
@Override
+ public List<OrderPakout> selectSettle(Long settle) {
+ return this.baseMapper.selectSettle(settle);
+ }
+
+ @Override
public boolean addToLogTable(OrderPakout order) {
return this.baseMapper.addToLogTable(order) > 0;
}
diff --git a/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
new file mode 100644
index 0000000..f6447b9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
@@ -0,0 +1,67 @@
+package com.zy.asrs.task;
+
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.service.OrderPakoutService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.GroupOrderFormHandler;
+import com.zy.common.entity.Parameter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2025.11.10
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈瀹屾垚淇℃伅澶勭悊
+ */
+@Slf4j
+@Component
+public class GroupOrderFormScheduler {
+
+ @Autowired
+ private GroupOrderFormHandler groupOrderFormHandler;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void abandonedGroupOrderForm(){
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakout> orders = orderPakoutService.selectSettle(99L);
+ for (OrderPakout order : orders) {
+ try{
+ ReturnT<String> result = groupOrderFormHandler.abandoned(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void outGroupOrderForm(){
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakout> orders = orderPakoutService.selectSettle(11L);
+ for (OrderPakout order : orders) {
+ try{
+ ReturnT<String> result = groupOrderFormHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]鍑哄簱澶辫触", order.getOrderNo());
+ log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index 2f1081a..b0d0a09 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -14,7 +14,7 @@
/**
* 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
*/
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0 0 * * * ?")
public void execute(){
orderMoveHistoryHandler.start();
}
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index 2865cc3..912da10 100644
--- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private OverYearLogHandler overYearLogHandler;
- @Scheduled(cron = "0 0 1 * * ? ")
+ @Scheduled(cron = "0 0 2 * * ? ")
private void execute(){
ReturnT<String> returnT = overYearLogHandler.start();
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
index 9e09014..c3efa74 100644
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private PlcLogHandler plcLogHandler;
- @Scheduled(cron = "0 0 1 * * ? ")
+ @Scheduled(cron = "0 0 * * * ?")
private void execute(){
ReturnT<String> returnT = plcLogHandler.start();
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
new file mode 100644
index 0000000..a3b94c5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.service.OrderDetlPakoutService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderPakoutService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2025.11.10
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈瀹屾垚淇℃伅澶勭悊
+ */
+@Slf4j
+@Service
+public class GroupOrderFormHandler extends AbstractHandler<String> {
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Transactional
+ public ReturnT<String> abandoned(OrderPakout orderPakout) {
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
+
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> start(OrderPakout orderPakout) {
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
+
+ return SUCCESS;
+ }
+
+}
diff --git a/src/main/resources/mapper/OrderPakoutMapper.xml b/src/main/resources/mapper/OrderPakoutMapper.xml
index caf4a69..49973be 100644
--- a/src/main/resources/mapper/OrderPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderPakoutMapper.xml
@@ -62,6 +62,15 @@
order by create_time asc
</select>
+ <select id="selectSettle" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order_pakout
+ where 1=1
+ and settle = #{settle}
+ and status = 1
+ order by create_time asc
+ </select>
+
<insert id="addToLogTable">
INSERT INTO man_order_pakout_log SELECT * FROM man_order_pakout WHERE id = #{id}
</insert>
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index dbd573e..ae4c9db 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -561,7 +561,7 @@
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, orderNo, settle) {
- layer.confirm('纭畾瑕佺敓鎴愬疄闄呯粍璐у崟锛屽悓涓�涓粍璐у崟鍙凤紝鍙兘瀛樺湪涓�涓疄闄呯粍璐у崟锛岃皑鎱庢搷浣滐紒锛侊紒', {
+ layer.confirm('绗﹀悎鍑哄簱鏉′欢璐х墿灏嗙洿鎺ュ嚭搴擄紒锛侊紒璋ㄦ厧鎿嶄綔锛侊紒锛�', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 1f8e13f..babd8e0 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -113,10 +113,10 @@
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>-->
{{# } }}
{{# if (d.settle == 10) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">鐢熸垚瀹為檯缁勮揣鍗�</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">鍑哄簱</a>
{{# } }}
{{# if (d.settle == 98) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">閲嶆柊鐢熸垚瀹為檯缁勮揣鍗�</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">閲嶆柊鍑哄簱</a>
{{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
--
Gitblit v1.9.1