From b5f05a2ed6cee045ba74e6cef030d8aae6192296 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 14:47:57 +0800
Subject: [PATCH] 增加Hutool工具包

---
 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
index 09eb85a..d8b8a7a 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.aps.job.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aps.common.core.utils.DateUtils;
 import com.aps.common.core.utils.StringUtils;
-import com.aps.job.util.Sequence;
 import com.aps.job.domain.ApsWorkOrderJob;
 import com.aps.job.domain.ApsWorkOrderJobLog;
 import com.aps.job.domain.ApsWorkOrderProcess;
@@ -58,9 +58,6 @@
 
     @Autowired
     private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;
-
-    @Autowired
-    private Sequence sequence;
 
     /**
      * 鏌ヨ宸ュ崟宸ュ簭
@@ -183,21 +180,23 @@
                             apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
                             apsWorkOrderProcess.setOpId(process.getString("OpID"));
                             apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
-                            apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
+                            apsWorkOrderProcess.setStandardTime(process.getBigDecimal("StandardTime"));
                             apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
                             apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
-                            apsWorkOrderProcess.setProcessQty(process.getFloat("ProcessQty"));
-                            apsWorkOrderProcess.setScrapQty(process.getFloat("ScrapQty"));
+                            apsWorkOrderProcess.setProcessQty(process.getBigDecimal("ProcessQty"));
+                            apsWorkOrderProcess.setScrapQty(process.getBigDecimal("ScrapQty"));
                             apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
                             apsWorkOrderProcess.setOrg(process.getString("Org"));
                             apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
                             apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
                             if (existsId != null) {
                                 apsWorkOrderProcess.setId(existsId);
+                                apsWorkOrderProcess.setUpdateBy("task");
                                 apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                 updateList.add(apsWorkOrderProcess);
                             } else {
-                                apsWorkOrderProcess.setId(sequence.nextId());
+                                apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId());
+                                apsWorkOrderProcess.setCreateBy("task");
                                 apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                 addList.add(apsWorkOrderProcess);
                             }
@@ -211,12 +210,14 @@
                         if(!updateList.isEmpty()){
                             apsWorkOrderProcessMapper.updateApsWorkOrderProcessBatch(updateList);
                             apsWorkOrderJobLog.setResult("ok update "+updateList.size());
+                            apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                             apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                             logger.info("銆怳PDATE銆戣幏鍙栧苟鏇存柊U9宸ュ簭鎴愬姛锛併�愬伐鍗曞彿锛歿}銆�", docNos);
                         }
                         if(!addList.isEmpty()){
                             apsWorkOrderProcessMapper.insertApsWorkOrderProcessBatch(addList);
                             apsWorkOrderJobLog.setResult("ok insert "+updateList.size());
+                            apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                             apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                             logger.info("銆怚NSERT銆戣幏鍙栧苟鎻掑叆U9宸ュ簭鎴愬姛锛併�愬伐鍗曞彿锛歿}銆�", docNos);
                         }
@@ -225,13 +226,16 @@
                         param.put("docNos", haveProcessDocNos);
                         apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                     }
-                    Map<String, Object> param = new HashMap<>();
-                    param.put("status", "2");
-                    param.put("docNos", docNos);
-                    apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
+                    if(!docNos.isEmpty()){
+                        Map<String, Object> param = new HashMap<>();
+                        param.put("status", "2");
+                        param.put("docNos", docNos);
+                        apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
+                    }
                 }else{
                     apsWorkOrderJobLog.setResponseData(response.getBody());
                     apsWorkOrderJobLog.setResult("fail");
+                    apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
                     apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
                     logger.error("銆怑RROR銆戞煡璇9宸ュ簭澶辫触锛併�愬伐鍗曞彿锛歿}, 閿欒鐮侊細{}锛岄敊璇俊鎭細{}銆�", docNos, responseBodyJson.getString("status"), responseBodyJson.getString("message"));
                 }
@@ -241,6 +245,7 @@
         } else {
             apsWorkOrderJobLog.setResponseData(response.getBody());
             apsWorkOrderJobLog.setResult("fail");
+            apsWorkOrderJobLog.setUpdateTime(DateUtils.getNowDate());
             apsWorkOrderJobLogService.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
             throw new Exception("銆怑RROR銆戞煡璇9宸ュ簭澶辫触锛併�愬伐鍗曞彿锛歿"+ docNos +"}, 閿欒鐮侊細{"+ responseBodyJson.getString("status") +"}锛岄敊璇俊鎭細{"+ responseBodyJson.getString("message") +"}銆�");
         }

--
Gitblit v1.9.3