Merge remote-tracking branch 'origin/master'
郑明梁
2 years ago
commit
e65ba87671
@ -0,0 +1,304 @@
|
||||
package com.glxp.api.controller.purchase;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.annotation.RepeatSubmit;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.Constant;
|
||||
import com.glxp.api.constant.ConstantStatus;
|
||||
import com.glxp.api.constant.ConstantType;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.entity.purchase.PurApplyEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalEntity;
|
||||
import com.glxp.api.req.purchase.PostPurArrivalRequest;
|
||||
import com.glxp.api.req.purchase.PurArrivalRequest;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.purchase.PurArrivalDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurArrivalResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.inout.IoOrderDetailBizService;
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import com.glxp.api.service.purchase.PurArrivalDetailService;
|
||||
import com.glxp.api.service.purchase.PurArrivalService;
|
||||
import com.glxp.api.util.CustomUtil;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
public class PurArrivalController {
|
||||
|
||||
|
||||
@Resource
|
||||
PurArrivalService purArrivalService;
|
||||
|
||||
@Resource
|
||||
PurArrivalDetailService purArrivalDetailService;
|
||||
|
||||
@Resource
|
||||
CustomerService customerService;
|
||||
@Resource
|
||||
GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
IoOrderService ioOrderService;
|
||||
@Resource
|
||||
IoOrderDetailBizService ioOrderDetailBizService;
|
||||
|
||||
|
||||
/**
|
||||
* 新增到货单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/arrival/postOrder")
|
||||
public BaseResponse postOrder(@RequestBody PostPurArrivalRequest purArrivalRequest) {
|
||||
|
||||
Long userId = customerService.getUserId();
|
||||
PurArrivalEntity purArrivalEntity = purArrivalRequest.getPurArrivalEntity();
|
||||
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purArrivalEntity.setStatus(purArrivalRequest.getEditStatus()); //草稿状态
|
||||
|
||||
if (purArrivalRequest.getType() != null) {
|
||||
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SH_ORDER, "yyyyMMdd"));
|
||||
purArrivalEntity.setBillNo(billNo);
|
||||
}
|
||||
|
||||
if (purArrivalEntity.getId() == null) {
|
||||
purArrivalService.insert(purArrivalEntity);
|
||||
} else {
|
||||
purArrivalService.update(purArrivalEntity);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("提交成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和草稿状态
|
||||
*/
|
||||
@GetMapping("/purchase/arrival/list")
|
||||
public BaseResponse list(PurArrivalRequest purArrivalRequest) {
|
||||
|
||||
if (purArrivalRequest.getStatus() == null) {
|
||||
purArrivalRequest.setStatus(11); //查询未审核和草稿状态
|
||||
}
|
||||
|
||||
List<PurArrivalResponse> purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest);
|
||||
PageInfo<PurArrivalResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purArrivalResponses);
|
||||
PageSimpleResponse<PurArrivalResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purArrivalResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和已审核状态
|
||||
*/
|
||||
@GetMapping("/purchase/arrival/auditList")
|
||||
public BaseResponse auditList(PurArrivalRequest purArrivalRequest) {
|
||||
|
||||
if (purArrivalRequest.getStatus() == null) {
|
||||
purArrivalRequest.setStatus(10); //查询未审核和已审核状态
|
||||
}
|
||||
List<PurArrivalResponse> purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest);
|
||||
PageInfo<PurArrivalResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purArrivalResponses);
|
||||
PageSimpleResponse<PurArrivalResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purArrivalResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 审核采购订单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/arrival/auditOrder")
|
||||
public BaseResponse auditOrder(@RequestBody PostPurArrivalRequest postPurArrivalRequest) {
|
||||
Long userId = customerService.getUserId();
|
||||
PurArrivalEntity purArrivalEntity = postPurArrivalRequest.getPurArrivalEntity();
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setAuditUser(userId + "");
|
||||
purArrivalEntity.setStatus(postPurArrivalRequest.getEditStatus());
|
||||
purArrivalService.update(purArrivalEntity);
|
||||
String billNo = "";
|
||||
List<PurArrivalDetailEntity> purOrderDetailEntities = purArrivalDetailService.findByOrderId(purArrivalEntity.getId() + "");
|
||||
|
||||
//对计划单里面的供应商进行分组
|
||||
Map<String, List<PurArrivalDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurArrivalDetailEntity::getSupId));
|
||||
|
||||
if (postPurArrivalRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
|
||||
|
||||
if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurArrivalRequest.isAutoPurchase() == true
|
||||
&& StrUtil.isNotEmpty(postPurArrivalRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurArrivalRequest.getTargetBillAction())) {
|
||||
|
||||
for (Map.Entry<String, List<PurArrivalDetailEntity>> m : map.entrySet()) {
|
||||
//生产单据表信息
|
||||
IoOrderEntity ioOrderEntity = new IoOrderEntity();
|
||||
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
|
||||
ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
|
||||
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
|
||||
ioOrderEntity.setAction(postPurArrivalRequest.getTargetBillAction());
|
||||
ioOrderEntity.setFromCorp(m.getKey());
|
||||
ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
|
||||
ioOrderEntity.setStatus(1);
|
||||
ioOrderEntity.setDealStatus(1);
|
||||
ioOrderEntity.setOrderType(1);
|
||||
ioOrderEntity.setCreateTime(new Date());
|
||||
ioOrderEntity.setCreateUser(postPurArrivalRequest.getPurArrivalEntity().getAuditUser());
|
||||
ioOrderEntity.setUpdateTime(new Date());
|
||||
ioOrderEntity.setUpdateUser(postPurArrivalRequest.getPurArrivalEntity().getAuditUser());
|
||||
ioOrderEntity.setCustomerId("110");
|
||||
ioOrderEntity.setDeptCode(postPurArrivalRequest.getTargetDeptCode());
|
||||
ioOrderEntity.setInvCode(postPurArrivalRequest.getTargetSubInv());
|
||||
ioOrderService.insertOrder(ioOrderEntity);
|
||||
billNo += ioOrderEntity.getBillNo() + ",";
|
||||
//插入业务单表
|
||||
for (PurArrivalDetailEntity obj : m.getValue()) {
|
||||
BasicProductsEntity basicProductsEntity = purArrivalDetailService.selectIoOrderDetailBiz(obj.getId());
|
||||
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
||||
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
|
||||
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
|
||||
ioOrderDetailBizEntity.setCount(obj.getCount());
|
||||
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
|
||||
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
|
||||
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
|
||||
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
|
||||
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
|
||||
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
|
||||
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
|
||||
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
|
||||
if (basicProductsEntity.getPrice() != null) {
|
||||
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
|
||||
}
|
||||
ioOrderDetailBizEntity.setSupId(obj.getSupId());
|
||||
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
|
||||
}
|
||||
}
|
||||
purArrivalEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
|
||||
purArrivalService.update(purArrivalEntity);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("更新成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询采购订单列表
|
||||
*/
|
||||
@GetMapping("/purchase/arrival/list/detail")
|
||||
public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
|
||||
|
||||
List<PurArrivalDetailResponse> purOrderDetailResponseList = purArrivalDetailService.joinQueryList(purApplyDetailRequest);
|
||||
PageInfo<PurArrivalDetailResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purOrderDetailResponseList);
|
||||
PageSimpleResponse<PurArrivalDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purOrderDetailResponseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加产品到采购单里面
|
||||
*/
|
||||
@PostMapping("/purchase/arrival/addOrderDetail")
|
||||
public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) {
|
||||
|
||||
boolean falg = purArrivalDetailService.insert(purOrderDetailEntity);
|
||||
if (falg) {
|
||||
return ResultVOUtils.success("添加成功");
|
||||
} else {
|
||||
return ResultVOUtils.success("添加失败");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增计划单
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/arrival/add")
|
||||
public BaseResponse add() {
|
||||
Long userId = customerService.getUserId();
|
||||
PurArrivalEntity purArrivalEntity = new PurArrivalEntity();
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purArrivalService.insert(purArrivalEntity);
|
||||
Long id = purArrivalEntity.getId();
|
||||
return ResultVOUtils.success(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除申购单和详情
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/arrival/delOrderDetailAll")
|
||||
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
|
||||
|
||||
if (purApplyEntity.getId() != null) {
|
||||
purArrivalService.deleteById(purApplyEntity.getId());
|
||||
purArrivalDetailService.deleteByOrderId(purApplyEntity.getId() + "");
|
||||
} else {
|
||||
return ResultVOUtils.error(999, "参数有误！");
|
||||
}
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改计划详情单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/arrival/updateDetail")
|
||||
public BaseResponse detailEdit(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) {
|
||||
purArrivalDetailService.update(purOrderDetailEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除采购订单
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@DeleteMapping("/purchase/arrival/detail/{ids}")
|
||||
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
|
||||
purArrivalDetailService.deleteByIds(Arrays.asList(ids));
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,303 @@
|
||||
package com.glxp.api.controller.purchase;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.annotation.RepeatSubmit;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.Constant;
|
||||
import com.glxp.api.constant.ConstantStatus;
|
||||
import com.glxp.api.constant.ConstantType;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.entity.purchase.PurApplyEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryEntity;
|
||||
import com.glxp.api.req.purchase.PostPurDeliveryRequest;
|
||||
import com.glxp.api.req.purchase.PurDeliveryRequest;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.purchase.PurDeliveryDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurDeliveryResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.inout.IoOrderDetailBizService;
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import com.glxp.api.service.purchase.PurDeliveryDetailService;
|
||||
import com.glxp.api.service.purchase.PurDeliveryService;
|
||||
import com.glxp.api.util.CustomUtil;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
public class PurDeliveryController {
|
||||
|
||||
|
||||
@Resource
|
||||
PurDeliveryService purDeliveryService;
|
||||
|
||||
@Resource
|
||||
PurDeliveryDetailService purDeliveryDetailService;
|
||||
|
||||
@Resource
|
||||
CustomerService customerService;
|
||||
@Resource
|
||||
GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
IoOrderService ioOrderService;
|
||||
@Resource
|
||||
IoOrderDetailBizService ioOrderDetailBizService;
|
||||
|
||||
|
||||
/**
|
||||
* 新增到货单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/delivery/postOrder")
|
||||
public BaseResponse postOrder(@RequestBody PostPurDeliveryRequest purDeliveryRequest) {
|
||||
|
||||
Long userId = customerService.getUserId();
|
||||
PurDeliveryEntity purArrivalEntity = purDeliveryRequest.getPurDeliveryEntity();
|
||||
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purArrivalEntity.setStatus(purDeliveryRequest.getEditStatus()); //草稿状态
|
||||
|
||||
if (purDeliveryRequest.getType() != null) {
|
||||
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SH_ORDER, "yyyyMMdd"));
|
||||
purArrivalEntity.setBillNo(billNo);
|
||||
}
|
||||
|
||||
if (purArrivalEntity.getId() == null) {
|
||||
purDeliveryService.insert(purArrivalEntity);
|
||||
} else {
|
||||
purDeliveryService.update(purArrivalEntity);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("提交成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和草稿状态
|
||||
*/
|
||||
@GetMapping("/purchase/delivery/list")
|
||||
public BaseResponse list(PurDeliveryRequest purDeliveryRequest) {
|
||||
|
||||
if (purDeliveryRequest.getStatus() == null) {
|
||||
purDeliveryRequest.setStatus(11); //查询未审核和草稿状态
|
||||
}
|
||||
List<PurDeliveryResponse> purDeliveryResponses = purDeliveryService.queryPageList(purDeliveryRequest);
|
||||
PageInfo<PurDeliveryResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purDeliveryResponses);
|
||||
PageSimpleResponse<PurDeliveryResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purDeliveryResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和已审核状态
|
||||
*/
|
||||
@GetMapping("/purchase/delivery/auditList")
|
||||
public BaseResponse auditList(PurDeliveryRequest purDeliveryRequest) {
|
||||
|
||||
if (purDeliveryRequest.getStatus() == null) {
|
||||
purDeliveryRequest.setStatus(10); //查询未审核和已审核状态
|
||||
}
|
||||
List<PurDeliveryResponse> purDeliveryResponses = purDeliveryService.queryPageList(purDeliveryRequest);
|
||||
PageInfo<PurDeliveryResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purDeliveryResponses);
|
||||
PageSimpleResponse<PurDeliveryResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purDeliveryResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 审核采购订单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/delivery/auditOrder")
|
||||
public BaseResponse auditOrder(@RequestBody PostPurDeliveryRequest postPurDeliveryRequest) {
|
||||
Long userId = customerService.getUserId();
|
||||
PurDeliveryEntity purDeliveryEntity = postPurDeliveryRequest.getPurDeliveryEntity();
|
||||
purDeliveryEntity.setUpdateTime(new Date());
|
||||
purDeliveryEntity.setAuditUser(userId + "");
|
||||
purDeliveryEntity.setStatus(postPurDeliveryRequest.getEditStatus());
|
||||
purDeliveryService.update(purDeliveryEntity);
|
||||
String billNo = "";
|
||||
List<PurDeliveryDetailEntity> purOrderDetailEntities = purDeliveryDetailService.findByOrderId(purDeliveryEntity.getId() + "");
|
||||
|
||||
//对计划单里面的供应商进行分组
|
||||
Map<String, List<PurDeliveryDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurDeliveryDetailEntity::getSupId));
|
||||
|
||||
if (postPurDeliveryRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
|
||||
|
||||
if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurDeliveryRequest.isAutoPurchase() == true
|
||||
&& StrUtil.isNotEmpty(postPurDeliveryRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurDeliveryRequest.getTargetBillAction())) {
|
||||
|
||||
for (Map.Entry<String, List<PurDeliveryDetailEntity>> m : map.entrySet()) {
|
||||
//生产单据表信息
|
||||
IoOrderEntity ioOrderEntity = new IoOrderEntity();
|
||||
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
|
||||
ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
|
||||
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
|
||||
ioOrderEntity.setAction(postPurDeliveryRequest.getTargetBillAction());
|
||||
ioOrderEntity.setFromCorp(m.getKey());
|
||||
ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
|
||||
ioOrderEntity.setStatus(1);
|
||||
ioOrderEntity.setDealStatus(1);
|
||||
ioOrderEntity.setOrderType(1);
|
||||
ioOrderEntity.setCreateTime(new Date());
|
||||
ioOrderEntity.setCreateUser(postPurDeliveryRequest.getPurDeliveryEntity().getAuditUser());
|
||||
ioOrderEntity.setUpdateTime(new Date());
|
||||
ioOrderEntity.setUpdateUser(postPurDeliveryRequest.getPurDeliveryEntity().getAuditUser());
|
||||
ioOrderEntity.setCustomerId("110");
|
||||
ioOrderEntity.setDeptCode(postPurDeliveryRequest.getTargetDeptCode());
|
||||
ioOrderEntity.setInvCode(postPurDeliveryRequest.getTargetSubInv());
|
||||
ioOrderService.insertOrder(ioOrderEntity);
|
||||
billNo += ioOrderEntity.getBillNo() + ",";
|
||||
//插入业务单表
|
||||
for (PurDeliveryDetailEntity obj : m.getValue()) {
|
||||
BasicProductsEntity basicProductsEntity = purDeliveryDetailService.selectIoOrderDetailBiz(obj.getId());
|
||||
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
||||
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
|
||||
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
|
||||
ioOrderDetailBizEntity.setCount(obj.getCount());
|
||||
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
|
||||
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
|
||||
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
|
||||
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
|
||||
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
|
||||
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
|
||||
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
|
||||
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
|
||||
if (basicProductsEntity.getPrice() != null) {
|
||||
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
|
||||
}
|
||||
ioOrderDetailBizEntity.setSupId(obj.getSupId());
|
||||
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
|
||||
}
|
||||
}
|
||||
purDeliveryEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
|
||||
purDeliveryService.update(purDeliveryEntity);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("更新成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询采购订单列表
|
||||
*/
|
||||
@GetMapping("/purchase/delivery/list/detail")
|
||||
public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
|
||||
|
||||
List<PurDeliveryDetailResponse> purDeliveryDetailResponses = purDeliveryDetailService.joinQueryList(purApplyDetailRequest);
|
||||
PageInfo<PurDeliveryDetailResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purDeliveryDetailResponses);
|
||||
PageSimpleResponse<PurDeliveryDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purDeliveryDetailResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加产品到采购单里面
|
||||
*/
|
||||
@PostMapping("/purchase/delivery/addOrderDetail")
|
||||
public BaseResponse addOrderDetail(@RequestBody PurDeliveryDetailEntity purOrderDetailEntity) {
|
||||
|
||||
boolean falg = purDeliveryDetailService.insert(purOrderDetailEntity);
|
||||
if (falg) {
|
||||
return ResultVOUtils.success("添加成功");
|
||||
} else {
|
||||
return ResultVOUtils.success("添加失败");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增计划单
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/delivery/add")
|
||||
public BaseResponse add() {
|
||||
Long userId = customerService.getUserId();
|
||||
PurDeliveryEntity purArrivalEntity = new PurDeliveryEntity();
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purDeliveryService.insert(purArrivalEntity);
|
||||
Long id = purArrivalEntity.getId();
|
||||
return ResultVOUtils.success(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除申购单和详情
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/delivery/delOrderDetailAll")
|
||||
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
|
||||
|
||||
if (purApplyEntity.getId() != null) {
|
||||
purDeliveryService.deleteById(purApplyEntity.getId());
|
||||
purDeliveryDetailService.deleteByOrderId(purApplyEntity.getId() + "");
|
||||
} else {
|
||||
return ResultVOUtils.error(999, "参数有误！");
|
||||
}
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改计划详情单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/delivery/updateDetail")
|
||||
public BaseResponse detailEdit(@RequestBody PurDeliveryDetailEntity purDeliveryDetailEntity) {
|
||||
purDeliveryDetailService.update(purDeliveryDetailEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除采购订单
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@DeleteMapping("/purchase/delivery/detail/{ids}")
|
||||
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
|
||||
purDeliveryDetailService.deleteByIds(Arrays.asList(ids));
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,306 @@
|
||||
package com.glxp.api.controller.purchase;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.annotation.RepeatSubmit;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.Constant;
|
||||
import com.glxp.api.constant.ConstantStatus;
|
||||
import com.glxp.api.constant.ConstantType;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.entity.purchase.*;
|
||||
import com.glxp.api.req.purchase.*;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.purchase.PurArrivalDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurArrivalResponse;
|
||||
import com.glxp.api.res.purchase.PurReturnedDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurReturnedResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.inout.IoOrderDetailBizService;
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import com.glxp.api.service.purchase.PurArrivalDetailService;
|
||||
import com.glxp.api.service.purchase.PurArrivalService;
|
||||
import com.glxp.api.service.purchase.PurReturnedDetailService;
|
||||
import com.glxp.api.service.purchase.PurReturnedService;
|
||||
import com.glxp.api.util.CustomUtil;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
public class PurReturnedController extends BaseController {
|
||||
|
||||
|
||||
@Resource
|
||||
PurReturnedService purReturnedService;
|
||||
|
||||
@Resource
|
||||
PurReturnedDetailService purReturnedDetailService;
|
||||
|
||||
@Resource
|
||||
CustomerService customerService;
|
||||
@Resource
|
||||
GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
IoOrderService ioOrderService;
|
||||
@Resource
|
||||
IoOrderDetailBizService ioOrderDetailBizService;
|
||||
|
||||
|
||||
/**
|
||||
* 新增到货单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/returned/postOrder")
|
||||
public BaseResponse postOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) {
|
||||
|
||||
Long userId = customerService.getUserId();
|
||||
PurReturnedEntity purArrivalEntity = postPurReturnedRequest.getPurReturnedEntity();
|
||||
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purArrivalEntity.setStatus(postPurReturnedRequest.getEditStatus()); //草稿状态
|
||||
|
||||
if (postPurReturnedRequest.getType() != null) {
|
||||
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SH_ORDER, "yyyyMMdd"));
|
||||
purArrivalEntity.setBillNo(billNo);
|
||||
}
|
||||
|
||||
if (purArrivalEntity.getId() == null) {
|
||||
purReturnedService.insert(purArrivalEntity);
|
||||
} else {
|
||||
purReturnedService.update(purArrivalEntity);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("提交成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和草稿状态
|
||||
*/
|
||||
@GetMapping("/purchase/returned/list")
|
||||
public BaseResponse list(PurReturnedRequest purReturnedRequest) {
|
||||
|
||||
if (purReturnedRequest.getStatus() == null) {
|
||||
purReturnedRequest.setStatus(11); //查询未审核和草稿状态
|
||||
}
|
||||
|
||||
List<PurReturnedResponse> purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest);
|
||||
PageInfo<PurReturnedResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purReturnedResponses);
|
||||
PageSimpleResponse<PurReturnedResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purReturnedResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询未审核和已审核状态
|
||||
*/
|
||||
@GetMapping("/purchase/returned/auditList")
|
||||
public BaseResponse auditList(PurReturnedRequest purReturnedRequest) {
|
||||
|
||||
if (purReturnedRequest.getStatus() == null) {
|
||||
purReturnedRequest.setStatus(10); //查询未审核和已审核状态
|
||||
}
|
||||
List<PurReturnedResponse> purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest);
|
||||
PageInfo<PurReturnedResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purReturnedResponses);
|
||||
PageSimpleResponse<PurReturnedResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purReturnedResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 审核采购订单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/returned/auditOrder")
|
||||
public BaseResponse auditOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) {
|
||||
Long userId = customerService.getUserId();
|
||||
PurReturnedEntity purReturnedEntity = postPurReturnedRequest.getPurReturnedEntity();
|
||||
purReturnedEntity.setUpdateTime(new Date());
|
||||
purReturnedEntity.setAuditUser(userId + "");
|
||||
purReturnedEntity.setStatus(postPurReturnedRequest.getEditStatus());
|
||||
purReturnedService.update(purReturnedEntity);
|
||||
String billNo = "";
|
||||
List<PurReturnedDetailEntity> purReturnedDetailEntities = purReturnedDetailService.findByOrderId(purReturnedEntity.getId() + "");
|
||||
|
||||
//对计划单里面的供应商进行分组
|
||||
Map<String, List<PurReturnedDetailEntity>> map = purReturnedDetailEntities.stream().collect(Collectors.groupingBy(PurReturnedDetailEntity::getSupId));
|
||||
|
||||
if (postPurReturnedRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
|
||||
|
||||
if (CollUtil.isNotEmpty(purReturnedDetailEntities) && postPurReturnedRequest.isAutoPurchase() == true
|
||||
&& StrUtil.isNotEmpty(postPurReturnedRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurReturnedRequest.getTargetBillAction())) {
|
||||
|
||||
for (Map.Entry<String, List<PurReturnedDetailEntity>> m : map.entrySet()) {
|
||||
//生产单据表信息
|
||||
IoOrderEntity ioOrderEntity = new IoOrderEntity();
|
||||
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
|
||||
ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
|
||||
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
|
||||
ioOrderEntity.setAction(postPurReturnedRequest.getTargetBillAction());
|
||||
ioOrderEntity.setFromCorp(m.getKey());
|
||||
ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
|
||||
ioOrderEntity.setStatus(1);
|
||||
ioOrderEntity.setDealStatus(1);
|
||||
ioOrderEntity.setOrderType(1);
|
||||
ioOrderEntity.setCreateTime(new Date());
|
||||
ioOrderEntity.setCreateUser(postPurReturnedRequest.getPurReturnedEntity().getAuditUser());
|
||||
ioOrderEntity.setUpdateTime(new Date());
|
||||
ioOrderEntity.setUpdateUser(postPurReturnedRequest.getPurReturnedEntity().getAuditUser());
|
||||
ioOrderEntity.setCustomerId("110");
|
||||
ioOrderEntity.setDeptCode(postPurReturnedRequest.getTargetDeptCode());
|
||||
ioOrderEntity.setInvCode(postPurReturnedRequest.getTargetSubInv());
|
||||
ioOrderService.insertOrder(ioOrderEntity);
|
||||
billNo += ioOrderEntity.getBillNo() + ",";
|
||||
//插入业务单表
|
||||
for (PurReturnedDetailEntity obj : m.getValue()) {
|
||||
BasicProductsEntity basicProductsEntity = purReturnedDetailService.selectIoOrderDetailBiz(obj.getId());
|
||||
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
||||
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
|
||||
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
|
||||
ioOrderDetailBizEntity.setCount(obj.getCount());
|
||||
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
|
||||
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
|
||||
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
|
||||
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
|
||||
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
|
||||
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
|
||||
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
|
||||
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
|
||||
if (basicProductsEntity.getPrice() != null) {
|
||||
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
|
||||
}
|
||||
ioOrderDetailBizEntity.setSupId(obj.getSupId());
|
||||
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
|
||||
}
|
||||
}
|
||||
purReturnedEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
|
||||
purReturnedService.update(purReturnedEntity);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("更新成功！");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询采购订单列表
|
||||
*/
|
||||
@GetMapping("/purchase/returned/list/detail")
|
||||
public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
|
||||
|
||||
List<PurReturnedDetailResponse> purOrderDetailResponseList = purReturnedDetailService.joinQueryList(purApplyDetailRequest);
|
||||
PageInfo<PurReturnedDetailResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purOrderDetailResponseList);
|
||||
PageSimpleResponse<PurReturnedDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purOrderDetailResponseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加产品到采购单里面
|
||||
*/
|
||||
@PostMapping("/purchase/returned/addOrderDetail")
|
||||
public BaseResponse addOrderDetail(@RequestBody PurReturnedDetailEntity purOrderDetailEntity) {
|
||||
|
||||
boolean falg = purReturnedDetailService.insert(purOrderDetailEntity);
|
||||
if (falg) {
|
||||
return ResultVOUtils.success("添加成功");
|
||||
} else {
|
||||
return ResultVOUtils.success("添加失败");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增计划单
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/returned/add")
|
||||
public BaseResponse add() {
|
||||
Long userId = customerService.getUserId();
|
||||
PurReturnedEntity purArrivalEntity = new PurReturnedEntity();
|
||||
purArrivalEntity.setCreateUser(userId + "");
|
||||
purArrivalEntity.setCreateTime(new Date());
|
||||
purArrivalEntity.setUpdateTime(new Date());
|
||||
purArrivalEntity.setUpdateUser(userId + "");
|
||||
purReturnedService.insert(purArrivalEntity);
|
||||
Long id = purArrivalEntity.getId();
|
||||
return ResultVOUtils.success(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除申购单和详情
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/purchase/returned/delOrderDetailAll")
|
||||
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
|
||||
|
||||
if (purApplyEntity.getId() != null) {
|
||||
purReturnedService.deleteById(purApplyEntity.getId());
|
||||
purReturnedDetailService.deleteByOrderId(purApplyEntity.getId() + "");
|
||||
} else {
|
||||
return ResultVOUtils.error(999, "参数有误！");
|
||||
}
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改计划详情单
|
||||
*/
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/purchase/returned/updateDetail")
|
||||
public BaseResponse detailEdit(@RequestBody PurReturnedDetailEntity purReturnedDetailEntity) {
|
||||
purReturnedDetailService.update(purReturnedDetailEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除采购订单
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@DeleteMapping("/purchase/returned/detail/{ids}")
|
||||
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
|
||||
purReturnedDetailService.deleteByIds(Arrays.asList(ids));
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.purchase.PurArrivalEntity;
|
||||
import com.glxp.api.req.purchase.PurArrivalRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurArrivalDao extends BaseMapper<PurArrivalEntity> {
|
||||
|
||||
List<PurArrivalResponse> queryPageList(PurArrivalRequest purArrivalRequest);
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalDetailResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PurArrivalDetailDao extends BaseMapper<PurArrivalDetailEntity> {
|
||||
|
||||
List<PurArrivalDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurArrivalDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean update(PurArrivalDetailEntity purArrivalDetailEntity);
|
||||
|
||||
Boolean deleteByIds(@Param("ids") List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
|
||||
|
||||
boolean insertPurArrivalDetailEntity(@Param("datas") List<PurArrivalDetailEntity> purArrivalDetailEntities);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryEntity;
|
||||
import com.glxp.api.req.purchase.PurDeliveryRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurDeliveryDao extends BaseMapper<PurDeliveryEntity> {
|
||||
|
||||
List<PurDeliveryResponse> queryPageList(PurDeliveryRequest purDeliveryRequest);
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurOrderDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurOrderDetailResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PurDeliveryDetailDao extends BaseMapper<PurDeliveryDetailEntity> {
|
||||
|
||||
List<PurDeliveryDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurDeliveryDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity);
|
||||
|
||||
Boolean deleteByIds(@Param("ids") List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
|
||||
|
||||
boolean insertPurDeliveryDetailEntity(@Param("datas") List<PurDeliveryDetailEntity> purOrderDetailEntityList);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.purchase.PurReturnedEntity;
|
||||
import com.glxp.api.req.purchase.PurReturnedRequest;
|
||||
import com.glxp.api.res.purchase.PurReturnedResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PurReturnedDao extends BaseMapper<PurReturnedEntity> {
|
||||
|
||||
List<PurReturnedResponse> queryPageList(PurReturnedRequest purReturnedRequest);
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurReturnedDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurReturnedDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurOrderDetailResponse;
|
||||
import com.glxp.api.res.purchase.PurReturnedDetailResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PurReturnedDetailDao extends BaseMapper<PurReturnedDetailEntity> {
|
||||
|
||||
List<PurReturnedDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurReturnedDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean update(PurReturnedDetailEntity purOrderDetailEntity);
|
||||
|
||||
Boolean deleteByIds(@Param("ids") List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
|
||||
|
||||
boolean insertPurReturnedDetailEntity(@Param("datas") List<PurReturnedDetailEntity> purOrderDetailEntityList);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package com.glxp.api.entity.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "pur_arrival_detail")
|
||||
public class PurArrivalDetailEntity {
|
||||
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 订单外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
@TableField(value = "productId")
|
||||
private Integer productId;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@TableField(value = "productName")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 注册证备案证号
|
||||
*/
|
||||
@TableField(value = "zczbhhzbapzbh")
|
||||
private String zczbhhzbapzbh;
|
||||
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package com.glxp.api.entity.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "pur_delivery_detail")
|
||||
public class PurDeliveryDetailEntity {
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 订单外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
@TableField(value = "productId")
|
||||
private Integer productId;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@TableField(value = "productName")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 注册证备案证号
|
||||
*/
|
||||
@TableField(value = "zczbhhzbapzbh")
|
||||
private String zczbhhzbapzbh;
|
||||
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package com.glxp.api.entity.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "pur_returned_detail")
|
||||
public class PurReturnedDetailEntity {
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 订单外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
@TableField(value = "productId")
|
||||
private Integer productId;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@TableField(value = "productName")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 注册证备案证号
|
||||
*/
|
||||
@TableField(value = "zczbhhzbapzbh")
|
||||
private String zczbhhzbapzbh;
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurArrivalDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostPurArrivalRequest {
|
||||
|
||||
int editStatus;
|
||||
PurArrivalEntity purArrivalEntity;
|
||||
List<PurArrivalDetailEntity> purArrivalDetailEntities;
|
||||
Integer type;
|
||||
boolean autoPurchase;
|
||||
String targetSubInv;
|
||||
String targetBillAction;
|
||||
String targetDeptCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostPurDeliveryRequest {
|
||||
int editStatus;
|
||||
PurDeliveryEntity purDeliveryEntity;
|
||||
List<PurDeliveryDetailEntity> purDeliveryDetailEntities;
|
||||
Integer type;
|
||||
boolean autoPurchase;
|
||||
String targetSubInv;
|
||||
String targetBillAction;
|
||||
String targetDeptCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurReturnedDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurReturnedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostPurReturnedRequest {
|
||||
|
||||
int editStatus;
|
||||
PurReturnedEntity purReturnedEntity;
|
||||
List<PurReturnedDetailEntity> purReturnedDetailEntities;
|
||||
Integer type;
|
||||
boolean autoPurchase;
|
||||
String targetSubInv;
|
||||
String targetBillAction;
|
||||
String targetDeptCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package com.glxp.api.res.purchase;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class PurArrivalDetailResponse {
|
||||
|
||||
private String id;
|
||||
private String orderIdFk;
|
||||
private String productId;
|
||||
private String productName;
|
||||
private String spec;
|
||||
private String batchNo;
|
||||
private String expireDate;
|
||||
private String productDate;
|
||||
private Integer count;
|
||||
private int reCount;
|
||||
private Integer sweepCount;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private BigDecimal price;
|
||||
private String relId;
|
||||
|
||||
//销售清单号（第二票）
|
||||
private String secSalesListNo;
|
||||
|
||||
//销售发票号（第一票）
|
||||
private String firstSalesInvNo;
|
||||
|
||||
//销售发票号（第二票）
|
||||
private String secSalesInvNo;
|
||||
|
||||
//开票日期
|
||||
private String invoiceDate;
|
||||
private String manufactory;
|
||||
private boolean allowNoBatch;
|
||||
|
||||
private String code;
|
||||
private String serialNo;
|
||||
|
||||
private Integer codeId;
|
||||
|
||||
private int acceptCount;
|
||||
private String measname;
|
||||
private String supId;
|
||||
|
||||
private String supName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.glxp.api.res.purchase;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class PurDeliveryDetailResponse {
|
||||
private String id;
|
||||
private String orderIdFk;
|
||||
private String productId;
|
||||
private String productName;
|
||||
private String spec;
|
||||
private String batchNo;
|
||||
private String expireDate;
|
||||
private String productDate;
|
||||
private Integer count;
|
||||
private int reCount;
|
||||
private Integer sweepCount;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private BigDecimal price;
|
||||
private String relId;
|
||||
|
||||
//销售清单号（第二票）
|
||||
private String secSalesListNo;
|
||||
|
||||
//销售发票号（第一票）
|
||||
private String firstSalesInvNo;
|
||||
|
||||
//销售发票号（第二票）
|
||||
private String secSalesInvNo;
|
||||
|
||||
//开票日期
|
||||
private String invoiceDate;
|
||||
private String manufactory;
|
||||
private boolean allowNoBatch;
|
||||
|
||||
private String code;
|
||||
private String serialNo;
|
||||
|
||||
private Integer codeId;
|
||||
|
||||
private int acceptCount;
|
||||
private String measname;
|
||||
private String supId;
|
||||
|
||||
private String supName;
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package com.glxp.api.res.purchase;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class PurReturnedDetailResponse {
|
||||
|
||||
private String id;
|
||||
private String orderIdFk;
|
||||
private String productId;
|
||||
private String productName;
|
||||
private String spec;
|
||||
private String batchNo;
|
||||
private String expireDate;
|
||||
private String productDate;
|
||||
private Integer count;
|
||||
private int reCount;
|
||||
private Integer sweepCount;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private BigDecimal price;
|
||||
private String relId;
|
||||
|
||||
//销售清单号（第二票）
|
||||
private String secSalesListNo;
|
||||
|
||||
//销售发票号（第一票）
|
||||
private String firstSalesInvNo;
|
||||
|
||||
//销售发票号（第二票）
|
||||
private String secSalesInvNo;
|
||||
|
||||
//开票日期
|
||||
private String invoiceDate;
|
||||
private String manufactory;
|
||||
private boolean allowNoBatch;
|
||||
|
||||
private String code;
|
||||
private String serialNo;
|
||||
|
||||
private Integer codeId;
|
||||
|
||||
private int acceptCount;
|
||||
private String measname;
|
||||
private String supId;
|
||||
|
||||
private String supName;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalDetailResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurArrivalDetailService {
|
||||
|
||||
List<PurArrivalDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurArrivalDetailEntity> findByOrderId(String orderId);
|
||||
|
||||
List<PurArrivalDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurArrivalDetailEntity> getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity);
|
||||
|
||||
Boolean update(PurArrivalDetailEntity purReturnedDetailEntity);
|
||||
|
||||
Boolean deleteByIds(List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(String orderIdfK);
|
||||
|
||||
boolean insertPurArrivalDetailEntity(List<PurArrivalDetailEntity> purReturnedDetailEntity);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurArrivalEntity;
|
||||
import com.glxp.api.req.purchase.PurArrivalRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurArrivalService {
|
||||
|
||||
List<PurArrivalResponse> queryPageList(PurArrivalRequest purArrivalRequest);
|
||||
|
||||
Boolean insert(PurArrivalEntity purArrivalEntity);
|
||||
|
||||
Boolean update(PurArrivalEntity purArrivalEntity);
|
||||
|
||||
Boolean deleteByIds(List<Integer> ids);
|
||||
|
||||
Boolean deleteById(long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryDetailResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurDeliveryDetailService {
|
||||
|
||||
List<PurDeliveryDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurDeliveryDetailEntity> findByOrderId(String orderId);
|
||||
|
||||
List<PurDeliveryDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurDeliveryDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean insert(PurDeliveryDetailEntity purDeliveryDetailEntity);
|
||||
|
||||
Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity);
|
||||
|
||||
Boolean deleteByIds(List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(String orderIdfK);
|
||||
|
||||
boolean insertPurDeliveryDetailEntity(List<PurDeliveryDetailEntity> purDeliveryDetailEntitys);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurDeliveryEntity;
|
||||
import com.glxp.api.req.purchase.PurDeliveryRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurDeliveryService {
|
||||
|
||||
List<PurDeliveryResponse> queryPageList(PurDeliveryRequest purDeliveryRequest);
|
||||
|
||||
Boolean insert(PurDeliveryEntity purDeliveryEntity);
|
||||
|
||||
Boolean update(PurDeliveryEntity purDeliveryEntity);
|
||||
|
||||
Boolean deleteByIds(List<Integer> ids);
|
||||
|
||||
Boolean deleteById(long id);
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurReturnedDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurReturnedDetailResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurReturnedDetailService {
|
||||
|
||||
|
||||
List<PurReturnedDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurReturnedDetailEntity> findByOrderId(String orderId);
|
||||
|
||||
List<PurReturnedDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
List<PurReturnedDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
|
||||
|
||||
Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity);
|
||||
|
||||
Boolean update(PurReturnedDetailEntity purReturnedDetailEntity);
|
||||
|
||||
Boolean deleteByIds(List<Long> ids);
|
||||
|
||||
Boolean deleteByOrderId(String orderIdfK);
|
||||
|
||||
boolean insertPurReturnedDetailEntity(List<PurReturnedDetailEntity> purReturnedDetailEntity);
|
||||
|
||||
BasicProductsEntity selectIoOrderDetailBiz(long id);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.service.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurReturnedEntity;
|
||||
import com.glxp.api.req.purchase.PurReturnedRequest;
|
||||
import com.glxp.api.res.purchase.PurReturnedResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurReturnedService {
|
||||
|
||||
List<PurReturnedResponse> queryPageList(PurReturnedRequest purReturnedRequest);
|
||||
|
||||
Boolean insert(PurReturnedEntity purReturnedEntity);
|
||||
|
||||
Boolean update(PurReturnedEntity purReturnedEntity);
|
||||
|
||||
Boolean deleteByIds(List<Integer> ids);
|
||||
|
||||
Boolean deleteById(long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurArrivalDetailDao;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurArrivalDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalDetailResponse;
|
||||
import com.glxp.api.service.purchase.PurArrivalDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurArrivalDetailServiceImpl implements PurArrivalDetailService {
|
||||
|
||||
|
||||
@Resource
|
||||
PurArrivalDetailDao purArrivalDetailDao;
|
||||
|
||||
@Override
|
||||
public List<PurArrivalDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurArrivalDetailResponse> data = purArrivalDetailDao.joinQueryList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurArrivalDetailEntity> findByOrderId(String orderId) {
|
||||
PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest();
|
||||
purOrderDetailRequest.setOrderIdFk(orderId);
|
||||
List<PurArrivalDetailEntity> data = purArrivalDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurArrivalDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurArrivalDetailEntity> data = purArrivalDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurArrivalDetailEntity> getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
return purArrivalDetailDao.queryPageList(purOrderDetailRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity) {
|
||||
return purArrivalDetailDao.insert(purReturnedDetailEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurArrivalDetailEntity purReturnedDetailEntity) {
|
||||
return purArrivalDetailDao.update(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Long> ids) {
|
||||
return purArrivalDetailDao.deleteByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByOrderId(String orderIdfK) {
|
||||
return purArrivalDetailDao.deleteByOrderId(orderIdfK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertPurArrivalDetailEntity(List<PurArrivalDetailEntity> purReturnedDetailEntity) {
|
||||
return purArrivalDetailDao.insertPurArrivalDetailEntity(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BasicProductsEntity selectIoOrderDetailBiz(long id) {
|
||||
return purArrivalDetailDao.selectIoOrderDetailBiz(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurArrivalDao;
|
||||
import com.glxp.api.entity.purchase.PurArrivalEntity;
|
||||
import com.glxp.api.req.purchase.PurArrivalRequest;
|
||||
import com.glxp.api.res.purchase.PurArrivalResponse;
|
||||
import com.glxp.api.res.purchase.PurOrderResponse;
|
||||
import com.glxp.api.service.purchase.PurArrivalService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurArrivalServiceImpl implements PurArrivalService {
|
||||
|
||||
@Resource
|
||||
PurArrivalDao purArrivalDao;
|
||||
|
||||
|
||||
@Override
|
||||
public List<PurArrivalResponse> queryPageList(PurArrivalRequest purArrivalRequest) {
|
||||
if (purArrivalRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purArrivalRequest.getPage() != null) {
|
||||
int offset = (purArrivalRequest.getPage() - 1) * purArrivalRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purArrivalRequest.getLimit());
|
||||
}
|
||||
List<PurArrivalResponse> data = purArrivalDao.queryPageList(purArrivalRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurArrivalEntity purArrivalEntity) {
|
||||
return purArrivalDao.insert(purArrivalEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurArrivalEntity purArrivalEntity) {
|
||||
return purArrivalDao.updateById(purArrivalEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Integer> ids) {
|
||||
return purArrivalDao.deleteBatchIds(ids) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteById(long id) {
|
||||
return purArrivalDao.deleteById(id) > 0 ? true : false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurDeliveryDetailDao;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryDetailResponse;
|
||||
import com.glxp.api.service.purchase.PurDeliveryDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService {
|
||||
|
||||
@Resource
|
||||
PurDeliveryDetailDao purDeliveryDetailDao;
|
||||
|
||||
@Override
|
||||
public List<PurDeliveryDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurDeliveryDetailResponse> data = purDeliveryDetailDao.joinQueryList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurDeliveryDetailEntity> findByOrderId(String orderId) {
|
||||
PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest();
|
||||
purOrderDetailRequest.setOrderIdFk(orderId);
|
||||
List<PurDeliveryDetailEntity> data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurDeliveryDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurDeliveryDetailEntity> data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurDeliveryDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
return purDeliveryDetailDao.queryPageList(purOrderDetailRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurDeliveryDetailEntity purReturnedDetailEntity) {
|
||||
return purDeliveryDetailDao.insert(purReturnedDetailEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurDeliveryDetailEntity purReturnedDetailEntity) {
|
||||
return purDeliveryDetailDao.update(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Long> ids) {
|
||||
return purDeliveryDetailDao.deleteByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByOrderId(String orderIdfK) {
|
||||
return purDeliveryDetailDao.deleteByOrderId(orderIdfK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertPurDeliveryDetailEntity(List<PurDeliveryDetailEntity> purReturnedDetailEntity) {
|
||||
return purDeliveryDetailDao.insertPurDeliveryDetailEntity(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BasicProductsEntity selectIoOrderDetailBiz(long id) {
|
||||
return purDeliveryDetailDao.selectIoOrderDetailBiz(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurDeliveryDao;
|
||||
import com.glxp.api.entity.purchase.PurDeliveryEntity;
|
||||
import com.glxp.api.req.purchase.PurDeliveryRequest;
|
||||
import com.glxp.api.res.purchase.PurDeliveryResponse;
|
||||
import com.glxp.api.service.purchase.PurDeliveryService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurDeliveryServiceImpl implements PurDeliveryService {
|
||||
|
||||
@Resource
|
||||
PurDeliveryDao purDeliveryDao;
|
||||
|
||||
@Override
|
||||
public List<PurDeliveryResponse> queryPageList(PurDeliveryRequest purDeliveryRequest) {
|
||||
if (purDeliveryRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purDeliveryRequest.getPage() != null) {
|
||||
int offset = (purDeliveryRequest.getPage() - 1) * purDeliveryRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purDeliveryRequest.getLimit());
|
||||
}
|
||||
List<PurDeliveryResponse> data = purDeliveryDao.queryPageList(purDeliveryRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurDeliveryEntity purDeliveryEntity) {
|
||||
return purDeliveryDao.insert(purDeliveryEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurDeliveryEntity purDeliveryEntity) {
|
||||
return purDeliveryDao.updateById(purDeliveryEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Integer> ids) {
|
||||
return purDeliveryDao.deleteBatchIds(ids) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteById(long id) {
|
||||
return purDeliveryDao.deleteById(id) > 0 ? true : false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurReturnedDetailDao;
|
||||
import com.glxp.api.entity.basic.BasicProductsEntity;
|
||||
import com.glxp.api.entity.purchase.PurReturnedDetailEntity;
|
||||
import com.glxp.api.req.purchase.PurOrderDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurReturnedDetailResponse;
|
||||
import com.glxp.api.service.purchase.PurReturnedDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurReturnedDetailServiceImpl implements PurReturnedDetailService {
|
||||
|
||||
|
||||
@Resource
|
||||
PurReturnedDetailDao purReturnedDetailDao;
|
||||
|
||||
|
||||
@Override
|
||||
public List<PurReturnedDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurReturnedDetailResponse> data = purReturnedDetailDao.joinQueryList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurReturnedDetailEntity> findByOrderId(String orderId) {
|
||||
PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest();
|
||||
purOrderDetailRequest.setOrderIdFk(orderId);
|
||||
List<PurReturnedDetailEntity> data = purReturnedDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurReturnedDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
if (purOrderDetailRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purOrderDetailRequest.getPage() != null) {
|
||||
int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
|
||||
}
|
||||
List<PurReturnedDetailEntity> data = purReturnedDetailDao.queryPageList(purOrderDetailRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PurReturnedDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) {
|
||||
return purReturnedDetailDao.queryPageList(purOrderDetailRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity) {
|
||||
return purReturnedDetailDao.insert(purReturnedDetailEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurReturnedDetailEntity purReturnedDetailEntity) {
|
||||
return purReturnedDetailDao.update(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Long> ids) {
|
||||
return purReturnedDetailDao.deleteByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByOrderId(String orderIdfK) {
|
||||
return purReturnedDetailDao.deleteByOrderId(orderIdfK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertPurReturnedDetailEntity(List<PurReturnedDetailEntity> purReturnedDetailEntity) {
|
||||
return purReturnedDetailDao.insertPurReturnedDetailEntity(purReturnedDetailEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BasicProductsEntity selectIoOrderDetailBiz(long id) {
|
||||
return purReturnedDetailDao.selectIoOrderDetailBiz(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurReturnedDao;
|
||||
import com.glxp.api.entity.purchase.PurReturnedEntity;
|
||||
import com.glxp.api.req.purchase.PurReturnedRequest;
|
||||
import com.glxp.api.res.purchase.PurReturnedResponse;
|
||||
import com.glxp.api.service.purchase.PurReturnedService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurReturnedServiceImpl implements PurReturnedService {
|
||||
|
||||
@Resource
|
||||
PurReturnedDao purReturnedDao;
|
||||
|
||||
@Override
|
||||
public List<PurReturnedResponse> queryPageList(PurReturnedRequest purReturnedRequest) {
|
||||
if (purReturnedRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purReturnedRequest.getPage() != null) {
|
||||
int offset = (purReturnedRequest.getPage() - 1) * purReturnedRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purReturnedRequest.getLimit());
|
||||
}
|
||||
List<PurReturnedResponse> data = purReturnedDao.queryPageList(purReturnedRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(PurReturnedEntity purReturnedEntity) {
|
||||
return purReturnedDao.insert(purReturnedEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(PurReturnedEntity purReturnedEntity) {
|
||||
return purReturnedDao.updateById(purReturnedEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteByIds(List<Integer> ids) {
|
||||
return purReturnedDao.deleteBatchIds(ids) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteById(long id) {
|
||||
return purReturnedDao.deleteById(id) > 0 ? true : false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
<?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.purchase.PurArrivalDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurArrivalRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurArrivalResponse">
|
||||
SELECT pur_arrival.*,
|
||||
cb.employeeName createUserName,
|
||||
ab.employeeName auditUserName,
|
||||
auth_warehouse.NAME invName,
|
||||
auth_dept.`name` deptName
|
||||
FROM pur_arrival
|
||||
LEFT JOIN auth_user cb ON pur_arrival.createUser = cb.id
|
||||
LEFT JOIN auth_user ab ON pur_arrival.auditUser = ab.id
|
||||
LEFT JOIN auth_warehouse ON pur_arrival.invCode = auth_warehouse.`code`
|
||||
LEFT JOIN auth_dept ON auth_dept.CODE = pur_arrival.deptCode
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND billNo = #{billNo}
|
||||
</if>
|
||||
<if test="startDate != null and startDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') >= #{startDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') <= #{endDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="status != null and status != 10 and status != 11">
|
||||
and pur_arrival.status = #{status}
|
||||
</if>
|
||||
<if test="status == 10">
|
||||
and (pur_arrival.status = 3 or pur_arrival.status = 2 or pur_arrival.status = 4)
|
||||
</if>
|
||||
<if test="status == 11">
|
||||
and (pur_arrival.status = 1 or pur_arrival.status = 2 or pur_arrival.status = 4)
|
||||
</if>
|
||||
|
||||
<if test="deptCode != '' and deptCode != null">
|
||||
AND deptCode = #{deptCode}
|
||||
</if>
|
||||
<if test="invCode != '' and invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="auditUser != '' and auditUser != null">
|
||||
AND auditUser = #{auditUser}
|
||||
</if>
|
||||
<if test="createUser != '' and createUser != null">
|
||||
AND createUser = #{createUser}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,117 @@
|
||||
<?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.purchase.PurArrivalDetailDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.entity.purchase.PurArrivalDetailEntity">
|
||||
select *
|
||||
FROM pur_arrival_detail
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurArrivalDetailResponse">
|
||||
SELECT pur_arrival_detail.*,
|
||||
basic_products.ggxh spec,
|
||||
basic_products.measname,
|
||||
basic_products.manufactory,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_corp.`name` supName
|
||||
FROM pur_arrival_detail
|
||||
INNER JOIN basic_udirel ON pur_arrival_detail.productId = basic_udirel.id
|
||||
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
|
||||
INNER JOIN basic_corp ON pur_arrival_detail.supId = basic_corp.erpId
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
AND basic_products.diType = 1
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<delete id="deleteByIds" parameterType="java.util.List">
|
||||
DELETE
|
||||
FROM pur_arrival_detail WHERE id in
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<delete id="deleteByOrderId" parameterType="map">
|
||||
DELETE
|
||||
FROM pur_arrival_detail
|
||||
WHERE orderIdFk = #{orderIdFk}
|
||||
</delete>
|
||||
|
||||
<update id="update" parameterType="com.glxp.api.entity.purchase.PurArrivalDetailEntity">
|
||||
UPDATE pur_arrival_detail
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="orderIdFk != null">
|
||||
orderIdFk=#{orderIdFk},
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
productId=#{productId},
|
||||
</if>
|
||||
<if test="productName != null">
|
||||
productName=#{productName},
|
||||
</if>
|
||||
<if test="count != null">
|
||||
`count`=#{count},
|
||||
</if>
|
||||
<if test="supId != null">
|
||||
supId=#{supId},
|
||||
</if>
|
||||
<if test="zczbhhzbapzbh != null">
|
||||
zczbhhzbapzbh=#{zczbhhzbapzbh},
|
||||
</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<insert id="insertPurArrivalDetailEntity" keyProperty="id"
|
||||
parameterType="com.glxp.api.entity.purchase.PurArrivalDetailEntity">
|
||||
REPLACE INTO pur_arrival_detail
|
||||
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
|
||||
|
||||
<foreach collection="datas" item="item" index="index" separator=",">
|
||||
(#{item.orderIdFk},
|
||||
#{item.productId},
|
||||
#{item.productName},
|
||||
#{item.count},
|
||||
#{item.supId},
|
||||
#{item.zczbhhzbapzbh})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="selectIoOrderDetailBiz" parameterType="long"
|
||||
resultType="com.glxp.api.entity.basic.BasicProductsEntity">
|
||||
SELECT b2.*
|
||||
FROM pur_arrival_detail p1
|
||||
LEFT JOIN basic_udirel b1 on b1.id = p1.productId
|
||||
LEFT JOIN basic_products b2 on b1.uuid = b2.uuid
|
||||
<where>
|
||||
<if test="id != null and id != ''">
|
||||
AND p1.id = #{id}
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY uuid
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,54 @@
|
||||
<?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.purchase.PurDeliveryDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurDeliveryRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurDeliveryResponse">
|
||||
SELECT pur_delivery.*,
|
||||
cb.employeeName createUserName,
|
||||
ab.employeeName auditUserName,
|
||||
auth_warehouse.NAME invName,
|
||||
auth_dept.`name` deptName
|
||||
FROM pur_delivery
|
||||
LEFT JOIN auth_user cb ON pur_delivery.createUser = cb.id
|
||||
LEFT JOIN auth_user ab ON pur_delivery.auditUser = ab.id
|
||||
LEFT JOIN auth_warehouse ON pur_delivery.invCode = auth_warehouse.`code`
|
||||
LEFT JOIN auth_dept ON auth_dept.CODE = pur_delivery.deptCode
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND billNo = #{billNo}
|
||||
</if>
|
||||
<if test="startDate != null and startDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') >= #{startDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') <= #{endDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="status != null and status != 10 and status != 11">
|
||||
and pur_delivery.status = #{status}
|
||||
</if>
|
||||
<if test="status == 10">
|
||||
and (pur_delivery.status = 3 or pur_delivery.status = 2 or pur_delivery.status = 4)
|
||||
</if>
|
||||
<if test="status == 11">
|
||||
and (pur_delivery.status = 1 or pur_delivery.status = 2 or pur_delivery.status = 4)
|
||||
</if>
|
||||
|
||||
<if test="deptCode != '' and deptCode != null">
|
||||
AND deptCode = #{deptCode}
|
||||
</if>
|
||||
<if test="invCode != '' and invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="auditUser != '' and auditUser != null">
|
||||
AND auditUser = #{auditUser}
|
||||
</if>
|
||||
<if test="createUser != '' and createUser != null">
|
||||
AND createUser = #{createUser}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,117 @@
|
||||
<?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.purchase.PurDeliveryDetailDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.entity.purchase.PurDeliveryDetailEntity">
|
||||
select *
|
||||
FROM pur_delivery_detail
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurDeliveryDetailResponse">
|
||||
SELECT pur_delivery_detail.*,
|
||||
basic_products.ggxh spec,
|
||||
basic_products.measname,
|
||||
basic_products.manufactory,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_corp.`name` supName
|
||||
FROM pur_delivery_detail
|
||||
INNER JOIN basic_udirel ON pur_delivery_detail.productId = basic_udirel.id
|
||||
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
|
||||
INNER JOIN basic_corp ON pur_delivery_detail.supId = basic_corp.erpId
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
AND basic_products.diType = 1
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<delete id="deleteByIds" parameterType="java.util.List">
|
||||
DELETE
|
||||
FROM pur_delivery_detail WHERE id in
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<delete id="deleteByOrderId" parameterType="map">
|
||||
DELETE
|
||||
FROM pur_delivery_detail
|
||||
WHERE orderIdFk = #{orderIdFk}
|
||||
</delete>
|
||||
|
||||
<update id="update" parameterType="com.glxp.api.entity.purchase.PurDeliveryDetailEntity">
|
||||
UPDATE pur_delivery_detail
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="orderIdFk != null">
|
||||
orderIdFk=#{orderIdFk},
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
productId=#{productId},
|
||||
</if>
|
||||
<if test="productName != null">
|
||||
productName=#{productName},
|
||||
</if>
|
||||
<if test="count != null">
|
||||
`count`=#{count},
|
||||
</if>
|
||||
<if test="supId != null">
|
||||
supId=#{supId},
|
||||
</if>
|
||||
<if test="zczbhhzbapzbh != null">
|
||||
zczbhhzbapzbh=#{zczbhhzbapzbh},
|
||||
</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<insert id="insertPurDeliveryDetailEntity" keyProperty="id"
|
||||
parameterType="com.glxp.api.entity.purchase.PurDeliveryDetailEntity">
|
||||
REPLACE INTO pur_delivery_detail
|
||||
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
|
||||
|
||||
<foreach collection="datas" item="item" index="index" separator=",">
|
||||
(#{item.orderIdFk},
|
||||
#{item.productId},
|
||||
#{item.productName},
|
||||
#{item.count},
|
||||
#{item.supId},
|
||||
#{item.zczbhhzbapzbh})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="selectIoOrderDetailBiz" parameterType="long"
|
||||
resultType="com.glxp.api.entity.basic.BasicProductsEntity">
|
||||
SELECT b2.*
|
||||
FROM pur_delivery_detail p1
|
||||
LEFT JOIN basic_udirel b1 on b1.id = p1.productId
|
||||
LEFT JOIN basic_products b2 on b1.uuid = b2.uuid
|
||||
<where>
|
||||
<if test="id != null and id != ''">
|
||||
AND p1.id = #{id}
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY uuid
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,54 @@
|
||||
<?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.purchase.PurReturnedDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurReturnedRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurReturnedResponse">
|
||||
SELECT pur_returned.*,
|
||||
cb.employeeName createUserName,
|
||||
ab.employeeName auditUserName,
|
||||
auth_warehouse.NAME invName,
|
||||
auth_dept.`name` deptName
|
||||
FROM pur_returned
|
||||
LEFT JOIN auth_user cb ON pur_returned.createUser = cb.id
|
||||
LEFT JOIN auth_user ab ON pur_returned.auditUser = ab.id
|
||||
LEFT JOIN auth_warehouse ON pur_returned.invCode = auth_warehouse.`code`
|
||||
LEFT JOIN auth_dept ON auth_dept.CODE = pur_returned.deptCode
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND billNo = #{billNo}
|
||||
</if>
|
||||
<if test="startDate != null and startDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') >= #{startDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(billDate, '%Y-%m-%d') <= #{endDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="status != null and status != 10 and status != 11">
|
||||
and pur_returned.status = #{status}
|
||||
</if>
|
||||
<if test="status == 10">
|
||||
and (pur_returned.status = 3 or pur_returned.status = 2 or pur_returned.status = 4)
|
||||
</if>
|
||||
<if test="status == 11">
|
||||
and (pur_returned.status = 1 or pur_returned.status = 2 or pur_returned.status = 4)
|
||||
</if>
|
||||
|
||||
<if test="deptCode != '' and deptCode != null">
|
||||
AND deptCode = #{deptCode}
|
||||
</if>
|
||||
<if test="invCode != '' and invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="auditUser != '' and auditUser != null">
|
||||
AND auditUser = #{auditUser}
|
||||
</if>
|
||||
<if test="createUser != '' and createUser != null">
|
||||
AND createUser = #{createUser}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,117 @@
|
||||
<?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.purchase.PurReturnedDetailDao">
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.entity.purchase.PurReturnedDetailEntity">
|
||||
select *
|
||||
FROM pur_returned_detail
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurReturnedDetailResponse">
|
||||
SELECT pur_returned_detail.*,
|
||||
basic_products.ggxh spec,
|
||||
basic_products.measname,
|
||||
basic_products.manufactory,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_corp.`name` supName
|
||||
FROM pur_returned_detail
|
||||
INNER JOIN basic_udirel ON pur_returned_detail.productId = basic_udirel.id
|
||||
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
|
||||
INNER JOIN basic_corp ON pur_returned_detail.supId = basic_corp.erpId
|
||||
<where>
|
||||
<if test="orderIdFk != '' and orderIdFk != null">
|
||||
AND orderIdFk = #{orderIdFk}
|
||||
AND basic_products.diType = 1
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
AND productId = #{productId}
|
||||
</if>
|
||||
<if test="supId != '' and supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<delete id="deleteByIds" parameterType="java.util.List">
|
||||
DELETE
|
||||
FROM pur_returned_detail WHERE id in
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
<delete id="deleteByOrderId" parameterType="map">
|
||||
DELETE
|
||||
FROM pur_returned_detail
|
||||
WHERE orderIdFk = #{orderIdFk}
|
||||
</delete>
|
||||
|
||||
<update id="update" parameterType="com.glxp.api.entity.purchase.PurReturnedDetailEntity">
|
||||
UPDATE pur_returned_detail
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="orderIdFk != null">
|
||||
orderIdFk=#{orderIdFk},
|
||||
</if>
|
||||
<if test="productId != null">
|
||||
productId=#{productId},
|
||||
</if>
|
||||
<if test="productName != null">
|
||||
productName=#{productName},
|
||||
</if>
|
||||
<if test="count != null">
|
||||
`count`=#{count},
|
||||
</if>
|
||||
<if test="supId != null">
|
||||
supId=#{supId},
|
||||
</if>
|
||||
<if test="zczbhhzbapzbh != null">
|
||||
zczbhhzbapzbh=#{zczbhhzbapzbh},
|
||||
</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<insert id="insertPurReturnedDetailEntity" keyProperty="id"
|
||||
parameterType="com.glxp.api.entity.purchase.PurReturnedDetailEntity">
|
||||
REPLACE INTO pur_returned_detail
|
||||
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
|
||||
|
||||
<foreach collection="datas" item="item" index="index" separator=",">
|
||||
(#{item.orderIdFk},
|
||||
#{item.productId},
|
||||
#{item.productName},
|
||||
#{item.count},
|
||||
#{item.supId},
|
||||
#{item.zczbhhzbapzbh})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="selectIoOrderDetailBiz" parameterType="long"
|
||||
resultType="com.glxp.api.entity.basic.BasicProductsEntity">
|
||||
SELECT b2.*
|
||||
FROM pur_returned_detail p1
|
||||
LEFT JOIN basic_udirel b1 on b1.id = p1.productId
|
||||
LEFT JOIN basic_products b2 on b1.uuid = b2.uuid
|
||||
<where>
|
||||
<if test="id != null and id != ''">
|
||||
AND p1.id = #{id}
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY uuid
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue