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 2025-07-01 17:35:05 +08:00
parent 1841e8ea46
commit 7928d8fddb
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
View File

@ -72,7 +72,7 @@ public class EmisTransLineController extends EmisBaseController
* 查询线路列表 -- 精简 * 查询线路列表 -- 精简
*/ */
// @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')") // @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')")
@JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType","status"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimple") @GetMapping("/listSimple")
public TableDataInfo listSimple(EmisTransLine emisTransLine) public TableDataInfo listSimple(EmisTransLine emisTransLine)
{ {
@ -86,6 +86,29 @@ public class EmisTransLineController extends EmisBaseController
startPage();
List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);
return getDataTable(list);
}
/**
* 全部线路-包含停用
* @param emisTransLine
* @return
*/
@JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType","status"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimpleAll")
public TableDataInfo listSimpleAll(EmisTransLine emisTransLine)
{
// 总部不限制
if(!(getLoginUser().getUser().isTopSite())){
EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode());
emisTransLine.setLogoType(site.getLogoType());
emisTransLine.getParams().put("needFilterLogoTyoe","1");
}
startPage(); startPage();
List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine); List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);
return getDataTable(list); return getDataTable(list);

11
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
View File

@ -470,7 +470,16 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
order.setDetailInfos(goodsList); order.setDetailInfos(goodsList);
JSONObject jRst =HXSdk.asyncOpenBillReceive(order,emisBaseInvoiceChInfo.getToken());
JSONObject jRst = null;
try {
jRst = HXSdk.asyncOpenBillReceive(order, emisBaseInvoiceChInfo.getToken());
}catch(Exception ex){
ex.printStackTrace();
throw new EmisBizError(EmisBizErrorType.FAIL,"航信税金系统出错，请联系航信人员");
}
// 如果token失效则重新获取token再触发一次 // 如果token失效则重新获取token再触发一次
/* /*
"code": "B0301", "code": "B0301",