From 1ade3411b380253e8789fa85aeeb70c4d64530dd Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 20 八月 2024 09:08:20 +0800
Subject: [PATCH] order manage

---
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
index 0be004a..0dc7f57 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateUtil;
 import com.dy.common.schedulerTask.TaskJob;
 import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.common.util.SysUtil;
 import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
 import com.dy.pmsGlobal.daoPr.PrDeviceMapper;
 import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
@@ -11,6 +12,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.JobExecutionContext;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -20,22 +22,34 @@
 public class AssemblyPlanTask extends TaskJob {
 
     @Override
+    @Transactional
     public void execute(JobExecutionContext ctx) {
         log.info("寮�濮嬫墽琛� 缁勮璁″垝浠诲姟瀹氭椂妫�鏌�");
-        PrAssemblyPlanMapper assemblyDao = SpringContextUtil.getBean(PrAssemblyPlanMapper.class);
-        PrDeviceMapper deviceDao = SpringContextUtil.getBean(PrDeviceMapper.class);
-        Map<String,Object> planParams = new HashMap<>();
-        planParams.put("status",PlanStatusEnum.NORMAL.getCode());
-        List<PrAssemblyPlan> list = assemblyDao.selectSome(planParams);
-        for (PrAssemblyPlan plan : list) {
-            HashMap<String, Object> deviceParams = new HashMap<>();
-            deviceParams.put("batchId", plan.getBatchId());
-            deviceParams.put("status", DeviceStatus.COMPLETED.getCode());
-            Long count = deviceDao.selectSomeCount(deviceParams);
-            if(count>plan.number && DateUtil.between(DateUtil.parse(plan.endDate), DateUtil.date(), DateUnit.DAY)>3){
-                plan.setStatus(PlanStatusEnum.END.getCode());
-                assemblyDao.updateByPrimaryKeySelective(plan);
+        try{
+            PrAssemblyPlanMapper assemblyDao = SpringContextUtil.getBean(PrAssemblyPlanMapper.class);
+            PrDeviceMapper deviceDao = SpringContextUtil.getBean(PrDeviceMapper.class);
+            Map<String,Object> planParams = new HashMap<>();
+            planParams.put("status",PlanStatusEnum.NORMAL.getCode());
+            List<PrAssemblyPlan> list = assemblyDao.selectSome(planParams);
+            for (PrAssemblyPlan plan : list) {
+                HashMap<String, Object> deviceParams = new HashMap<>();
+                deviceParams.put("batchId", plan.getBatchId());
+                deviceParams.put("status", DeviceStatus.COMPLETED.getCode());
+                Long count = deviceDao.selectSomeCount(deviceParams);
+                if(count>plan.number && DateUtil.between(DateUtil.parse(plan.endDate), DateUtil.date(), DateUnit.DAY)>3){
+                    plan.setStatus(PlanStatusEnum.END.getCode());
+                    assemblyDao.updateByPrimaryKeySelective(plan);
+                }
             }
+            if(assemblyDao!=null){
+                throw new RuntimeException("");
+            }
+        }catch (Exception e){
+            log.error("缁勮璁″垝浠诲姟瀹氭椂妫�鏌ュ紓甯�",e);
+            try{
+                SysUtil.InfoVo vo = SysUtil.info() ;
+                System.out.println(vo.toString());
+            }catch (Exception e1){}
         }
         log.info("瀹屾垚 缁勮璁″垝浠诲姟瀹氭椂妫�鏌�");
     }

--
Gitblit v1.8.0