From edb2743304db295f9d52f0d9a6e1c1ac67a5aa88 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, 21 Feb 2024 15:20:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/jcsj/impl/BomUploadServiceImpl.java  |  5 ++++-
 .../service/jhgk/impl/DmSygdMxServiceImpl.java   | 16 ++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index afbc60e..8c5b073 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -1542,7 +1542,10 @@ public class BomUploadServiceImpl {
                         System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ().split("\\*")[0]);
                         System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ());
                         dmBom.setBh(new BigDecimal(e.getWpggZ().split("\\*")[0]));
-                        dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2]));
+xiiu                        if (e.getWpggZ().split("\\*").length>2){
+                            dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2]));
+                        }
+
                         String tzbh = e.getTzbhZ();
                         String hxlx = "";
                         // 根据图纸编号获取 手工，数控 跨位，组立，、
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index fc5a4a9..1c1574a 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -311,16 +311,20 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
      */
     @Override
     public List<Pldto> getPl(String begin, String end) {
-        String beginTime_lj = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
+        DmSygdMxLj one = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
                 .select("top 1 xzglxq ")
                 .inSql("parent_id ", " SELECT dm_sygd_mx.id from dm_sygd_mx WHERE dm_sygd_mx.jssj BETWEEN '" + begin + "' and '" + end + "'")
-                .orderByAsc("xzglxq")).getXzglxq();
-        String endTime_lj = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
+                .orderByAsc("xzglxq"));
+
+        DmSygdMxLj two = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
                 .select("top 1 xzglxq ")
                 .inSql("parent_id ", " SELECT dm_sygd_mx.id from dm_sygd_mx WHERE dm_sygd_mx.jssj BETWEEN '" + begin + "' and '" + end + "'")
-                .orderByDesc("xzglxq")).getXzglxq();
-        List<Pldto> pldtoList = baseMapper.getPl(beginTime_lj, endTime_lj);
-        return pldtoList;
+                .orderByDesc("xzglxq"));
+        if (ObjectUtil.isAllNotEmpty(one,two)){
+            List<Pldto> pldtoList = baseMapper.getPl(one.getXzglxq(), two.getXzglxq());
+            return pldtoList;
+        }
+        return null;
     }
 
     /**