From e9a5400423fbbdaf10831a2389dbf14b47bf0924 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 20 Oct 2024 23:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java  | 2 +-
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java
index 260b4b7..4601653 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java
@@ -34,7 +34,7 @@ public class SaleOrderEntryDO extends BaseDO {
     /**
      * 物料id
      */
-    private Integer materialId;
+    private Long materialId;
     /**
      * 物料名称
      */
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 7334111..873b5a4 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -103,7 +103,6 @@ import static cn.hangtag.module.oms.enums.ErrorCodeConstants.SALE_ORDER_NOT_EXIS
 @AllArgsConstructor
 public class SaleOrderServiceImpl implements SaleOrderService {
 
-
     private SaleOrderMapper saleOrderMapper;
     private SaleContractMapper saleContractMapper;
     private SaleOrderEntryMapper saleOrderEntryMapper;
@@ -235,7 +234,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateSaleOrderBillStatus(List<Long> ids, String status){
-        updateSaleOrderBillStatus(ids,status);
+        updateSaleOrderBillStatus(ids,status,null);
     }
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -318,7 +317,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                         message.setMail("wx782276617@foxmail.com");
                         message.setTitle("OMS订单系统");
                         message.setContent("您好，您的订单："+saleOrder.getBillno()+"，已审核通过！");
-                        mailSendService.doSendMail(message,new File(fileName));
+                        mailSendService.doSendMail(message,new File(pdfPath));
                         //mailSendService.doSendMail(message);
                     }
                 }