From 3203cb377a7cc16991d5a8cd65d2d6fbe8b98eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 1 Apr 2026 14:36:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E6=8A=9B?=
 =?UTF-8?q?=E4=B8=B8=E6=B4=BE=E5=B7=A5=E5=AF=BC=E8=87=B4=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java    | 15 ++++++++++++++-
 .../gj_erp/controller/zyjh/ZyjhController.java    |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

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 8bf1a6b..8c33675 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
@@ -485,9 +485,22 @@ public class DmYdjh implements Serializable {
     public void setZtForSl(){
         this.zt=ZyjhzxEnum.SLFK.code;
     }
+
     public void setForPwpg(){
-        this.zt=ZyjhzxEnum.PWPG.code;
+        //由于未知原因会导致已抛丸报工的数据被修正为抛丸派工状态,这里做一下处理
+        ZyjhzxEnum enumByCode = ZyjhzxEnum.getEnumByCode(this.zt);
+        if (enumByCode!=null&&enumByCode.computeCode<ZyjhzxEnum.PWPG.computeCode){
+            this.zt=ZyjhzxEnum.PWPG.code;
+        }
+    }
+
+    public static void main(String[] args) {
+        DmYdjh dmYdjh = new DmYdjh();
+        dmYdjh.setZt("21");
+        dmYdjh.setForPwpg();
+        System.out.println(dmYdjh);
     }
+
     public void setZtForPwfk(){
         this.zt=ZyjhzxEnum.PWFK.code;
     }
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index 775fc57..dcbb154 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -280,6 +280,8 @@ public class ZyjhController {
         List<YcldwInfo> collect = dto.getList().stream().map(item -> {
             DmYdjh dmYdjh = new DmYdjh();
             dmYdjh.setId(item.getYdid());
+            DmYdjh _ydjh = zyjhService.getById(item.getYdid());
+            dmYdjh.setZt(_ydjh.getZt());
             dmYdjh.setPwpgry(dto.getWorker());
             dmYdjh.setPwpgrq(date);
             dmYdjh.setForPwpg();