From a8415eef4fc100e8af50bc2c4125f6d95b3b5f94 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 8 Aug 2024 19:12:10 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisSettleBillController.java    | 41 +++++++++++++++++++
 .../impl/EmisTmsScanRecordServiceImpl.java    |  4 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index bc6407c56..e535cc205 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -269,6 +269,47 @@ public class EmisSettleBillController extends BaseController
         return AjaxResult.success("确认成功");
     }
 
+    /**
+     * 站点确认不开票
+     */
+    @Log(title = "站点确认不开票", businessType = BusinessType.UPDATE)
+    @PostMapping("/confirmNotOpenBillBySite/{ids}")
+    public AjaxResult confirmNotOpenBillBySite(@PathVariable Long[] ids)
+    {
+        if(ids!=null && ids.length>0){
+            for(int i=0;i<ids.length;i++){
+                try {
+                    long id=ids[i];
+
+                    EmisSettleBill old= emisSettleBillService.selectEmisSettleBillById(id);
+                    if(old==null){
+                        return AjaxResult.error("账单不存在");
+                    }
+
+                    if(!"0".equals(old.getOpenBillStatus())){
+                        return AjaxResult.error("已存在开票记录");
+                    }
+
+
+                    EmisSettleBill emisSettleBill = new EmisSettleBill();
+                    emisSettleBill.setOpenBillStatus("3");
+                    emisSettleBill.setId(id);
+                    emisSettleBillService.updateEmisSettleBill(emisSettleBill);
+
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                    // 返回子定义异常
+                    if(ex instanceof EmisBizError){
+                        return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+                    }
+
+                    return AjaxResult.error("确认异常，联系客服");
+                }
+            }
+        }
+        return AjaxResult.success("确认成功");
+    }
+
 
     @Log(title = "导出账单", businessType = BusinessType.EXPORT)
     @PostMapping("/exportBill")
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 78fecf84a..56001625f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -1757,6 +1757,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
 
 
+
+
             // 生成扫描记录
             EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
             emisTmsScanRecord.setBillCode(scanBillCode);
@@ -1764,7 +1766,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
             emisTmsScanRecord.setScanType(ScanType.ISSUE.opCode);
             emisTmsScanRecord.setScanDate(scanDate);
-            emisTmsScanRecord.setRemark(problemTypeName);
+            emisTmsScanRecord.setRemark(problemTypeName+" "+remark);
 
             // 填充公共数据
             this.fillBillBaseData(emisTmsScanRecord);