From fadf0771d2a6dde524a95eb2d450b53f39142bd5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 3 Jan 2025 13:57:38 +0800
Subject: [PATCH] md

---
 .../emis/EmisWaybillDeclareGoodsController.java | 17 ++++++++++-------
 .../EmisSettleInvoiceChRecordServiceImpl.java   | 13 +++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillDeclareGoodsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillDeclareGoodsController.java
index 8c808a1e5..514bd148b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillDeclareGoodsController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillDeclareGoodsController.java
@@ -51,7 +51,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
     /**
      * 查询申报物品列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisWaybillDeclareGoods emisWaybillDeclareGoods)
     {
@@ -67,7 +67,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
      * @param emisWaybillDeclareGoods 
      * @return 数量
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
     @GetMapping("/checkUnique")
     public AjaxResult checkUnique(EmisWaybillDeclareGoods emisWaybillDeclareGoods)
     {
@@ -79,7 +79,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
     /**
      * 导出申报物品列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:export')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:export')")
     @Log(title = "申报物品", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmisWaybillDeclareGoods emisWaybillDeclareGoods)
@@ -92,7 +92,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
     /**
      * 获取申报物品详细信息
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:query')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -102,18 +102,21 @@ public class EmisWaybillDeclareGoodsController extends BaseController
     /**
      * 新增申报物品
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:add')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:add')")
     @Log(title = "申报物品", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EmisWaybillDeclareGoods emisWaybillDeclareGoods)
     {
+        if(StringUtils.isEmpty(emisWaybillDeclareGoods.getBillCode())){
+            return AjaxResult.error("运单号不能为空");
+        }
         return toAjax(emisWaybillDeclareGoodsService.insertEmisWaybillDeclareGoods(emisWaybillDeclareGoods));
     }
 
     /**
      * 修改申报物品
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:edit')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:edit')")
     @Log(title = "申报物品", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EmisWaybillDeclareGoods emisWaybillDeclareGoods)
@@ -124,7 +127,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
     /**
      * 删除申报物品
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:remove')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:remove')")
     @Log(title = "申报物品", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
index 0c1c81d80..b22cdf263 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
@@ -148,6 +148,19 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
             newApply.setInvoiceStatus("2");
             newApply.setOpenChStatus("2");
             emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
+
+            String title="开票成功，请下载发票：开票抬头:"+oldApply.getCompanyName()+",开票金额:"+oldApply.getApplyMoney();
+            sendNoticeToEmpUser(oldApply.getApplyManCode(), title, title, "/ruyERj/SiteInvoiceRecordApply");
+
+            // 触发开票状态更新
+            String [] settleBillNoArr=oldApply.getSettleBillNo().split(",");
+            for(int i=0;i<settleBillNoArr.length;i++){
+                String sBillNoItem=settleBillNoArr[i];
+                if(StringUtils.isEmpty(sBillNoItem)) {
+                    emisSettleBillService.reCalcSettleBillInvoiceStatus(sBillNoItem);
+                }
+            }
+
         }else {
             emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
         }