From e33b29e3495e92ad1b2db5b5deccf7b3e81e3908 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 16 Oct 2024 11:47:13 +0800
Subject: [PATCH] oa

---
 .../api/domain/mes/{ProLine.java => ProLineDTO.java}     | 6 +++---
 .../main/java/com/op/open/controller/OpenController.java | 2 ++
 .../resources/mapper/plan/ProOrderWorkorderMapper.xml    | 2 ++
 .../op/quality/controller/QcStaticTableController.java   | 9 ++-------
 .../java/com/op/quality/mapper/QcStaticTableMapper.java  | 5 ++---
 .../com/op/quality/service/IQcStaticTableService.java    | 4 ++--
 .../quality/service/impl/QcStaticTableServiceImpl.java   | 5 ++---
 .../resources/mapper/quality/QcStaticTableMapper.xml     | 2 +-
 8 files changed, 16 insertions(+), 19 deletions(-)
 rename op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/{ProLine.java => ProLineDTO.java} (94%)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLine.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java
similarity index 94%
rename from op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLine.java
rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java
index 486f25833..b120308a8 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLine.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java
@@ -1,7 +1,7 @@
 package com.op.system.api.domain.mes;
 
 //线体成型机类
-public class ProLine {
+public class ProLineDTO {
     private String key;
     private String label;
     private String lineCode;
@@ -83,11 +83,11 @@ public class ProLine {
         this.label = label;
     }
 
-    public ProLine(String key, String label) {
+    public ProLineDTO(String key, String label) {
         this.key = key;
         this.label = label;
     }
 
-    public ProLine() {
+    public ProLineDTO() {
     }
 }
diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
index 5569f5710..cd75c5692 100644
--- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
+++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
@@ -115,6 +115,8 @@ public class OpenController extends BaseController {
         if (StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())) {
             return error("[factoryCode]不能为空");
         }
+        //工单未
+
         //添加检测任务
         int flag = openService.insertQcCheckTaskProduce(qcCheckTaskProduce);
         if(flag != -100){
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index d360464f4..c3aaa907b 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -99,6 +99,7 @@
             </if>
             and pow.del_flag = '0'
         </where>
+        order by pow.product_date desc
     </select>
     <select id="getLevelWorkOrderList" parameterType="ProOrderWorkorder" resultMap="ProOrderWorkorderResult">
         select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code,
@@ -193,6 +194,7 @@
             </if>
             and pow.del_flag = '0'
         </where>
+        order by pow.product_date desc
     </select>
     <select id="selectProOrderWorkorderByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderResult">
         select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code, pow.product_id,
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
index 2fa86accc..806d6bf34 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
@@ -7,15 +7,13 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.common.core.domain.ExcelCol;
-import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.poi.ExcelMapUtil;
 import com.op.quality.domain.*;
-import com.op.system.api.domain.mes.ProLine;
+import com.op.system.api.domain.mes.ProLineDTO;
 import com.op.system.api.domain.quality.ChartDTO;
 import com.op.system.api.domain.quality.ChartSeriesDTO;
 import com.op.system.api.domain.quality.FactoryDto;
@@ -25,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +32,6 @@ import com.op.common.log.enums.BusinessType;
 import com.op.common.security.annotation.RequiresPermissions;
 import com.op.quality.service.IQcStaticTableService;
 import com.op.common.core.web.controller.BaseController;
-import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.core.utils.poi.ExcelUtil;
 import com.op.common.core.web.page.TableDataInfo;
 
@@ -654,7 +649,7 @@ public class QcStaticTableController extends BaseController {
     }
 
     @GetMapping("/getProdLineList")
-    public List<ProLine> getProdLineList() {
+    public List<ProLineDTO> getProdLineList() {
         return qcStaticTableService.getProdLineList();
     }
 
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
index 68149dfd8..07eb3a573 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
@@ -1,11 +1,10 @@
 package com.op.quality.mapper;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.op.quality.domain.*;
-import com.op.system.api.domain.mes.ProLine;
+import com.op.system.api.domain.mes.ProLineDTO;
 import com.op.system.api.domain.quality.FactoryDto;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -113,7 +112,7 @@ public interface QcStaticTableMapper {
 
     List<QcCPKInfo> getCpkTypeList(QcCPKInfo qcCPKInfo);
 
-    List<ProLine> getProdLineList();
+    List<ProLineDTO> getProdLineList();
 
     @MapKey("yearMonth")
     Map<String,QcStaticTable> getDLDataDay(QcCPKInfo qcCPKInfo);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java
index 47b1bd968..60087a3e8 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java
@@ -8,7 +8,7 @@ import com.op.quality.domain.QcCPKInfo;
 import com.op.quality.domain.QcCheckDetail;
 import com.op.quality.domain.QcCheckType;
 import com.op.quality.domain.QcStaticTable;
-import com.op.system.api.domain.mes.ProLine;
+import com.op.system.api.domain.mes.ProLineDTO;
 import com.op.system.api.domain.quality.ChartSeriesDTO;
 import com.op.system.api.domain.quality.FactoryDto;
 
@@ -77,5 +77,5 @@ public interface IQcStaticTableService {
     QcCPKInfo getTableCPKTitle(QcCPKInfo qcCPKInfo);
     QcCPKInfo getTableCPKList(QcCPKInfo qcCPKInfo);
 
-    List<ProLine> getProdLineList();
+    List<ProLineDTO> getProdLineList();
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
index 98f14a1e3..7e3945418 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
@@ -9,7 +9,6 @@ import java.time.LocalDate;
 import java.time.Month;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
-import java.time.format.TextStyle;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -18,7 +17,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.StringUtils;
 import com.op.quality.domain.*;
 import com.op.quality.mapper.QMSFileMapper;
-import com.op.system.api.domain.mes.ProLine;
+import com.op.system.api.domain.mes.ProLineDTO;
 import com.op.system.api.domain.quality.ChartDTO;
 import com.op.system.api.domain.quality.ChartSeriesDTO;
 import com.op.system.api.domain.quality.FactoryDto;
@@ -1353,7 +1352,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
 
     @Override
     @DS("#header.poolName")
-    public List<ProLine> getProdLineList() {
+    public List<ProLineDTO> getProdLineList() {
         return qcStaticTableMapper.getProdLineList();
     }
 
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 3085b9ecc..3a17264b3 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -938,7 +938,7 @@
                                                        and sdd.dict_value = qpcu.material_code
         where qpcu.del_flag = '0' and qpcu.material_code = #{cpkType}
     </select>
-    <select id="getProdLineList" resultType="com.op.system.api.domain.mes.ProLine">
+    <select id="getProdLineList" resultType="com.op.system.api.domain.mes.ProLineDTO">
         select equipment_code lineCode,equipment_name lineName from base_equipment
         where del_flag = '0' and equipment_type_code = 'equ_type_bzx'
     </select>