From 6545f4eeb38b9946ac586f6d622fdebed647e254 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 16:01:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=9C=88=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java  | 6 +++---
 .../dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java | 2 +-
 .../dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
index 940e04f..162df6c 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
@@ -66,11 +66,11 @@ public class SyExcel implements Serializable {
 
     @ApiModelProperty(value = "订货板数")
     @ExcelProperty(index = 10)
-    private Double orderBs;
+    private String orderBs;
 
     @ApiModelProperty(value = "到货板数")
     @ExcelProperty(index = 11)
-    private Double arrivalBs;
+    private String arrivalBs;
 
     @ApiModelProperty(value = "套料图板数")
     @ExcelProperty(index = 12)
@@ -94,7 +94,7 @@ public class SyExcel implements Serializable {
 
     @ApiModelProperty(value = "型材抛丸")
     @ExcelProperty(index = 17)
-    private Double xcpwSl;
+    private String xcpwSl;
 
     @ApiModelProperty(value = "型材抛丸时间")
     @ExcelProperty(index = 18)
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 8c5b073..06e3128 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,7 @@ 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]));
-xiiu                        if (e.getWpggZ().split("\\*").length>2){
+                        if (e.getWpggZ().split("\\*").length>2){
                             dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2]));
                         }
 
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
index ec21766..af3f0be 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
@@ -73,9 +73,10 @@ public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> impleme
             BeanUtil.copyProperties(q,a);
 //            a.setBzry((String) req.getAttribute("yhms"));
 //            a.setBzrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+            a.setGdZt("0");//状态转码
             listForSave.add(a);
         }
-        this.updateBatchById(listForSave);
+        this.saveOrUpdateBatch(listForSave);
         return null;
     }