From cbc669c3571258300ce797660cd0052c6f5a1151 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 28 May 2024 11:42:56 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/web/emis/EmisCommonController.java  | 2 +-
 .../com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java | 2 +-
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java   | 3 +++
 .../xdadan/erp/emis/service/IEmisElectronicPagService.java  | 2 +-
 .../erp/emis/service/impl/EmisElectronicPagServiceImpl.java | 6 +++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index f186c78ff..19d7c92e2 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -81,7 +81,7 @@ public class EmisCommonController extends BaseController
     @RequestMapping(value = "/getCenterTotalAvailablePag")
     public AjaxResult getCenterTotalAvailablePag(String prefix)
     {
-        return AjaxResult.success("获取成功",emisElectronicPagService.getTotalAvailablePag(prefix));
+        return AjaxResult.success("获取成功",emisElectronicPagService.getCenterTotalAvailablePag("T7080"));
     }
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
index b7645538d..d370a2add 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
@@ -90,7 +90,7 @@ public interface EmisElectronicPagMapper extends BaseMapper<EmisElectronicPag>
      * @return
      */
     @Select("select sum(has_bill_count) as has_bill_count from emis_electronic_pag where prefix='${prefix}' and has_bill_count>0 ")
-    public int getTotalAvailablePag(@Param("prefix")String prefix);
+    public int getCenterTotalAvailablePag(@Param("prefix")String prefix);
 
 
     @Select("select * from emis_electronic_pag where prefix='${prefix}' and  has_bill_count>0 order by has_bill_count asc ")
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 42fd9bd5a..3abac0ac1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -395,6 +395,9 @@ public class EmisBaseService {
          String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4);
          // 短号,运单号后6位
          order.put("shortLogisticNo", shortLogisticNo);
+
+         order.put("totalPrice", "1");
+
          // 短号,运单号后4位
          order.put("shortLogisticNo4Number", shortLogisticNo4Number);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
index 2f62ddd79..3d4dac1b8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
@@ -36,7 +36,7 @@ public interface IEmisElectronicPagService
      * @param prefix
      * @return
      */
-    public int getTotalAvailablePag(String prefix);
+    public int getCenterTotalAvailablePag(String prefix);
 
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
index 0556537fb..ce1646787 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
@@ -76,8 +76,8 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
      * @throws EmisBizError
      */
     @Override
-    public int getTotalAvailablePag(String prefix) {
-        return emisElectronicPagMapper.getTotalAvailablePag(prefix);
+    public int getCenterTotalAvailablePag(String prefix) {
+        return emisElectronicPagMapper.getCenterTotalAvailablePag(prefix);
     }
 
 
@@ -336,7 +336,7 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
         String lockKey="REALMATCHWAYBILL_LOCK";
         redissonService.lock(lockKey, 120L);
         // 需要加锁
-        int hasCount=emisElectronicPagMapper.getTotalAvailablePag(prefix);
+        int hasCount=emisElectronicPagMapper.getCenterTotalAvailablePag(prefix);
         if(hasCount<=0){
             redissonService.unlock(lockKey);
             throw new EmisBizError(EmisBizErrorType.NOT_ENOUGH_PAG,"面单不足");