From b3bcf1594fba5dd2d1535fe49288543cc8644ad6 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 1 Apr 2024 13:55:21 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=9C=E7=8F=AD=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/controller/MesBoardController.java |  6 ++--
 .../java/com/op/mes/mapper/MesMapper.java     |  2 +-
 .../quality/domain/QcCheckReportIncome.java   |  9 +++++
 .../op/quality/domain/QcCheckTaskProduce.java |  9 +++++
 .../com/op/quality/domain/QcStaticTable.java  | 10 +++++-
 .../quality/mapper/QcStaticTableMapper.java   |  2 ++
 .../impl/QcCheckReportProduceServiceImpl.java |  1 +
 .../impl/QcStaticTableServiceImpl.java        |  8 ++++-
 .../quality/QcCheckTaskProduceMapper.xml      |  6 ++--
 .../mapper/quality/QcStaticTableMapper.xml    | 28 +++++++++++++++
 .../com/op/sap/controller/SapController.java  | 35 ++++++++++++++++++-
 .../op/sap/service/impl/SapItemSyncImpl.java  |  6 ++++
 12 files changed, 113 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java
index 5b792d07..8c1f9f8c 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java
@@ -36,7 +36,7 @@ public class MesBoardController extends BaseController {
 
     /**计划产量、当前产量、15天的产量趋势图**/
     @PostMapping("/getProduction15Days")
-    public AjaxResult getProduction15Days(BoardDTO mesBoard) {
+    public AjaxResult getProduction15Days(@RequestBody BoardDTO mesBoard) {
         if (StringUtils.isBlank(mesBoard.getFactoryCode())) {
             return error("[facotryCode] 不能为空");
         }
@@ -48,9 +48,9 @@ public class MesBoardController extends BaseController {
 
     /**产线信息**/
     @PostMapping("/getProductionLineInfo")
-    public AjaxResult getProductionLineInfo(BoardDTO mesBoard) {
+    public AjaxResult getProductionLineInfo(@RequestBody BoardDTO mesBoard) {
         if (StringUtils.isBlank(mesBoard.getFactoryCode())) {
-            return error("[facotryCode] 不能为空");
+            return error("[factoryCode] 不能为空");
         }
         if (StringUtils.isBlank(mesBoard.getEquCode())) {
             return error("[equCode] 不能为空");
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
index 82fed22b..063a71a6 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java
@@ -77,7 +77,7 @@ public interface MesMapper {
 
     List<BoardDTO> getLineList(BoardDTO boardDTO);
 
-    @MapKey("dayStr")
+    @MapKey("productDate")
     Map<String, MesReportWork> getProduction15Days(BoardDTO boardDTO);
 
     BoardDTO getWorkOrder(BoardDTO boardDTO);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
index 5afc755e..130ecf4f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
@@ -185,6 +185,15 @@ public class QcCheckReportIncome extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date confirmTime;
     private Boolean myself;
+    private String shiftId;
+
+    public String getShiftId() {
+        return shiftId;
+    }
+
+    public void setShiftId(String shiftId) {
+        this.shiftId = shiftId;
+    }
 
     public Boolean getMyself() {
         return myself;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
index df8df2f1..acbc55e5 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
@@ -205,6 +205,15 @@ public class QcCheckTaskProduce extends BaseEntity {
     private String confirm;
     private String confirmRemark;
     private String confirmTime;
+    private String shiftId;
+
+    public String getShiftId() {
+        return shiftId;
+    }
+
+    public void setShiftId(String shiftId) {
+        this.shiftId = shiftId;
+    }
 
     public String getConfirm() {
         return confirm;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
index a3e86420..9a69cc94 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
@@ -41,7 +41,7 @@ public class QcStaticTable extends BaseEntity {
     private String typeCode;
     private String checkResult;
     private String noOkBatchRate;
-
+    private String shiftId;
     private String ymArrayStart;
     private String ymArrayEnd;
     private List<String> legendData;
@@ -106,6 +106,14 @@ public class QcStaticTable extends BaseEntity {
     private List<HashMap> details;
     private String[] projectNoArray;
 
+    public String getShiftId() {
+        return shiftId;
+    }
+
+    public void setShiftId(String shiftId) {
+        this.shiftId = shiftId;
+    }
+
     public String[] getProjectNoArray() {
         return projectNoArray;
     }
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 b2732f2e..36b64150 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
@@ -51,6 +51,8 @@ public interface QcStaticTableMapper {
 
     @MapKey("ymdms")
     Map<String, QcStaticTable> getProjectDetail(QcStaticTable qcStaticTable);
+    @MapKey("ymdms")
+    Map<String, QcStaticTable> getProjectDetailNight(QcStaticTable qcStaticTable);
 
     List<String> getBatchnos(String orderNo);
 
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
index 7bceff9d..0b70e824 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
@@ -218,6 +218,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
 
         QcStaticTable qcStaticTable = new QcStaticTable();
         qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo());
+        qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId());
         List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
         produce.setCheckInfos(checkInfos);
         QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
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 0b74694e..ae7e83ed 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
@@ -171,7 +171,13 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     @DS("#header.poolName")
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
         List<QcStaticTable> projects = qcStaticTableMapper.getXJProjects(qcStaticTable);
-        Map<String, QcStaticTable> detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable);
+        Map<String, QcStaticTable> detailMap = null;
+        if(qcStaticTable.getShiftId().equals("5")){
+            detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable);
+        }else if(qcStaticTable.getShiftId().equals("2")){
+            detailMap = qcStaticTableMapper.getProjectDetailNight(qcStaticTable);
+        }
+
         Map<String, QcStaticTable> picsMap = qcStaticTableMapper.picsMap(qcStaticTable);
         for (QcStaticTable project : projects) {
             this.getDataFromMap(detailMap, project, picsMap);
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
index a24887af..89958265 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
@@ -82,7 +82,8 @@
         <result property="confirm" column="confirm"/>
         <result property="confirmManCode" column="confirm_man_code"/>
         <result property="confirmManName" column="confirm_man_name"/>
-        <result property="confirmManName" column="confirm_remark"/>
+        <result property="confirmRemark" column="confirm_remark"/>
+        <result property="shiftId" column="shift_id"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskProduceVo">
@@ -339,7 +340,7 @@
     </select>
     <select id="selectQcCheckReportIncomeList" parameterType="QcCheckReportIncome"
             resultMap="QcCheckReportIncomeResult">
-        select * from (
+        select t.*,pow.shift_id from (
         select qct.record_id, qct.check_no, qct.income_batch_no,
         qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
         qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
@@ -409,6 +410,7 @@
         qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120),
         qct.confirm,qct.confirm_man_name
         ) t
+        left join pro_order_workorder pow on pow.workorder_code = t.order_no
         where 1=1
         <if test="checkType != null ">
             and t.check_type = #{checkType}
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 045f3c53..0e81d572 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
@@ -179,6 +179,34 @@
 
 	</select>
 
+    <select id="getProjectDetailNight" resultType="com.op.quality.domain.QcStaticTable">
+        select qctd.record_id recordId,
+               qctd.project_id projectId,
+               qctd.status,
+               qctd.remark,
+               CONVERT(VARCHAR(5),qctd.create_time, 108),
+               concat(qctd.project_id,
+                      case when '21:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '20:30' then '08'
+                           when '22:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '21:30' then '09'
+                           when '23:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '22:30' then '10'
+                           when '23:59'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '23:30' then '11'
+                           when '01:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '00:00' then '11'
+                           when '02:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '01:30' then '12'
+                           when '03:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '02:30' then '13'
+                           when '04:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '03:30' then '14'
+                           when '05:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '04:30' then '15'
+                           when '06:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '05:30' then '16'
+                           when '07:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '06:30' then '18'
+                           when '08:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '07:30' then '19'
+                           else '-' end
+                   )ymdms
+        from qc_check_task qct
+                 left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
+        where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2'
+        order by qctd.create_time
+
+    </select>
+
     <select id="getBatchnos" resultType="java.lang.String">
 		select powb.batch_code batchCode
 		from pro_order_workorder_batch powb
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
index 1d80b017..f410c1ff 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java
@@ -24,6 +24,10 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/sap")
@@ -66,8 +70,37 @@ public class SapController extends BaseController {
     @PostMapping("/itemSync")
     @Log(title = "同步SAP物料清单", businessType = BusinessType.SAP)
     public R itemSync(@RequestBody SapItemQuery qo) {
+
         // 加载sf-cloud库的sys_datasource
-        return sapItemSyncService.itemSync(qo);
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(1L);
+        R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
+        List<Map<String, String>> dateSources = dateSources0.getData();
+        ExecutorService executorService = new ThreadPoolExecutor(
+                dateSources.size(),
+                dateSources.size(),
+                0L, TimeUnit.MILLISECONDS,
+                new LinkedBlockingQueue<Runnable>());
+        try {
+
+            dateSources.forEach(dateSource -> {
+                if(!"ds_999".equals(dateSource.get("poolName"))){
+                    SapItemQuery sapItemQuery = new SapItemQuery();
+                    sapItemQuery.setWerks(dateSource.get("poolName").replace("ds_",""));
+                    Runnable run = () -> sapItemSyncService.itemSync(sapItemQuery);
+                    executorService.execute(run);
+                }
+
+            });
+
+        } catch (Exception e) {
+            logger.error("controller == createIncomeBatchTask == exception", e);
+            return R.fail("controller == createIncomeBatchTask == exception");
+        } finally {
+            executorService.shutdown();
+        }
+        return R.ok();
+
     }
 
     /**
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
index 41400e15..8cce8f66 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
@@ -53,6 +53,12 @@ public class SapItemSyncImpl implements SapItemSyncService {
     @Override
     public R itemSync(SapItemQuery sapItemQuery) {
         try {
+
+            DynamicDataSourceContextHolder.push("ds_"+sapItemQuery.getWerks());
+            //TODO;
+            //sapItemQuery.setLaeda();
+            //sapItemQuery.setErsda();
+
             // 获取调用 RFC 函数对象
             //获取连接
             log.info("物料基础数据同步输入参数---------" + JSONObject.toJSONString(sapItemQuery));

From 37260b893be3de5a8343896565b0803c98635cbf Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 14:24:49 +0800
Subject: [PATCH 2/7] =?UTF-8?q?2024-4-1=20=E8=B4=A8=E9=87=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E5=AF=BC=E5=85=A5-=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/quality/domain/QcCheckProject.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
index 196cb84f..c65d662b 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
@@ -34,7 +34,7 @@ public class QcCheckProject extends BaseEntity {
     /**
      * 检验规则属性
      */
-    @Excel(name = "检验规则属性", readConverterExp = "0=定性,1=定量")
+    @Excel(name = "检验规则属性")
     private String propertyCode;
 
     /**

From a4e2b7792aa1b1856aee17a226835986270821c6 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 14:47:53 +0800
Subject: [PATCH 3/7] =?UTF-8?q?2024-4-1=20=E8=B4=A8=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/quality/domain/QcCheckProject.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
index c65d662b..196cb84f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java
@@ -34,7 +34,7 @@ public class QcCheckProject extends BaseEntity {
     /**
      * 检验规则属性
      */
-    @Excel(name = "检验规则属性")
+    @Excel(name = "检验规则属性", readConverterExp = "0=定性,1=定量")
     private String propertyCode;
 
     /**

From cabcceb2a0de6811bc299b90d760d1101d3f34a0 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 15:47:48 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A9=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/quality/QcMaterialGroupMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
index 5cc35d50..a14c64d6 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml
@@ -43,7 +43,7 @@
             product_group groupCode,
             concat(product_group_name,'(',product_group,')') groupName
         FROM base_product
-        WHERE del_flag = '0'
+        WHERE del_flag = '0' AND product_group_name IS NOT NULL
     </select>
 
     <select id="getMaterialChildrenList" parameterType="QcMaterialGroup" resultMap="QcMaterialGroupResult">

From 7069e270f20110d818c133b9c7ee5cba5a5d661b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 15:53:05 +0800
Subject: [PATCH 5/7] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E9=99=A4=E4=BA=86=E7=BB=84=E7=BA=BF=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/device/EquCheckItemMapper.xml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
index f6bed226..fce75a5c 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
@@ -83,7 +83,10 @@
 	</select>
 
     <select id="selectAllEquipmentList" resultType="com.op.device.domain.vo.EquCheckItemVO">
-		select equipment_name AS 'equipmentName',equipment_code AS 'equipmentCode' from base_equipment where del_flag = '0' and equipment_category = '0'
+		select equipment_name AS 'equipmentName',equipment_code AS 'equipmentCode'
+		from base_equipment
+		where del_flag = '0'
+		and equipment_category != '1'
 	</select>
 
     <select id="selectCheckItemByEquipmentCode" parameterType="String" resultMap="EquCheckItemResult">

From d5cee2a8f8562185ce68d6fe6befd3abbd8a840a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 16:36:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97-=E7=82=B9=E6=A3=80=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80-=E9=80=89=E6=8B=A9=E5=90=8E=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/EquPlanServiceImpl.java    | 11 +++++++++--
 .../device/service/impl/EquSpotCheckServiceImpl.java  |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index 30a96536..96df2cc7 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -506,6 +506,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
      * @return
      */
     private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message) {
+        String equipmentList = "";
         for (EquPlanEqu data : equPlanEquList) {
 
             // 检查项名称临时对象
@@ -552,10 +553,16 @@ public class EquPlanServiceImpl implements IEquPlanService {
                 data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显）
             } else {
                 // 未查询到对应检查项信息
-                return error(500, message);
+                equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]";
             }
         }
-        return success(equPlanEquList);
+        if(!equipmentList.equals("")){
+            equipmentList = equipmentList + "设备未查询到对应检查项信息!";
+            message = equipmentList;
+            return error(500, message);
+        }else{
+            return success(equPlanEquList);
+        }
     }
 
     /**
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
index a8a8661d..5917c45e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
@@ -177,8 +177,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService {
             equipmentList = equipmentList + "设备未查询到对应检查项信息!";
             message = equipmentList;
             return error(500, message);
+        }else{
+            return success(equPlanEquList);
         }
-        return success(equPlanEquList);
     }
 
 }

From 132c2dd84ddd79259d3434643d7f749947d61631 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 16:51:19 +0800
Subject: [PATCH 7/7] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95-=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=94=9F=E6=88=90=E4=B8=8D=E5=85=A8+=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/service/impl/DeviceTaskServiceImpl.java | 3 +--
 .../main/resources/mapper/device/EquOperationMapper.xml   | 8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
index ef618dfa..f9bdb462 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
@@ -460,10 +460,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
             for (EquOperation operation : operationList) {
                 operation.setId(IdUtils.fastSimpleUUID());// id
                 operation.setFactoryCode(poolName.replace("ds_", ""));// 工厂
-                operation.setOperationTime(DateUtils.getTime());// 日期
                 operation.setOperationTime(operationTime);// 运行时间（默认运行时间）
                 operation.setActualOperationTime(operationTime);// 实际运行时间（默认运行时间）
-                operation.setCreateBy("jod");
+                operation.setCreateBy("job");
                 operation.setCreateTime(DateUtils.getNowDate());
             }
 
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
index 86b7e668..cb968da2 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
@@ -118,12 +118,10 @@
                zx.equipment_name AS 'groupLine',
                be.workshop_name  AS 'workshop'
         from base_equipment be
-                 left join equ_bind_auxiliary_equipment bae
-                           on bae.auxiliary_equipment_code = be.equipment_code
-                 left join base_equipment zx
-                           on bae.equipment_code = zx.equipment_code
+        left join equ_bind_auxiliary_equipment bae on bae.auxiliary_equipment_code = be.equipment_code
+        left join base_equipment zx on bae.equipment_code = zx.equipment_code
         where be.del_flag = '0'
-          and be.equipment_category = '0'
+          and be.equipment_category != '1'
     </select>
 
     <select id="checkInsertOperation" resultType="java.lang.Integer">