From 0ed7ad518c3fb354b830cc6b27a18dc0cd01f6fb Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 08:54:31 +0800
Subject: [PATCH] 【UPDATE】优化气柜管路产能计划查询接口
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 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 498b29c..1a8a684 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
@@ -178,7 +178,7 @@
apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
apsWorkOrderProcess.setOpId(process.getString("OpID"));
- apsWorkOrderProcess.setProcessName(process.getString("WorkCenter"));
+ apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
@@ -187,6 +187,7 @@
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.setUpdateTime(DateUtils.getNowDate());
@@ -245,11 +246,8 @@
try{
//鍒嗛〉鏌ヨ宸ュ崟
ApsWorkOrderJob apsWorkOrderJob = new ApsWorkOrderJob();
- if(status==null){
+ if("".equals(status)){
status = "0";
- }
- if(pageSize==null){
- pageSize = 100;
}
apsWorkOrderJob.setProcessStatus(status);
// 琛ユ煡涔嬪墠娌℃湁鏌ュ埌宸ュ簭鐨勫伐鍗�
@@ -279,12 +277,18 @@
long startTime = System.currentTimeMillis();
List<String> docNos = new ArrayList<>();
for (ApsWorkOrderJob apsWorkOrderJob1 : pageList){
- docNos.add(apsWorkOrderJob1.getDocNo());
+ if(apsWorkOrderJob1.getDocNo()!=null){
+ docNos.add(apsWorkOrderJob1.getDocNo());
+ }
}
- getWorkOrderProcessFromU9(docNos);
- long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
- long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
- System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
+ if(!docNos.isEmpty()){
+ getWorkOrderProcessFromU9(docNos);
+ long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
+ long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
+ System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
+ }else{
+ break;
+ }
}else{
break;
}
@@ -314,9 +318,13 @@
JSONArray docListArray = requestBodyJson.getJSONArray("DocList");
List<String> docNos = new ArrayList<>();
for (int i = 0; i < docListArray.size(); i++) {
- docNos.add(docListArray.getString(i));
+ if(docListArray.getString(i)!=null){
+ docNos.add(docListArray.getString(i));
+ }
}
- getWorkOrderProcessFromU9(docNos);
+ if(!docNos.isEmpty()){
+ getWorkOrderProcessFromU9(docNos);
+ }
}catch (Exception e){
e.printStackTrace();
return false;
--
Gitblit v1.9.3