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-01-03 13:57:38 +08:00
parent 8251c95143
commit fadf0771d2
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillDeclareGoodsController.java
View File

@ -51,7 +51,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
/** /**
* 查询申报物品列表 * 查询申报物品列表
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')") // @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(EmisWaybillDeclareGoods emisWaybillDeclareGoods) public TableDataInfo list(EmisWaybillDeclareGoods emisWaybillDeclareGoods)
{ {
@ -67,7 +67,7 @@ public class EmisWaybillDeclareGoodsController extends BaseController
* @param emisWaybillDeclareGoods * @param emisWaybillDeclareGoods
* @return 数量 * @return 数量
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')") // @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:list')")
@GetMapping("/checkUnique") @GetMapping("/checkUnique")
public AjaxResult checkUnique(EmisWaybillDeclareGoods emisWaybillDeclareGoods) 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) @Log(title = "申报物品", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, EmisWaybillDeclareGoods emisWaybillDeclareGoods) 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}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long 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) @Log(title = "申报物品", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody EmisWaybillDeclareGoods emisWaybillDeclareGoods) public AjaxResult add(@RequestBody EmisWaybillDeclareGoods emisWaybillDeclareGoods)
{ {
if(StringUtils.isEmpty(emisWaybillDeclareGoods.getBillCode())){
return AjaxResult.error("运单号不能为空");
}
return toAjax(emisWaybillDeclareGoodsService.insertEmisWaybillDeclareGoods(emisWaybillDeclareGoods)); return toAjax(emisWaybillDeclareGoodsService.insertEmisWaybillDeclareGoods(emisWaybillDeclareGoods));
} }
/** /**
* 修改申报物品 * 修改申报物品
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:edit')") // @PreAuthorize("@ss.hasPermi('emis:emisWaybillDeclareGoods:edit')")
@Log(title = "申报物品", businessType = BusinessType.UPDATE) @Log(title = "申报物品", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody EmisWaybillDeclareGoods emisWaybillDeclareGoods) 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) @Log(title = "申报物品", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)

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

@ -148,6 +148,19 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
newApply.setInvoiceStatus("2"); newApply.setInvoiceStatus("2");
newApply.setOpenChStatus("2"); newApply.setOpenChStatus("2");
emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply); 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 { }else {
emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply); emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
} }