增加入库单
							parent
							
								
									ae327d231f
								
							
						
					
					
						commit
						c50f674f66
					
				| 
						 | 
				
			
			@ -1,18 +1,15 @@
 | 
			
		|||
package net.lab1024.sa.admin.module.business.receive.asn.controller;
 | 
			
		||||
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnAddForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnUpdateForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.service.AsnService;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.service.AsnQueryService;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.service.AsnService;
 | 
			
		||||
import net.lab1024.sa.base.common.domain.ValidateList;
 | 
			
		||||
import org.springframework.web.bind.annotation.GetMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.PathVariable;
 | 
			
		||||
import org.springframework.web.bind.annotation.*;
 | 
			
		||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
 | 
			
		||||
import net.lab1024.sa.base.common.domain.PageResult;
 | 
			
		||||
import org.springframework.web.bind.annotation.PostMapping;
 | 
			
		||||
import org.springframework.web.bind.annotation.RequestBody;
 | 
			
		||||
import org.springframework.web.bind.annotation.RestController;
 | 
			
		||||
import io.swagger.v3.oas.annotations.tags.Tag;
 | 
			
		||||
import io.swagger.v3.oas.annotations.Operation;
 | 
			
		||||
import cn.dev33.satoken.annotation.SaCheckPermission;
 | 
			
		||||
| 
						 | 
				
			
			@ -34,11 +31,14 @@ public class AsnController {
 | 
			
		|||
    @Resource
 | 
			
		||||
    private AsnService asnService;
 | 
			
		||||
 | 
			
		||||
    @Resource
 | 
			
		||||
    private AsnQueryService asnQueryService;
 | 
			
		||||
 | 
			
		||||
    @Operation(summary = "分页查询 @author 霍锦")
 | 
			
		||||
    @PostMapping("/asn/queryPage")
 | 
			
		||||
    @SaCheckPermission("asn:query")
 | 
			
		||||
    public ResponseDTO<PageResult<AsnVO>> queryPage(@RequestBody @Valid AsnQueryForm queryForm) {
 | 
			
		||||
        return ResponseDTO.ok(asnService.queryPage(queryForm));
 | 
			
		||||
        return ResponseDTO.ok(asnQueryService.queryPage(queryForm));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Operation(summary = "添加 @author 霍锦")
 | 
			
		||||
| 
						 | 
				
			
			@ -57,15 +57,15 @@ public class AsnController {
 | 
			
		|||
 | 
			
		||||
    @Operation(summary = "批量删除 @author 霍锦")
 | 
			
		||||
    @PostMapping("/asn/batchDelete")
 | 
			
		||||
    @SaCheckPermission("asn:delete")
 | 
			
		||||
    @SaCheckPermission("asn:batchDelete")
 | 
			
		||||
    public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
 | 
			
		||||
        return asnService.batchDelete(idList);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Operation(summary = "单个删除 @author 霍锦")
 | 
			
		||||
    @GetMapping("/asn/delete/{asnId}")
 | 
			
		||||
    @GetMapping("/asn/delete")
 | 
			
		||||
    @SaCheckPermission("asn:delete")
 | 
			
		||||
    public ResponseDTO<String> batchDelete(@PathVariable Long asnId) {
 | 
			
		||||
    public ResponseDTO<String> delete(@RequestParam Long asnId) {
 | 
			
		||||
        return asnService.delete(asnId);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,9 @@
 | 
			
		|||
package net.lab1024.sa.admin.module.business.receive.asn.dao;
 | 
			
		||||
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO;
 | 
			
		||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 | 
			
		||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 | 
			
		||||
import org.apache.ibatis.annotations.Mapper;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
package net.lab1024.sa.admin.module.business.receive.asn.manager;
 | 
			
		||||
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.dao.AsnDao;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao;
 | 
			
		||||
 | 
			
		||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,33 @@
 | 
			
		|||
package net.lab1024.sa.admin.module.business.receive.asn.service;
 | 
			
		||||
 | 
			
		||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 | 
			
		||||
import jakarta.annotation.Resource;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.base.common.domain.PageResult;
 | 
			
		||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
 | 
			
		||||
import java.util.List;
 | 
			
		||||
 | 
			
		||||
@Service
 | 
			
		||||
public class AsnQueryService {
 | 
			
		||||
 | 
			
		||||
    @Resource
 | 
			
		||||
    private AsnDao asnDao;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 分页查询
 | 
			
		||||
     *
 | 
			
		||||
     * @param queryForm 查询条件
 | 
			
		||||
     * @return PageResult<AsnVO>
 | 
			
		||||
     */
 | 
			
		||||
    public PageResult<AsnVO> queryPage(AsnQueryForm queryForm) {
 | 
			
		||||
        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
 | 
			
		||||
        List<AsnVO> list = asnDao.queryPage(page, queryForm);
 | 
			
		||||
        return SmartPageUtil.convert2PageResult(page, list);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,12 +1,13 @@
 | 
			
		|||
package net.lab1024.sa.admin.module.business.receive.asn.service;
 | 
			
		||||
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.dao.AsnDao;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnAddForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.form.AsnUpdateForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.entity.AsnEntity;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnAddForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnQueryForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.form.AsnUpdateForm;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO;
 | 
			
		||||
import net.lab1024.sa.admin.module.business.receive.asn.manager.AsnManager;
 | 
			
		||||
import net.lab1024.sa.base.common.util.SmartBeanUtil;
 | 
			
		||||
import net.lab1024.sa.base.common.util.SmartPageUtil;
 | 
			
		||||
import net.lab1024.sa.base.common.domain.ResponseDTO;
 | 
			
		||||
| 
						 | 
				
			
			@ -20,9 +21,9 @@ import jakarta.annotation.Resource;
 | 
			
		|||
/**
 | 
			
		||||
 * 入库单 Service
 | 
			
		||||
 *
 | 
			
		||||
 * @Author 霍锦
 | 
			
		||||
 * @Date 2025-03-26 15:10:02
 | 
			
		||||
 * @Copyright 友仓
 | 
			
		||||
 * @author 霍锦
 | 
			
		||||
 * @since  2025-03-26 15:10:02
 | 
			
		||||
 * copyright 友仓
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
@Service
 | 
			
		||||
| 
						 | 
				
			
			@ -31,21 +32,14 @@ public class AsnService {
 | 
			
		|||
    @Resource
 | 
			
		||||
    private AsnDao asnDao;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 分页查询
 | 
			
		||||
     *
 | 
			
		||||
     * @param queryForm
 | 
			
		||||
     * @return
 | 
			
		||||
     */
 | 
			
		||||
    public PageResult<AsnVO> queryPage(AsnQueryForm queryForm) {
 | 
			
		||||
        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
 | 
			
		||||
        List<AsnVO> list = asnDao.queryPage(page, queryForm);
 | 
			
		||||
        PageResult<AsnVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
 | 
			
		||||
        return pageResult;
 | 
			
		||||
    }
 | 
			
		||||
    @Resource
 | 
			
		||||
    private AsnManager asnManager;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
   /**
 | 
			
		||||
     * 添加
 | 
			
		||||
     *
 | 
			
		||||
     * @param addForm 添加参数
 | 
			
		||||
     * @return ResponseDTO<String>
 | 
			
		||||
     */
 | 
			
		||||
    public ResponseDTO<String> add(AsnAddForm addForm) {
 | 
			
		||||
        AsnEntity asnEntity = SmartBeanUtil.copy(addForm, AsnEntity.class);
 | 
			
		||||
| 
						 | 
				
			
			@ -56,8 +50,8 @@ public class AsnService {
 | 
			
		|||
    /**
 | 
			
		||||
     * 更新
 | 
			
		||||
     *
 | 
			
		||||
     * @param updateForm
 | 
			
		||||
     * @return
 | 
			
		||||
     * @param updateForm 更新参数
 | 
			
		||||
     * @return ResponseDTO<String>
 | 
			
		||||
     */
 | 
			
		||||
    public ResponseDTO<String> update(AsnUpdateForm updateForm) {
 | 
			
		||||
        AsnEntity asnEntity = SmartBeanUtil.copy(updateForm, AsnEntity.class);
 | 
			
		||||
| 
						 | 
				
			
			@ -68,15 +62,15 @@ public class AsnService {
 | 
			
		|||
    /**
 | 
			
		||||
     * 批量删除
 | 
			
		||||
     *
 | 
			
		||||
     * @param idList
 | 
			
		||||
     * @return
 | 
			
		||||
     * @param idList id集合
 | 
			
		||||
     * @return ResponseDTO<String>
 | 
			
		||||
     */
 | 
			
		||||
    public ResponseDTO<String> batchDelete(List<Long> idList) {
 | 
			
		||||
        if (CollectionUtils.isEmpty(idList)){
 | 
			
		||||
            return ResponseDTO.ok();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        asnDao.deleteBatchIds(idList);
 | 
			
		||||
        asnManager.removeBatchByIds(idList);
 | 
			
		||||
        return ResponseDTO.ok();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 | 
			
		||||
<mapper namespace="net.lab1024.sa.admin.module.business.asn.dao.AsnDao">
 | 
			
		||||
<mapper namespace="net.lab1024.sa.admin.module.business.receive.asn.dao.AsnDao">
 | 
			
		||||
 | 
			
		||||
    <!-- 查询结果列 -->
 | 
			
		||||
    <sql id="base_columns">
 | 
			
		||||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
    </sql>
 | 
			
		||||
 | 
			
		||||
    <!-- 分页查询 -->
 | 
			
		||||
    <select id="queryPage" resultType="net.lab1024.sa.admin.module.business.asn.domain.vo.AsnVO">
 | 
			
		||||
    <select id="queryPage" resultType="net.lab1024.sa.admin.module.business.receive.asn.domain.vo.AsnVO">
 | 
			
		||||
        SELECT
 | 
			
		||||
        <include refid="base_columns"/>
 | 
			
		||||
        FROM t_asn
 | 
			
		||||
		Loading…
	
		Reference in New Issue