新购验收人接口开发
This commit is contained in:
parent
66a5665ad3
commit
e5409ef524
|
|
@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
|
||||
/**
|
||||
* 领料任务Service业务层处理
|
||||
*
|
||||
*
|
||||
* @author xsheng
|
||||
* @date 2024-10-16
|
||||
*/
|
||||
|
|
@ -169,7 +169,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
|
||||
/**
|
||||
* 查询领料任务列表
|
||||
*
|
||||
*
|
||||
* @param leaseApplyInfo 领料任务
|
||||
* @return 领料任务
|
||||
*/
|
||||
|
|
@ -398,7 +398,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
}
|
||||
return count;
|
||||
}*/
|
||||
|
||||
|
||||
/**
|
||||
* 发布任务
|
||||
*
|
||||
|
|
@ -511,7 +511,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
|
||||
/**
|
||||
* 修改领料任务
|
||||
*
|
||||
*
|
||||
* @param leaseApplyRequestVo 领料任务
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -644,7 +644,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
|
||||
/**
|
||||
* 批量删除领料任务
|
||||
*
|
||||
*
|
||||
* @param ids 需要删除的领料任务主键
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -655,7 +655,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
|
||||
/**
|
||||
* 删除领料任务信息
|
||||
*
|
||||
*
|
||||
* @param id 领料任务主键
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -690,6 +690,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
recordList = recordList.stream().filter(item -> item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())).collect(Collectors.toList());
|
||||
if (recordList.size() > 0) {
|
||||
msg = "监测到" + bmQrcodeInfo.getQrCode() + "符合出库条件,请确认是否出库!";
|
||||
}else{
|
||||
msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件，请检查后重新提交!";
|
||||
}
|
||||
} else {
|
||||
msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件，请检查后重新提交!";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE;
|
|||
|
||||
/**
|
||||
* 新购验收任务Controller
|
||||
*
|
||||
*
|
||||
* @author syruan
|
||||
*/
|
||||
@Api(tags = "新购管理接口")
|
||||
|
|
@ -65,6 +65,16 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
return success(purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取新购验收人信息
|
||||
*/
|
||||
@ApiOperation("获取新购验收人信息")
|
||||
//@RequiresPermissions("purchase:info:query")
|
||||
@GetMapping(value = "/getCheckUserList")
|
||||
public AjaxResult getCheckUserList(@NotNull(message = "请求对象不能为空") PurchaseQueryDto purchaseQueryDto) {
|
||||
return success(purchaseCheckInfoService.selectPurchaseCheckUserById(purchaseQueryDto));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增新购验收任务
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -136,4 +136,14 @@ public class PurchaseCheckInfo extends BaseEntity {
|
|||
@ApiModelProperty(value = "新购模块阶段名称")
|
||||
private String modelName;
|
||||
|
||||
|
||||
private String checkUser;
|
||||
|
||||
public String getCheckUser() {
|
||||
return checkUser;
|
||||
}
|
||||
|
||||
public void setCheckUser(String checkUser) {
|
||||
this.checkUser = checkUser;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
|
|||
|
||||
/**
|
||||
* 新购验收任务Mapper接口
|
||||
*
|
||||
*
|
||||
* @author xsheng
|
||||
* @date 2024-10-16
|
||||
*/
|
||||
public interface PurchaseCheckInfoMapper {
|
||||
/**
|
||||
* 查询新购验收任务
|
||||
*
|
||||
*
|
||||
* @param id 新购验收任务主键
|
||||
* @return 新购验收任务
|
||||
*/
|
||||
|
|
@ -22,7 +22,7 @@ public interface PurchaseCheckInfoMapper {
|
|||
|
||||
/**
|
||||
* 查询新购验收任务列表--单表基础查询
|
||||
*
|
||||
*
|
||||
* @param purchaseCheckInfo 新购验收任务
|
||||
* @return 新购验收任务集合
|
||||
*/
|
||||
|
|
@ -46,7 +46,7 @@ public interface PurchaseCheckInfoMapper {
|
|||
|
||||
/**
|
||||
* 新增新购验收任务
|
||||
*
|
||||
*
|
||||
* @param purchaseCheckInfo 新购验收任务
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -54,7 +54,7 @@ public interface PurchaseCheckInfoMapper {
|
|||
|
||||
/**
|
||||
* 修改新购验收任务
|
||||
*
|
||||
*
|
||||
* @param purchaseCheckInfo 新购验收任务
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -62,7 +62,7 @@ public interface PurchaseCheckInfoMapper {
|
|||
|
||||
/**
|
||||
* 删除新购验收任务
|
||||
*
|
||||
*
|
||||
* @param id 新购验收任务主键
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -70,9 +70,11 @@ public interface PurchaseCheckInfoMapper {
|
|||
|
||||
/**
|
||||
* 批量删除新购验收任务
|
||||
*
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
int deletePurchaseCheckInfoByIds(Long[] ids);
|
||||
|
||||
List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ import com.bonus.material.purchase.domain.vo.PurchaseVerifyVo;
|
|||
|
||||
/**
|
||||
* 新购验收任务Service接口
|
||||
*
|
||||
*
|
||||
* @author syruan
|
||||
*/
|
||||
public interface IPurchaseCheckInfoService {
|
||||
/**
|
||||
* 查询新购验收任务
|
||||
*
|
||||
*
|
||||
* @param purchaseQueryDto 新购验收请求条件封装dto
|
||||
* @return 新购验收任务
|
||||
*/
|
||||
|
|
@ -26,7 +26,7 @@ public interface IPurchaseCheckInfoService {
|
|||
|
||||
/**
|
||||
* 查询新购验收任务列表
|
||||
*
|
||||
*
|
||||
* @param purchaseQueryDto 新购验收任务
|
||||
* @return 新购验收任务集合
|
||||
*/
|
||||
|
|
@ -36,7 +36,7 @@ public interface IPurchaseCheckInfoService {
|
|||
|
||||
/**
|
||||
* 新增新购验收任务
|
||||
*
|
||||
*
|
||||
* @param purchaseCheckDto 新购验收任务dto
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -60,7 +60,7 @@ public interface IPurchaseCheckInfoService {
|
|||
|
||||
/**
|
||||
* 修改新购验收任务
|
||||
*
|
||||
*
|
||||
* @param purchaseCheckDto 新购验收任务
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -68,7 +68,7 @@ public interface IPurchaseCheckInfoService {
|
|||
|
||||
/**
|
||||
* 批量删除新购验收任务
|
||||
*
|
||||
*
|
||||
* @param ids 需要删除的新购验收任务主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
|
|
@ -76,9 +76,11 @@ public interface IPurchaseCheckInfoService {
|
|||
|
||||
/**
|
||||
* 删除新购验收任务信息
|
||||
*
|
||||
*
|
||||
* @param id 新购验收任务主键
|
||||
* @return 结果
|
||||
*/
|
||||
int deletePurchaseCheckInfoById(Long id);
|
||||
|
||||
List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -688,4 +688,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
|
|||
public int deletePurchaseCheckInfoById(Long id) {
|
||||
return purchaseCheckInfoMapper.deletePurchaseCheckInfoById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurchaseCheckInfo> selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto) {
|
||||
return purchaseCheckInfoMapper.selectPurchaseCheckUserById(purchaseQueryDto);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="remark" column="remark" />
|
||||
<result property="companyId" column="company_id" />
|
||||
<result property="taskStatus" column="task_status" />
|
||||
<result property="checkUser" column="checkUser" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo" id="PurchaseCheckFormResult">
|
||||
|
|
@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
|
||||
<include refid="selectPurchaseCheckInfoBaseSQL"/>
|
||||
<where>
|
||||
<where>
|
||||
<if test="taskId != null "> and task_id = #{taskId}</if>
|
||||
<if test="purchaseTime != null "> and purchase_time = #{purchaseTime}</if>
|
||||
<if test="arrivalTime != null "> and arrival_time = #{arrivalTime}</if>
|
||||
|
|
@ -61,12 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="companyId != null "> and company_id = #{companyId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectPurchaseCheckInfoById" parameterType="Long" resultMap="PurchaseCheckInfoResult">
|
||||
<include refid="selectPurchaseCheckInfoBaseSQL"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertPurchaseCheckInfo" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into purchase_check_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
|
|
@ -123,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</delete>
|
||||
|
||||
<delete id="deletePurchaseCheckInfoByIds" parameterType="String">
|
||||
delete from purchase_check_info where id in
|
||||
delete from purchase_check_info where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
|
@ -152,4 +153,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="taskId != null "> and pci.task_id = #{taskId}</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
<select id="selectPurchaseCheckUserById" resultMap="PurchaseCheckInfoResult">
|
||||
|
||||
select
|
||||
id, task_id as taskId, auditor as userId, su.nick_name AS checkUser,org_id as orgId
|
||||
from
|
||||
purchase_audit_record pur
|
||||
LEFT JOIN sys_user su on pur.auditor = su.user_id
|
||||
where
|
||||
task_id =#{taskId}
|
||||
GROUP BY auditor
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<delete id="deleteReduceDetail">
|
||||
delete
|
||||
from slt_reduce_details
|
||||
where apply_id = #{id};
|
||||
delete
|
||||
from bm_file_info
|
||||
where model_id = #{id}
|
||||
where apply_id = #{id}
|
||||
|
||||
</delete>
|
||||
|
||||
<select id="selectSltAgreementReduceList" parameterType="com.bonus.material.settlement.domain.SltAgreementReduce" resultMap="SltAgreementReudceResult">
|
||||
|
|
|
|||
Loading…
Reference in New Issue