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 f386b1e6d..6fd2d620a 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 @@ -24,6 +24,7 @@ import com.xdadan.erp.common.utils.SecurityUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.BillPayStatInfo; +import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; import com.xdadan.erp.emis.domain.vo.AddressParseResult; import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.kefu.RL7moorService; @@ -408,7 +409,7 @@ public class EmisCommonController extends EmisBaseController @GetMapping("/getBillPng/{uuid}") public void getBillPng(HttpServletRequest request, HttpServletResponse response,@PathVariable("uuid")String uuid ) { -// "https://api.emis.tanex56.com/api/bizsvr/emis/common/getBillPng/123123212.png" +// "https://api-emis.tanex56.com/api/bizsvr/emis/common/getBillPng/123123212.png" if(StringUtils.isEmpty(uuid)){ log.debug("参数错误"); return; @@ -586,7 +587,6 @@ public class EmisCommonController extends EmisBaseController } - @GetMapping("/autoQueryInvoiceStatusTrigger") public AjaxResult autoQueryInvoiceStatusTrigger(){ String lockKey="autoQueryInvoiceStatusTrigger"; @@ -1127,9 +1127,9 @@ public class EmisCommonController extends EmisBaseController @GetMapping("/autoDoGenerateNotifyTrigger") public AjaxResult autoDoSendNotifyTrigger() { // 0.催款,有超期回款的5分钟催一次 - EmisSettleBill emisSettleBill=new EmisSettleBill(); - emisSettleBill.getParams().put("isNeedRecdPay",1); - List listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill); + EmisSettleBill queryRecBill=new EmisSettleBill(); + queryRecBill.getParams().put("isNeedRecdPay",1); + List listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(queryRecBill); if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){ for (BillPayStatInfo item:listExpireNoPayStatInfo) { String salesmen=item.getSalesmen(); @@ -1140,16 +1140,22 @@ public class EmisCommonController extends EmisBaseController } } - - // 1.销售开票统计通知 + EmisSettleBill queryInvoice=new EmisSettleBill(); + queryInvoice.getParams().put("isNeedRecdInvoice",1); + List listExpireNoInvoiceStatInfo = emisSettleBillService.selectOpenBillStatInfoList(queryInvoice); + if(!CollectionUtils.isEmpty(listExpireNoInvoiceStatInfo)){ + for (OpenBillStatInfo item:listExpireNoInvoiceStatInfo) { + String salesmen=item.getSalesmen(); + String billMonth=item.getBillMonth(); + String msg="截止"+DateUtils.parseDateToStr("yyyy-MM-dd HH点",new Date())+" 有账单未开票,尽快联系客户开票，账期:"+billMonth+",待开票:"+item.getNoOpenBillCount()+"，超期未开票:"+item.getExpiredNoOpenBillCount()+"!"; + AjaxResult rst=NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3); + log.info(msg); + } + } // 2.开票收款统计通知 - - -// sysNoticeService. - // if(empcodes!=null && empcodes.length>0) { // for(int i=0;i1){ + emisTmsCostProfit.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + List list = emisTmsCostProfitService.selectEmisTmsCostProfitList(emisTmsCostProfit); return getDataTable(list); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java index 4f8b095da..303ac5fb9 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java @@ -72,7 +72,7 @@ public class EmisTransLineController extends EmisBaseController * 查询线路列表 -- 精简 */ // @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')") - @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate",},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @GetMapping("/listSimple") public TableDataInfo listSimple(EmisTransLine emisTransLine) { @@ -84,6 +84,8 @@ public class EmisTransLineController extends EmisBaseController emisTransLine.getParams().put("needFilterLogoTyoe","1"); } + + startPage(); List list = emisTransLineService.selectEmisTransLineList(emisTransLine); return getDataTable(list); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java index e159959c2..53bec4c3a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java @@ -130,7 +130,17 @@ public class EmisWaybillAjustApplyController extends EmisBaseController @PostMapping public AjaxResult add(@RequestBody EmisWaybillAjustApply emisWaybillAjustApply) { - return toAjax(emisWaybillAjustApplyService.insertEmisWaybillAjustApply(emisWaybillAjustApply)); + try { + return toAjax(emisWaybillAjustApplyService.insertEmisWaybillAjustApply(emisWaybillAjustApply)); + }catch (Exception ex){ + ex.printStackTrace(); + // 返回子定义异常 + if(ex instanceof EmisBizError){ + return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); + } + return AjaxResult.error("申请异常，联系客服"); + } + } /** diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 7e4f31b12..f04bf1ab9 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -1075,7 +1075,7 @@ public class EmisWaybillController extends EmisBaseController jObj.put("result", "success"); // jObj.put("billCodeItem", item); // jObj.put("file", pdfBase64Data); - String imageUrl="https://api.emis.tanex56.com/api/bizsvr/emis/common/getBillPng/"+uuid; + String imageUrl="https://api-emis.jtrs56.com/api/bizsvr/emis/common/getBillPng/"+uuid; jObj.put("imageUrl", imageUrl); jObj.put("fileType", "URL"); @@ -1114,7 +1114,7 @@ public class EmisWaybillController extends EmisBaseController jObj.put("result", "success"); // jObj.put("billCodeItem", item); // jObj.put("file", pdfBase64Data); - String imageUrl="https://api.emis.tanex56.com/api/bizsvr/emis/common/getBillPng/"+uuid; + String imageUrl="https://api-emis.jtrs56.com/api/bizsvr/emis/common/getBillPng/"+uuid; jObj.put("imageUrl", imageUrl); jObj.put("fileType", "URL"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 6f88eb91b..b6b06e325 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -194,6 +194,9 @@ public interface EmisWaybillMapper extends BaseMapper public int checkWaybillIsSign(@Param("billCode")String billCode); + // 判断是否已经接单 + public int checkWaybillIsConfirm(@Param("billCode")String billCode); + /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java index 20c01f92a..db9f30381 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java @@ -78,5 +78,13 @@ public interface IEmisSettlePayRecordService public int deleteEmisSettlePayRecordById(Long id); + /** + * 账单退款 + * @param id + * @return + */ + public int payRecordReturn(Long id) throws EmisBizError; + + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java index b445c48bd..8a2bb5b14 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java @@ -53,7 +53,7 @@ public interface IEmisWaybillAjustApplyService * @param emisWaybillAjustApply 运单调整申请 * @return 结果 */ - public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply); + public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError; /** * 修改运单调整申请 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index a84157408..700e1e3ab 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -38,7 +38,6 @@ import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo; import com.xdadan.erp.emis.mapper.*; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.excelCellStrategy.CellStyleStrategy; -import com.xdadan.erp.emis.service.excelCellStrategy.CustomCellWriteHandler; import com.xdadan.erp.emis.utils.WaybillHelper; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -175,13 +174,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS @Override public int insertEmisSettleBill(EmisSettleBill emisSettleBill) throws EmisBizError { // 检查子账单是否可加入 - if(CollectionUtil.isEmpty(emisSettleBill.getSubBillList())){ throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,未选择子账单"); } - int cnt=emisSettleBillMapper.checkUnique(emisSettleBill); - if(cnt>1){ + int cnt = emisSettleBillMapper.checkUnique(emisSettleBill); + if( cnt > 1 ){ throw new EmisBizError(EmisBizErrorType.FAIL,"账单名称重复"); } @@ -202,8 +200,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS Date sendDate = null; - for (EmisSettleSubBill subBill: emisSettleBill.getSubBillList() - ) { + for ( EmisSettleSubBill subBill: emisSettleBill.getSubBillList() ) { EmisSettleSubBill subBllOld = getSettleSubBillBySubBillNo(subBill.getBillNo()); if(subBllOld==null){ throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子账单["+subBllOld.getBillCode()+"]不存在"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index dd1515f68..f697c82a1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -166,6 +166,27 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return 1; } + /** + * 收款退款 + * @param id + * @return + */ + @Override + public int payRecordReturn(Long id) throws EmisBizError { + + EmisSettlePayRecord payRecordOld=emisSettlePayRecordMapper.selectEmisSettlePayRecordById(id); + if(payRecordOld==null){ + throw new EmisBizError(EmisBizErrorType.FAIL,"收款单不存在！"); + } + + // 删除收款记录 + emisSettlePayRecordMapper.deleteEmisSettlePayRecordById(id); + + // 重新计算账单收款 + emisSettleBillService.reCalcSettleBillPayStatus(payRecordOld.getSettleBillNo()); + + return 1; + } /** 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 60503a024..7ea5539ba 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 @@ -618,6 +618,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } + // bug:1454,未开单不允许扫描 + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index db212a41f..7d2fdfd5b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -92,8 +92,24 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements * @return 结果 */ @Override - public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply) - { + public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError { + + // 判断单号是否存在 + EmisWaybill emisWaybillOld=getWaybillByBillCode(emisWaybillAjustApply.getBillCode()); + if(emisWaybillOld==null){ + throw new EmisBizError(EmisBizErrorType.FAIL,"运单不存在！"); + } + + // 如果有待审核的单子,不允许提交新审核 + EmisWaybillAjustApply queryCond = new EmisWaybillAjustApply(); + queryCond.setBillCode(emisWaybillAjustApply.getBillCode()); + queryCond.getParams().put("processStatus","6"); + List listHasApply=emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyList(queryCond); + if(!CollectionUtils.isEmpty(listHasApply)){ + throw new EmisBizError(EmisBizErrorType.FAIL,"有申请单审核中，待审核后再提交！"); + } + + // 插入数据 emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply); SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java index bffe7abea..73b738cd4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java @@ -89,7 +89,7 @@ public class Kd100Helper { param.put("to", to); param.put("key", KEY); JSONObject parameters = new JSONObject(); - parameters.put("callbackurl", "http://api.emis.tanex56.com/api/bizsvr/emis/common/notifyTraceByKD100"); + parameters.put("callbackurl", "http://api-emis.jtrs56.com/api/bizsvr/emis/common/notifyTraceByKD100"); parameters.put("salt", "tanex56"); parameters.put("phone", phone); parameters.put("resultv2", "4"); diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml index 6dfa6dd9e..46de88355 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml @@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and not exists( select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` in(173,170,151) ) + and b.bl_confirm_site != 2 and a.payment_type in('1','3') and a.trans_line_type=c.line_code and a.payee=#{salesmen} diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 59920106b..50b2d2059 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -273,17 +273,18 @@ diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 89ad761b3..a25bc16d9 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -269,6 +269,11 @@ select count(1) as cnt from emis_waybill where bill_code=#{billCode} and bl_sign='1' limit 1 + + +