From 7c36237190b0f7fe5b0c5a86128f339f895a527b 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, 11 Jun 2024 15:20:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=9C=88=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9D=A1?=
 =?UTF-8?q?=E5=8F=A3,=E6=9B=B2=E5=9E=8B=E6=97=B6=E9=97=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 2 ++
 src/main/java/com/dsic/gj_erp/pc/DataFactory.java     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
index 35f704e..736891b 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
@@ -225,12 +225,14 @@ public class DmSygdMx implements Serializable {
                 this.qgrq=date;
                 break;
             case 坡口:
+                this.pkrq=date;
                 break;
             case 型材面板:
                 break;
             case 自由边处理:
                 break;
             case 曲型:
+                this.qjgrq=date;
                 break;
             case 打磨:
                 break;
diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java
index cf860c3..0aa41cb 100644
--- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java
+++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java
@@ -32,7 +32,6 @@ import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import static com.dsic.gj_erp.pc.Constant.工序CD;