From b7bfb7b1ba09d631b4dcedb9a0df335f159d8b61 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 2 Apr 2024 16:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=8E=BB=E9=87=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9+=E6=88=90=E5=93=81=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87+=E7=9C=8B=E6=9D=BFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/mapper/MesReportWorkMapper.java    |  2 --
 .../service/impl/IWCInterfaceServiceImpl.java |  2 --
 .../main/resources/mapper/mes/MesMapper.xml   |  2 +-
 .../mapper/mes/MesReportWorkMapper.xml        |  5 -----
 .../impl/ProOrderWorkorderServiceImpl.java    | 10 +++++-----
 .../QcCheckTaskIncomeController.java          |  4 ++--
 .../impl/QcCheckTaskIncomeServiceImpl.java    |  9 +++++++--
 .../impl/QcCheckTaskProduceServiceImpl.java   | 20 +++++++++++++++----
 .../quality/QcCheckTaskIncomeMapper.xml       |  2 +-
 .../quality/QcCheckTypeProjectMapper.xml      |  2 +-
 .../op/sap/service/impl/SapItemSyncImpl.java  |  2 +-
 11 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
index 8a406f0f..a17fb24a 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
@@ -127,8 +127,6 @@ public interface MesReportWorkMapper {
 
     public MesReportWork getReportWorkHz(MesReportWork mesReportWork);
 
-    MesReportWork getEndReport(MesReportWork pWork);
-
     List<MesReportWork> selectMesReportWorkList_S(MesReportWork mesReportWork);
 
     int reportSapCancel(MesReportWork mesReportWork);
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index 6ebf9376..d8813b38 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -424,8 +424,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    //最终报工标识且sap报工成功：关闭子母工单
-                    //MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork);
                 }else{
                     //报工不成功跳出循环
                     break;
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 4dc04c71..7e454347 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -316,7 +316,7 @@
             pow.unit
         from pro_order_workorder pow
                  left join base_equipment be on pow.workorder_name = be.equipment_code and be.equipment_type_code = 'equ_type_bzx'
-        where pow.workorder_name = 'XL03' and pow.status = 'w2'
+        where pow.workorder_name = #{equCode} and pow.status = 'w2'
           and CONVERT ( DATE, pow.product_date ) = CONVERT ( DATE, GETDATE( ) )
           and pow.parent_order = '0'
     </select>
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index b93be404..df392f41 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -599,11 +599,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code
 		left join base_equipment equ on equ.equipment_code = ow.workorder_name
 	</select>
-	<select id="getEndReport" resultType="com.op.mes.domain.MesReportWork">
-		select end_report endReport
-		from mes_report_work
-		where end_report = '1' and workorder_code =  #{workorderCode}
-	</select>
 	<select id="selectMesReportWorkList_S" parameterType="MesReportWork" resultMap="MesReportWorkResult">
 		SELECT
 		mrw.machine_name,
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 9c0d18dc..68f973a9 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -1331,12 +1331,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         } else {
             proOrderWorkorderMapper.updateProOrderWorkorder(proWorkOrder);
             //pro_order_workorder
-            ProOrderWorkorder topWorkOrder = proOrderWorkorderMapper.getWorkOrderByCode(proWorkOrder.getWorkorderCode());
-            while (!"0".equals(topWorkOrder.getParentOrder()) && StringUtils.isNotEmpty(topWorkOrder.getParentOrder())) {
+            ProOrderWorkorder sonWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(proWorkOrder);
+            while (sonWorkOrder != null) {
                 //pro_order_workorder
-                topWorkOrder = proOrderWorkorderMapper.getWorkOrderByCode(topWorkOrder.getParentOrder());
-                proWorkOrder.setWorkorderId(topWorkOrder.getWorkorderId());
-                proOrderWorkorderMapper.updateProOrderWorkorderM(proWorkOrder);
+                sonWorkOrder.setProdLineCode(proWorkOrder.getProdLineCode());
+                proOrderWorkorderMapper.updateProOrderWorkorderM(sonWorkOrder);
+                sonWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(sonWorkOrder);
             }
         }
         return success("变更成功");
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
index c0d601a9..c952d900 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
@@ -195,14 +195,14 @@ public class QcCheckTaskIncomeController extends BaseController {
         }
         logger.info("来料信息查询结果：" + JSONObject.toJSONString(incomeR));
         List<QcCheckTaskIncomeDTO> incomeAll = JSONArray.parseArray(JSONObject.toJSONString(incomeR.getData()),QcCheckTaskIncomeDTO.class);
-        //已经生成过检验任务的采购订单
+        //已经生成过检验任务的采购订单-物料凭证编号
         List<String> todayIncomeLists = qcCheckTaskIncomeService.getTodayIncomeLists();
         List<QcCheckTaskIncomeDTO> newIncomes= null;
         if(CollectionUtils.isEmpty(todayIncomeLists)){
             newIncomes = incomeAll;
         }else{
             newIncomes = incomeAll.stream()
-                    .filter(item -> !todayIncomeLists.contains(item.getOrderNo()))
+                    .filter(item -> !todayIncomeLists.contains(item.getAttr1()))
                     .collect(Collectors.toList());
         }
 
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 1e28f17a..6487e028 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletRequest;
  * @date 2023-10-19
  */
 @Service
-public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
+public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements IQcCheckTaskIncomeService {
 	protected Logger logger = LoggerFactory.getLogger(getClass());
 	@Autowired
 	private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
@@ -85,6 +85,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	@Autowired
 	private QcCheckTaskDefectMapper qcCheckTaskDefectMapper;
 
+//	@Autowired
+//	private QcCheckUnqualifiedService qcCheckUnqualifiedService;
+
 	/**
 	 * 查询来料检验
 	 *
@@ -163,7 +166,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 				return 0;//没有找到检测项目
 			}
 		}
-		List<QcCheckTaskDetail> itemsGG = null;
+		List<QcCheckTaskDetail> itemsGG = new ArrayList<>();
 		if(StringUtils.isNotBlank(group.getGroupId())){
 			qctp.setGroupId(group.getGroupId());
 			itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
@@ -729,6 +732,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			unqualified.setType(checkType);
 			n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 			logger.info("qc_check_unqualified:" + n);
+
+			//qcCheckUnqualifiedService.updateQcCheckUnqualified(qcCheckUnqualified);
 		}
 		return 1 ;
 	}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
index 4b71a0dc..4e5b2ba8 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
@@ -1,6 +1,7 @@
 package com.op.quality.service.impl;
 
 import java.math.BigDecimal;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -388,10 +389,21 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
             Date nowTime = DateUtils.getNowDate();
             Date startTime = productTask.getCreateTime();
 
-			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
-			if(mins>=60){
-				int m = insertQcCheckTaskProduce(productTask);
-				logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
+
+			LocalTime startTime0 = LocalTime.parse("11:30");
+			LocalTime endTime0 = LocalTime.parse("12:30");
+			LocalTime currentTime = LocalTime.now();
+
+			if (!currentTime.isAfter(startTime0.minusSeconds(1)) && !currentTime.isBefore(endTime0.plusSeconds(1))) {
+				// 当前时间在11:30到12:30之间，不执行任务
+				logger.info("++++++++++++过程检验巡检任务生成午间休息++++++++++++++");
+			} else {
+				long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
+
+				if(mins>=60){
+					int m = insertQcCheckTaskProduce(productTask);
+					logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
+				}
 			}
 		}
 		logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++");
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 8be1b55d..dff8c47c 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -450,7 +450,7 @@
         where equipment_type_code='equ_type_bzx' and status = '1'
     </select>
     <select id="getTodayIncomeLists" resultType="java.lang.String">
-        select order_no
+        select attr1
         from qc_check_task
         where check_type = 'checkTypeLL'
           and CONVERT(varchar(10),GETDATE(), 120) = CONVERT(varchar(10),create_time, 120)
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml
index a0c48f17..e4ca8ee7 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml
@@ -330,7 +330,7 @@
                qmg.id groupId
         from base_product bp
         left join qc_material_group qmg on qmg.group_code = bp.product_group
-        where bp.product_code = #{materialCode}
+        where bp.product_code like concat('%',#{materialCode},'%')
           and bp.del_flag = '0'
     </select>
 </mapper>
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 8cce8f66..0d7f585c 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
@@ -428,7 +428,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 Date date = inputFormat.parse(inputDateTime);
                 qcCheckTaskIncomeDTO.setIncomeTime(date);
                 qcCheckTaskIncomeDTO.setFactoryCode(maraTable.getString("WERKS"));
-                qcCheckTaskIncomeDTO.setAttr1(maraTable.getString("USNAM"));//收货人
+                qcCheckTaskIncomeDTO.setAttr3(maraTable.getString("USNAM"));//收货人
                 qcCheckTaskIncomeDTO.setCreateTime(nowTime);
                 qcCheckTaskIncomeDTO.setCreateBy(createBy);
                 qcCheckTaskIncomeDTOList.add(qcCheckTaskIncomeDTO);