From e39ec925470d97cad27f23545ab2af5b8dfdb7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 29 Oct 2024 11:16:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C,=E8=B0=83=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E6=96=99=E9=97=B4=E5=9E=9B=E4=BD=8D=E5=8F=8A=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=202.=E4=BF=AE=E6=94=B9pc=E7=AB=AF=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E5=90=84=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?,=E4=BB=A5=E4=B8=8A=E9=81=93=E5=BA=8F=E5=AE=8C=E5=B7=A5?=
 =?UTF-8?q?=E4=B8=BA=E4=BE=9D=E6=8D=AE=E4=B8=8B=E9=81=93=E5=BA=8F=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E5=8F=AF=E6=93=8D=E4=BD=9C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=203.=E4=BF=AE=E6=AD=A3=E4=B8=8A=E6=96=99=E7=90=86?=
 =?UTF-8?q?=E6=96=99=E5=AE=8C=E6=88=90=E5=90=8E=E5=9E=9B=E4=BD=8D=E6=9C=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 2 +-
 src/main/resources/mappers/zyjh/YcldwMapper.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
index 4ffd899..03d9e29 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
@@ -392,7 +392,7 @@ public class DmYdjh implements Serializable {
         //7预留其他工序
 
         //坡口,曲面,打磨
-        PK("81"), QM("82"),DM("83"),
+        PK("81"),PKFK("82"), QM("83"),QMFK("84"),DM("85"),DMFK("86"),
         WC("99")//完成
         ;
         @Getter
diff --git a/src/main/resources/mappers/zyjh/YcldwMapper.xml b/src/main/resources/mappers/zyjh/YcldwMapper.xml
index 6996532..77cee38 100644
--- a/src/main/resources/mappers/zyjh/YcldwMapper.xml
+++ b/src/main/resources/mappers/zyjh/YcldwMapper.xml
@@ -42,6 +42,6 @@
         <where>
             <if test="type!=null and type!=''">a.type = #{type}</if>
         </where>
-        order by a.tzbh,ceng
+        order by a.id,ceng
     </select>
 </mapper>