aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-28 11:42:56 +08:00
parent 36813d41d2
commit cbc669c357
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -81,7 +81,7 @@ public class EmisCommonController extends BaseController
@RequestMapping(value = "/getCenterTotalAvailablePag") @RequestMapping(value = "/getCenterTotalAvailablePag")
public AjaxResult getCenterTotalAvailablePag(String prefix) public AjaxResult getCenterTotalAvailablePag(String prefix)
{ {
return AjaxResult.success("获取成功",emisElectronicPagService.getTotalAvailablePag(prefix)); return AjaxResult.success("获取成功",emisElectronicPagService.getCenterTotalAvailablePag("T7080"));
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicPagMapper.java
View File

@ -90,7 +90,7 @@ public interface EmisElectronicPagMapper extends BaseMapper<EmisElectronicPag>
* @return * @return
*/ */
@Select("select sum(has_bill_count) as has_bill_count from emis_electronic_pag where prefix='${prefix}' and has_bill_count>0 ") @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 ") @Select("select * from emis_electronic_pag where prefix='${prefix}' and has_bill_count>0 order by has_bill_count asc ")

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -395,6 +395,9 @@ public class EmisBaseService {
String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4); String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4);
// 短号,运单号后6位 // 短号,运单号后6位
order.put("shortLogisticNo", shortLogisticNo); order.put("shortLogisticNo", shortLogisticNo);
order.put("totalPrice", "1");
// 短号,运单号后4位 // 短号,运单号后4位
order.put("shortLogisticNo4Number", shortLogisticNo4Number); order.put("shortLogisticNo4Number", shortLogisticNo4Number);

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
View File

@ -36,7 +36,7 @@ public interface IEmisElectronicPagService
* @param prefix * @param prefix
* @return * @return
*/ */
public int getTotalAvailablePag(String prefix); public int getCenterTotalAvailablePag(String prefix);
/** /**

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
View File

@ -76,8 +76,8 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
* @throws EmisBizError * @throws EmisBizError
*/ */
@Override @Override
public int getTotalAvailablePag(String prefix) { public int getCenterTotalAvailablePag(String prefix) {
return emisElectronicPagMapper.getTotalAvailablePag(prefix); return emisElectronicPagMapper.getCenterTotalAvailablePag(prefix);
} }
@ -336,7 +336,7 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
String lockKey="REALMATCHWAYBILL_LOCK"; String lockKey="REALMATCHWAYBILL_LOCK";
redissonService.lock(lockKey, 120L); redissonService.lock(lockKey, 120L);
// 需要加锁 // 需要加锁
int hasCount=emisElectronicPagMapper.getTotalAvailablePag(prefix); int hasCount=emisElectronicPagMapper.getCenterTotalAvailablePag(prefix);
if(hasCount<=0){ if(hasCount<=0){
redissonService.unlock(lockKey); redissonService.unlock(lockKey);
throw new EmisBizError(EmisBizErrorType.NOT_ENOUGH_PAG,"面单不足"); throw new EmisBizError(EmisBizErrorType.NOT_ENOUGH_PAG,"面单不足");