From d60bbdae095e3dd1ba23d62c9a99410e18d8a95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 30 Jun 2025 19:40:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD,=E4=BB=85?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=8B=E5=8F=91=E6=9C=AA=E4=B8=8A=E6=96=99=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=9A=84=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/controller/jhgk/DmYdjhController.java   | 2 +-
 .../dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
index 6927c07..7e1fcb1 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
@@ -110,7 +110,7 @@ public class DmYdjhController {
         List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
                 .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
                 .ge(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
-                        .lt("zt","11")//仅可下发未上料打印的计划
+                        .lt("zt",11)//仅可下发未上料打印的计划
                 .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
index 3f3f4ef..934254e 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
@@ -324,9 +324,9 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         DmYdjh dmYdjh = new DmYdjh();
         dmYdjh.setId(item.getId());
         dmYdjh.setZt("2");
-        String perfix=item.getSljhrq().replace("/","");
-        perfix=perfix.substring(2);
-        dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
+        //String perfix=item.getSljhrq().replace("/","");
+        //perfix=perfix.substring(2);
+        //dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
         dmYdjh.setGxsj(gxsj);
         dmYdjh.setPlxh(item.getPlxh());
         return dmYdjh;