From a8380b967cf2d0214483a9c0601785308160c69d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 11 Jul 2024 11:28:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml     | 2 +-
 .../op/plan/service/impl/ProOrderWorkorderServiceImpl.java    | 4 ++--
 .../resources/mapper/plan/ProOrderWorkorderBatchMapper.xml    | 2 +-
 .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

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 1fc178f4..de9e6664 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
@@ -497,7 +497,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   product_code productCode
 		from pro_order_workorder
 		where belong_work_order = #{workorderCode} and del_flag = '0' <!--and status = 'w2'-->
-		order by order_code
+		order by workorder_code_sap
 	</select>
 	<select id="getReportWorkHzList" resultType="com.op.mes.domain.MesReportWork">
 		select mrw.workorderCode,mrw.productCode,mrw.productName,mrw.machineCode,mrw.machineName,
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 4db8261f..9e869f28 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
@@ -1164,7 +1164,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             batch.setBatchId(IdUtils.fastSimpleUUID());
             batch.setWorkorderId(workOrder.getWorkorderId());
             batch.setBatchCode(proOrderWorkorderBatch.getNewBatchCode());
-            batch.setStatus("0");
+            batch.setStatus("1");
             batch.setCreateBy(username);
             Date nowDate = DateUtils.getNowDate();
             batch.setCreateTime(nowDate);
@@ -1209,7 +1209,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             batch.setBatchCode(batchCode);
             batch.setNewBatchCode(newBatchCode);
 
-            batch.setStatus("0");
+            batch.setStatus("1");//1代表未报工
             batch.setUpdateBy(username);
             batch.setUpdateTime(DateUtils.getNowDate());
 
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
index 1d2dd5b1..0d105ab7 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
@@ -132,7 +132,7 @@
         )VALUES
         <foreach collection="list" item="d" index="index" separator=",">
             (
-            #{d.batchId},#{d.workorderId},#{d.batchCode},#{d.batchQuantity},'0',
+            #{d.batchId},#{d.workorderId},#{d.batchCode},#{d.batchQuantity},'1',
             #{d.createBy},#{d.createTime}, #{d.factoryCode},'2'
             )
         </foreach>
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 9ae80d80..7693fccb 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
@@ -146,6 +146,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	 */
 	@Override
 	public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
+		logger.info("创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome));
 		DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskIncome.getFactoryCode());
 		String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
 		int liushuiNum = qcCheckTaskIncomeMapper.getTodayMaxNum(qcCheckTaskIncome);
@@ -641,6 +642,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
+		logger.info("质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome));
 		List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
 
         Date nowTime = DateUtils.getNowDate();