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-07-06 15:10:38 +08:00
parent 11aeedbcfc
commit 7b8322e74e
4 changed files with 133 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -14,6 +14,7 @@ package com.xdadan.erp.web.emis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
@ -179,7 +180,7 @@ public class EmisSettleSubBillController extends BaseController
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:cancelConfirmBillByCenter')")
@Log(title = "中心取消确认账单", businessType = BusinessType.UPDATE)
@PostMapping("/cancelConfirmBillByCenter/{ids}")
public AjaxResult cancelConfirmBillByCenter(@PathVariable Long[] ids)
public AjaxResult cancelConfirmBillByCenter(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
@ -187,6 +188,7 @@ public class EmisSettleSubBillController extends BaseController
long id=ids[i];
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode());
emisSettleSubBill.setConfirmNote(spr.getConfirmNote());
emisSettleSubBill.setId(id);
emisBaseService.cancelConfirmBillByCenter(emisSettleSubBill);
@ -204,4 +206,72 @@ public class EmisSettleSubBillController extends BaseController
}
return AjaxResult.success("确认成功");
}
/**
* 中心确认不出账
*/
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:confirmNoBillByCenter')")
@Log(title = "中心确认不出账", businessType = BusinessType.UPDATE)
@PostMapping("/confirmNoBillByCenter/{ids}")
public AjaxResult confirmNoBillByCenter(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode());
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
emisSettleSubBill.setConfirmNote(spr.getConfirmNote());
emisSettleSubBill.setId(id);
emisBaseService.confirmNoBillByCenter(emisSettleSubBill);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("确认异常，联系客服");
}
}
}
return AjaxResult.success("确认成功");
}
/**
* 中心设置账单异常
*/
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:setBillErrorByCenter')")
@Log(title = "中心设置账单异常", businessType = BusinessType.UPDATE)
@PostMapping("/setBillErrorByCenter/{ids}")
public AjaxResult setBillErrorByCenter(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode());
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
emisSettleSubBill.setConfirmNote(spr.getConfirmNote());
emisSettleSubBill.setId(id);
emisBaseService.setBillErrorByCenter(emisSettleSubBill);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("确认异常，联系客服");
}
}
}
return AjaxResult.success("确认成功");
}
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
View File

@ -65,10 +65,13 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
*/
public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill);
// 财务中心取消和确认
// 财务中心取消和确认,确认不出账，设置异常
public int confirmBillByCenter(EmisSettleSubBill emisSettleSubBill);
public int cancelConfirmBillByCenter(EmisSettleSubBill emisSettleSubBill);
public int confirmNoBillByCenter(EmisSettleSubBill emisSettleSubBill);
public int setBillErrorByCenter(EmisSettleSubBill emisSettleSubBill);
// 业务取消和确认
public int confirmBillBySite(EmisSettleSubBill emisSettleSubBill);
public int cancelConfirmBillBySite(EmisSettleSubBill emisSettleSubBill);

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

@ -985,6 +985,25 @@ public class EmisBaseService {
return emisSettleSubBillMapper.cancelConfirmBillByCenter(emisSettleSubBill);
}
/**
* 中心确认不出账
* @param emisSettleSubBill
* @return
*/
public int confirmNoBillByCenter(EmisSettleSubBill emisSettleSubBill){
return emisSettleSubBillMapper.confirmNoBillByCenter(emisSettleSubBill);
}
/**
* 中心置账单异常
* @param emisSettleSubBill
* @return
*/
public int setBillErrorByCenter(EmisSettleSubBill emisSettleSubBill){
return emisSettleSubBillMapper.setBillErrorByCenter(emisSettleSubBill);
}
/**
* 短信发送
*/

40
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -234,12 +234,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<!-- 中心确认 -->
<update id="confirmBillByCenter" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">
bl_confirm = '1',
confirm_date = now(),
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
confirm_man_code = #{confirmManCode},
confirm_site = #{confirmSite},
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@ -247,12 +249,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<!-- 中心取消确认 -->
<update id="cancelConfirmBillByCenter" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">
bl_confirm = '0',
confirm_date = null,
confirm_man_code =null,
confirm_site = null,
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@ -260,6 +264,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<!-- 中心确认不出账 3-->
<update id="confirmNoBillByCenter" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">
bl_confirm = '3',
confirm_date = now(),
confirm_man_code = #{confirmManCode},
confirm_site = #{confirmSite},
confirm_note = #{confirmNote},
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<!-- 中心账单设置异常 4 -->
<update id="setBillErrorByCenter" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">
bl_confirm = '4',
confirm_date = now(),
confirm_man_code = #{confirmManCode},
confirm_site = #{confirmSite},
confirm_note = #{confirmNote},
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<!-- 站点确认 -->
<update id="confirmBillBySite" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">
@ -273,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<!-- 站点取消确认 -->
<update id="cancelConfirmBillBySite" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill
<trim prefix="SET" suffixOverrides=",">