From c320999ebab280ea2958631423916558142d53c2 Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Mon, 25 Aug 2025 17:14:57 +0800
Subject: [PATCH] =?UTF-8?q?0820-=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/pro/controller/ProWorkorderController.java    | 2 +-
 ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
index 8d5489d..6184aff 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
@@ -170,7 +170,7 @@ public class ProWorkorderController extends BaseController
         if (!workorder.getProductId().equals(proWorkorder.getProductId())){
             MdItem savedItem = mdItemService.selectMdItemById(workorder.getProductId());
             MdItem newItem = mdItemService.selectMdItemById(proWorkorder.getProductId());
-            if (!savedItem.getItemCode().equals(newItem.getItemCode())){
+            if (!savedItem.getItemTypeCode().equals(newItem.getItemTypeCode())){
                 return AjaxResult.error("修改产品时，只能修改同类产品");
             }
         }
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
index a38a87e..ded157b 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
@@ -244,10 +244,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machineryName != null and machineryName != ''">and t1.machinery_name = #{machineryName}</if>
             <if test="jobStatus != null and jobStatus != ''">and t2.job_status = #{jobStatus}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(t1.finish_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                AND date_format(t6.issue_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(t1.finish_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                AND date_format(t6.issue_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
         order by t1.create_time desc