md
This commit is contained in:
parent
bbca02f36f
commit
1cd1ca0326
@ -13,6 +13,10 @@ package com.xdadan.erp.web.emis;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
|
||||
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||
import com.xdadan.erp.emis.service.EmisBaseService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@ -48,6 +52,10 @@ public class EmisSettleSubBillController extends BaseController
|
||||
@Autowired
|
||||
private IEmisSettleSubBillService emisSettleSubBillService;
|
||||
|
||||
@Autowired
|
||||
private EmisBaseService emisBaseService;
|
||||
|
||||
|
||||
/**
|
||||
* 查询结算子账单列表
|
||||
*/
|
||||
@ -131,4 +139,69 @@ public class EmisSettleSubBillController extends BaseController
|
||||
{
|
||||
return toAjax(emisSettleSubBillService.deleteEmisSettleSubBillByIds(ids));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 中心确认账单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:confirmBillByCenter')")
|
||||
@Log(title = "中心确认通过", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/auditCenterPass/{ids}")
|
||||
public AjaxResult confirmBillByCenter(@PathVariable Long[] ids)
|
||||
{
|
||||
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.setId(id);
|
||||
|
||||
emisBaseService.confirmBillByCenter(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:cancelConfirmBillByCenter')")
|
||||
@Log(title = "中心取消确认账单", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/cancelConfirmBillByCenter/{ids}")
|
||||
public AjaxResult cancelConfirmBillByCenter(@PathVariable Long[] ids)
|
||||
{
|
||||
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.setId(id);
|
||||
|
||||
emisBaseService.cancelConfirmBillByCenter(emisSettleSubBill);
|
||||
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
// 返回子定义异常
|
||||
if(ex instanceof EmisBizError){
|
||||
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
|
||||
}
|
||||
|
||||
return AjaxResult.error("确认异常,联系客服");
|
||||
}
|
||||
}
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
}
|
||||
|
||||
@ -62,6 +62,14 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
|
||||
*/
|
||||
public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill);
|
||||
|
||||
// 财务中心取消和确认
|
||||
public int confirmBillByCenter(EmisSettleSubBill emisSettleSubBill);
|
||||
public int cancelConfirmBillByCenter(EmisSettleSubBill emisSettleSubBill);
|
||||
|
||||
// 业务取消和确认
|
||||
public int confirmBillBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
public int cancelConfirmBillBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
|
||||
@ -960,6 +960,23 @@ public class EmisBaseService {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 财务账单确认
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int confirmBillByCenter(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.confirmBillByCenter(emisSettleSubBill);
|
||||
}
|
||||
|
||||
/**
|
||||
* 财务账单取消
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int cancelConfirmBillByCenter(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.cancelConfirmBillByCenter(emisSettleSubBill);
|
||||
}
|
||||
|
||||
/**
|
||||
* 短信发送
|
||||
|
||||
@ -227,6 +227,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where id = #{id}
|
||||
</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>
|
||||
<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="cancelConfirmBillByCenter" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '0',
|
||||
confirm_date = null,
|
||||
confirm_man_code =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>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="confirmBillBySite" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_site_confirm = '1',
|
||||
site_confirm_date = now(),
|
||||
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
|
||||
<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="cancelConfirmBillBySite" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '0',
|
||||
site_confirm_date = null,
|
||||
site_confirm_man_code =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>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<delete id="deleteEmisSettleSubBillById" parameterType="Long">
|
||||
delete from emis_settle_sub_bill where id = #{id}
|
||||
</delete>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user