Merge remote-tracking branch 'origin/master'
anthonywj
2 years ago
commit
e963f74448
@ -0,0 +1,130 @@
|
||||
package com.glxp.api.controller.inv;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.common.enums.ResultEnum;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.entity.inv.InvMAOrderEntity;
|
||||
import com.glxp.api.req.inv.FilterInvMAOrderRequest;
|
||||
import com.glxp.api.res.inv.InvMAOrderResponse;
|
||||
import com.glxp.api.service.inv.InvMAOrderService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 库存养护记录接口
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class InvMAOrderController {
|
||||
|
||||
@Resource
|
||||
private InvMAOrderService invMAOrderService;
|
||||
|
||||
/**
|
||||
* 查询养护记录列表
|
||||
*
|
||||
* @param filterInvMAOrderRequest
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/inv/MA/order/filterList")
|
||||
public BaseResponse filterList(FilterInvMAOrderRequest filterInvMAOrderRequest) {
|
||||
List<InvMAOrderResponse> list = invMAOrderService.filterList(filterInvMAOrderRequest);
|
||||
PageInfo<InvMAOrderResponse> pageInfo = new PageInfo<>(list);
|
||||
return ResultVOUtils.page(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加养护记录
|
||||
*
|
||||
* @param invMAOrderEntity
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/addOrder")
|
||||
public BaseResponse addOrder(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
return invMAOrderService.addOrder(invMAOrderEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新养护记录
|
||||
*
|
||||
* @param invMaintenanceOrder
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/update")
|
||||
public BaseResponse update(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == invMAOrderEntity || StrUtil.isBlank(invMAOrderEntity.getOrderId())) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
|
||||
}
|
||||
return invMAOrderService.update(invMAOrderEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交审核
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/submitAudit")
|
||||
public BaseResponse submitAudit(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空");
|
||||
}
|
||||
return invMAOrderService.submitAudit(filterInvMAOrderRequest.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新养护记录状态
|
||||
*
|
||||
* @param filterInvMAOrderRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/updateStatus")
|
||||
public BaseResponse updateStatus(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId() || null == filterInvMAOrderRequest.getStatus()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
|
||||
}
|
||||
return invMAOrderService.updateStatus(filterInvMAOrderRequest.getId(), filterInvMAOrderRequest.getStatus());
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除养护记录
|
||||
*
|
||||
* @param filterInvMAOrderRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/delete")
|
||||
public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
|
||||
}
|
||||
return invMAOrderService.delete(filterInvMAOrderRequest.getId());
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,116 @@
|
||||
package com.glxp.api.controller.inv;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.common.enums.ResultEnum;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.entity.inv.InvMAOrderDetailEntity;
|
||||
import com.glxp.api.req.inv.AddInvMAOrderDetailRequest;
|
||||
import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest;
|
||||
import com.glxp.api.res.inv.InvMAOrderDetailResponse;
|
||||
import com.glxp.api.service.inv.InvMAOrderDetailService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 库存养护记录详情接口
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class InvMAOrderDetailController {
|
||||
|
||||
@Resource
|
||||
private InvMAOrderDetailService invMAOrderDetailService;
|
||||
|
||||
/**
|
||||
* 查询养护记录详情
|
||||
*
|
||||
* @param filterInvMAOrderDetailRequest
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/inv/MA/order/detail/filterList")
|
||||
public BaseResponse filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest) {
|
||||
List<InvMAOrderDetailResponse> list = invMAOrderDetailService.filterList(filterInvMAOrderDetailRequest);
|
||||
PageInfo<InvMAOrderDetailResponse> pageInfo = new PageInfo<>(list);
|
||||
return ResultVOUtils.page(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 扫码添加养护记录详情
|
||||
*
|
||||
* @param invMAOrderDetailEntity
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/detail/addOrderDetail")
|
||||
public BaseResponse addOrderDetail(@RequestBody InvMAOrderDetailEntity invMAOrderDetailEntity, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == invMAOrderDetailEntity || StrUtil.isBlank(invMAOrderDetailEntity.getCode()) || StrUtil.isBlank(invMAOrderDetailEntity.getOrderIdFk())) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空");
|
||||
}
|
||||
return invMAOrderDetailService.addOrderDetail(invMAOrderDetailEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 选中库存详情批量添加养护记录详情
|
||||
*
|
||||
* @param invProductIds
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/detail/batchAddDetail")
|
||||
public BaseResponse batchAddDetail(@RequestBody AddInvMAOrderDetailRequest addMAOrderDetailRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == addMAOrderDetailRequest || CollUtil.isEmpty(addMAOrderDetailRequest.getInvProductIds()) || StrUtil.isBlank(addMAOrderDetailRequest.getOrderIdFk())) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
|
||||
}
|
||||
return invMAOrderDetailService.batchAddDetail(addMAOrderDetailRequest);
|
||||
}
|
||||
|
||||
/**
|
||||
* 减一
|
||||
*
|
||||
* @param filterInvMAOrderDetailRequest
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/detail/delete")
|
||||
public BaseResponse delete(@RequestBody FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == filterInvMAOrderDetailRequest || null == filterInvMAOrderDetailRequest.getId()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空");
|
||||
}
|
||||
return invMAOrderDetailService.delete(filterInvMAOrderDetailRequest.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新库存养护记录详情
|
||||
*
|
||||
* @param invMAOrderDetailEntity
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/inv/MA/order/detail/update")
|
||||
public BaseResponse update(@RequestBody InvMAOrderDetailEntity invMAOrderDetailEntity, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (null == invMAOrderDetailEntity || null == invMAOrderDetailEntity.getId()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
|
||||
}
|
||||
return invMAOrderDetailService.update(invMAOrderDetailEntity);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,9 @@
|
||||
<?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="com.glxp.api.dao.inv.InvMAExplanationDao">
|
||||
|
||||
<select id="selectByStatus" resultType="com.glxp.api.entity.inv.InvMAExplanationEntity">
|
||||
select *
|
||||
from inv_ma_explanation
|
||||
where status = #{status}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -1,5 +1,43 @@
|
||||
<?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="com.glxp.api.dao.inv.InvMAOrderDao">
|
||||
|
||||
<select id="filterList" resultType="com.glxp.api.res.inv.InvMAOrderResponse">
|
||||
select ma.id,
|
||||
ma.orderId,
|
||||
ma.invCode,
|
||||
ma.invSpaceCode,
|
||||
ma.status,
|
||||
ma.createTime,
|
||||
ma.updateTime,
|
||||
ma.auditTime,
|
||||
ma.createUser,
|
||||
ma.auditUser,
|
||||
(select name from auth_user where id = ma.createUser) createUserName,
|
||||
(select name from auth_user where id = ma.auditUser) auditUserName,
|
||||
ma.remark,
|
||||
auth_warehouse.name invName,
|
||||
auth_space.name invSpaceName
|
||||
from inv_ma_order ma
|
||||
left join auth_warehouse on ma.invCode = auth_warehouse.code
|
||||
left join auth_space
|
||||
on ma.invSpaceCode = auth_space.code and auth_warehouse.code = auth_space.invWarehouseCode
|
||||
<where>
|
||||
<if test="id != null">
|
||||
AND ma.id = #{id}
|
||||
</if>
|
||||
<if test="orderId != null and orderId != ''">
|
||||
AND ma.orderId = #{orderId}
|
||||
</if>
|
||||
<if test="invCode != null and invCode != ''">
|
||||
AND ma.invCode = #{invCode}
|
||||
</if>
|
||||
<if test="invSpaceCode != null and invSpaceCode != ''">
|
||||
AND ma.invSpaceCode = #{invSpaceCode}
|
||||
</if>
|
||||
<if test="status != null">
|
||||
AND ma.status = #{status}
|
||||
</if>
|
||||
</where>
|
||||
order by ma.updateTime desc
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue