结算管理分页，退料管理
This commit is contained in:
parent
230e2e234c
commit
d413df98b2
|
|
@ -20,6 +20,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
|
|||
import com.bonus.sgzb.common.log.annotation.Log;
|
||||
import com.bonus.sgzb.common.log.enums.BusinessType;
|
||||
import com.bonus.sgzb.common.security.annotation.Logical;
|
||||
import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit;
|
||||
import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
|
||||
import com.bonus.sgzb.common.security.utils.SecurityUtils;
|
||||
import com.bonus.sgzb.material.domain.SecondLotConfig;
|
||||
|
|
@ -176,6 +177,7 @@ public class TmTaskController extends BaseController {
|
|||
* @return 结果
|
||||
*/
|
||||
@Log(title = "往来单位提交领料申请", businessType = BusinessType.INSERT)
|
||||
@PreventRepeatSubmit
|
||||
@PostMapping("submitLeaseApply")
|
||||
@Transactional
|
||||
public AjaxResult submitLeaseApply(@RequestBody TmTask task) {
|
||||
|
|
|
|||
|
|
@ -75,6 +75,17 @@ public class SelectController {
|
|||
return service.getFourMaTypeList(dto);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据四级查数据
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "根据四级查数据")
|
||||
@PostMapping("getFourMaTypeListTwo")
|
||||
public AjaxResult getFourMaTypeListTwo(@RequestBody SelectDto dto){
|
||||
return service.getFourMaTypeListTwo(dto);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "数据字典下拉选")
|
||||
@PostMapping("getDictByPidCbx")
|
||||
public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import com.bonus.sgzb.base.api.domain.SltAgreementApply;
|
|||
import com.bonus.sgzb.base.api.domain.SltAgreementDetails;
|
||||
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
|
||||
import com.bonus.sgzb.base.api.domain.SltInfoVo;
|
||||
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
|
||||
import com.bonus.sgzb.common.core.utils.ServletUtils;
|
||||
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
|
||||
import com.bonus.sgzb.common.core.web.controller.BaseController;
|
||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||
|
|
@ -36,6 +38,9 @@ import java.net.URLEncoder;
|
|||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
|
||||
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
|
||||
|
||||
/**
|
||||
* @author c liu
|
||||
* @date 2024/2/22
|
||||
|
|
@ -65,10 +70,13 @@ public class SltAgreementInfoController extends BaseController {
|
|||
// @RequiresPermissions("cost:settlement:list")
|
||||
@ApiOperation(value = "根据条件获取协议结算列表")
|
||||
@GetMapping("/getSltAgreementInfo")
|
||||
public TableDataInfo getSltAgreementInfo(AgreementInfo bean) {
|
||||
startPage();
|
||||
public AjaxResult getSltAgreementInfo(AgreementInfo bean) {
|
||||
// startPage();
|
||||
List<AgreementInfo> list = sltAgreementInfoService.getSltAgreementInfo(bean);
|
||||
return getDataTable(list);
|
||||
Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
|
||||
Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
|
||||
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
|
||||
// return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -213,4 +213,6 @@ public interface SelectMapper {
|
|||
List<SelectVo> getMaTypeDataByIdTwo(SelectDto dto);
|
||||
|
||||
List<SelectVo> getFourMaTypeList(SelectDto dto);
|
||||
|
||||
SelectVo getFourMaTypeListTwo(SelectDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,4 +203,6 @@ public interface SelectService {
|
|||
* @return
|
||||
*/
|
||||
AjaxResult getFourMaTypeList(SelectDto dto);
|
||||
|
||||
AjaxResult getFourMaTypeListTwo(SelectDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,6 +114,11 @@ public class SelectServiceImpl implements SelectService {
|
|||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult getFourMaTypeListTwo(SelectDto dto) {
|
||||
SelectVo vo = mapper.getFourMaTypeListTwo(dto);
|
||||
return AjaxResult.success(vo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult getDictByPidCbx(SelectDto dto) {
|
||||
|
|
|
|||
|
|
@ -314,4 +314,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mt.type_id
|
||||
</select>
|
||||
|
||||
<select id="getFourMaTypeListTwo" resultType="com.bonus.sgzb.material.domain.SelectVo">
|
||||
SELECT
|
||||
mt.type_id AS id,
|
||||
mt.type_name AS name,
|
||||
mt.parent_id AS parentId,
|
||||
mt.unit_name AS unit,
|
||||
SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
|
||||
mt.LEVEL,
|
||||
mt.lease_price AS leasePrice,
|
||||
mt.is_storage AS isStorage,
|
||||
mt.is_replace AS isReplace,
|
||||
mt.manage_type AS manageType
|
||||
FROM
|
||||
ma_type mt
|
||||
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
|
||||
WHERE
|
||||
EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId}
|
||||
AND sai2.STATUS = '0' and IFNULL(sai2.lease_type,0) = 0 and sai2.num > 0)
|
||||
and mt.type_id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue