From 952191a7387124f6f190ae17d3f4277424718201 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 12 Mar 2023 16:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E5=8D=95=E9=80=81=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E9=80=80=E8=B4=A7=E5=8D=95=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 15 +- .../inout/IoCodeTempController.java | 37 ++- .../controller/inout/IoOrderController.java | 8 + .../purchase/PurArrivalController.java | 304 +++++++++++++++++ .../purchase/PurDeliveryController.java | 303 +++++++++++++++++ .../purchase/PurOrderController.java | 91 +++--- .../purchase/PurReturnedController.java | 306 ++++++++++++++++++ .../glxp/api/dao/purchase/PurArrivalDao.java | 13 + .../api/dao/purchase/PurArrivalDetailDao.java | 30 ++ .../glxp/api/dao/purchase/PurDeliveryDao.java | 13 + .../dao/purchase/PurDeliveryDetailDao.java | 32 ++ .../api/dao/purchase/PurOrderDetailDao.java | 4 +- .../glxp/api/dao/purchase/PurReturnedDao.java | 15 + .../dao/purchase/PurReturnedDetailDao.java | 31 ++ .../purchase/PurArrivalDetailEntity.java | 53 +++ .../api/entity/purchase/PurArrivalEntity.java | 135 ++++++++ .../purchase/PurDeliveryDetailEntity.java | 52 +++ .../entity/purchase/PurDeliveryEntity.java | 134 ++++++++ .../api/entity/purchase/PurOrderEntity.java | 2 +- .../purchase/PurReturnedDetailEntity.java | 52 +++ .../entity/purchase/PurReturnedEntity.java | 135 ++++++++ .../req/purchase/PostPurArrivalRequest.java | 21 ++ .../req/purchase/PostPurDeliveryRequest.java | 20 ++ .../api/req/purchase/PostPurOrderRequest.java | 1 - .../req/purchase/PostPurReturnedRequest.java | 21 ++ .../api/req/purchase/PurArrivalRequest.java | 70 ++++ .../api/req/purchase/PurDeliveryRequest.java | 70 ++++ .../req/purchase/PurOrderDetailRequest.java | 6 - .../api/req/purchase/PurOrderRequest.java | 4 +- .../api/req/purchase/PurReturnedRequest.java | 69 ++++ .../purchase/PurArrivalDetailResponse.java | 51 +++ .../api/res/purchase/PurArrivalResponse.java | 73 +++++ .../purchase/PurDeliveryDetailResponse.java | 49 +++ .../api/res/purchase/PurDeliveryResponse.java | 73 +++++ .../purchase/PurReturnedDetailResponse.java | 52 +++ .../api/res/purchase/PurReturnedResponse.java | 73 +++++ .../purchase/PurArrivalDetailService.java | 32 ++ .../service/purchase/PurArrivalService.java | 21 ++ .../purchase/PurDeliveryDetailService.java | 32 ++ .../service/purchase/PurDeliveryService.java | 20 ++ .../purchase/PurOrderDetailService.java | 1 - .../purchase/PurReturnedDetailService.java | 34 ++ .../service/purchase/PurReturnedService.java | 21 ++ .../impl/PurArrivalDetailServiceImpl.java | 91 ++++++ .../purchase/impl/PurArrivalServiceImpl.java | 55 ++++ .../impl/PurDeliveryDetailServiceImpl.java | 90 ++++++ .../purchase/impl/PurDeliveryServiceImpl.java | 53 +++ .../purchase/impl/PurOrderServiceImpl.java | 11 +- .../impl/PurReturnedDetailServiceImpl.java | 92 ++++++ .../purchase/impl/PurReturnedServiceImpl.java | 53 +++ src/main/resources/application.yml | 2 +- .../mybatis/mapper/purchase/PurArrivalDao.xml | 54 ++++ .../mapper/purchase/PurArrivalDetailDao.xml | 117 +++++++ .../mapper/purchase/PurDeliveryDao.xml | 54 ++++ .../mapper/purchase/PurDeliveryDetailDao.xml | 117 +++++++ .../mapper/purchase/PurReturnedDao.xml | 54 ++++ .../mapper/purchase/PurReturnedDetailDao.xml | 117 +++++++ 57 files changed, 3453 insertions(+), 86 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java create mode 100644 src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java create mode 100644 src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java create mode 100644 src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurArrivalDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurArrivalEntity.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurDeliveryDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurReturnedDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/purchase/PurReturnedEntity.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurArrivalRequest.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurDeliveryRequest.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PostPurReturnedRequest.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PurDeliveryRequest.java create mode 100644 src/main/java/com/glxp/api/req/purchase/PurReturnedRequest.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurArrivalDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurArrivalResponse.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurDeliveryDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurReturnedDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/purchase/PurReturnedResponse.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurArrivalService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurDeliveryService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/PurReturnedService.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/purchase/PurArrivalDao.xml create mode 100644 src/main/resources/mybatis/mapper/purchase/PurArrivalDetailDao.xml create mode 100644 src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml create mode 100644 src/main/resources/mybatis/mapper/purchase/PurDeliveryDetailDao.xml create mode 100644 src/main/resources/mybatis/mapper/purchase/PurReturnedDao.xml create mode 100644 src/main/resources/mybatis/mapper/purchase/PurReturnedDetailDao.xml diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index cee5e925..412daf8f 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -9,12 +9,16 @@ public class Constant { public static final String SERIAL_CACHE_PREFIX_ST = "serialst_"; public static final String SERIAL_CACHE_SYNC_UDI = "syncUdi"; - public static final String SCAN_ORDER = "MS"; + public static final String SCAN_ORDER = "MS"; //出入库单据 public static final String BUS_ORDER = "MY"; - public static final String LIN_YONG = "ML"; - public static final String SG_ORDER = "SG"; - public static final String JH_ORDER = "JH"; - public static final String NBM_ORDER = "NBM"; + public static final String LIN_YONG = "ML"; //领用 + public static final String SG_ORDER = "SG"; //申购 + public static final String JH_ORDER = "JH"; //计划 + public static final String NBM_ORDER = "NBM"; //内部码 + public static final String CG_ORDER = "CG"; //采购订单 + public static final String SH_ORDER = "SH"; //送货单 + public static final String DH_ORDER = "DH"; //到货 + public static final String TH_ORDER = "TH"; //退货 /** @@ -183,7 +187,6 @@ public class Constant { public static final String ORDER_STATUS_NEW_ORDER = "newOrder"; - /** * 单据-未校验标识 */ diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index ef0b8b30..6e77a5a1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -385,21 +385,30 @@ public class IoCodeTempController extends BaseController { BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); if (checkOriginCodeRes != null) { - IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); - if (codeLostEntity == null) { - if (StrUtil.isNotEmpty(orderId)) { - List ioCodeEnttities = codeTempService.findByOrderId(orderId); - IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); - if (ioCodeEnttity == null) { - return checkOriginCodeRes; - } - } else +// IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); +// if (codeLostEntity == null) { +// if (StrUtil.isNotEmpty(orderId)) { +// List ioCodeEnttities = codeTempService.findByOrderId(orderId); +// IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); +// if (ioCodeEnttity == null) { +// return checkOriginCodeRes; +// } +// } else +// return checkOriginCodeRes; +// } else { +// udiEntity.setBatchNo(codeLostEntity.getBatchNo()); +// udiEntity.setExpireDate(codeLostEntity.getExpireDate()); +// udiEntity.setProduceDate(codeLostEntity.getProduceDate()); +// } + + if (StrUtil.isNotEmpty(orderId)) { + List ioCodeEnttities = codeTempService.findByOrderId(orderId); + IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); + if (ioCodeEnttity == null) { return checkOriginCodeRes; - } else { - udiEntity.setBatchNo(codeLostEntity.getBatchNo()); - udiEntity.setExpireDate(codeLostEntity.getExpireDate()); - udiEntity.setProduceDate(codeLostEntity.getProduceDate()); - } + } + } else + return checkOriginCodeRes; } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index b54a077c..3bb61adb 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -26,6 +26,7 @@ import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,11 +63,18 @@ public class IoOrderController extends BaseController { * @param filterOrderRequest * @return */ + @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/filter") public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) { + + if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } + String customerId = getCustomerId(); + if (!customerId.equals("110")) { + filterOrderRequest.setFromCorp(customerId); + } List list = orderService.filterList(filterOrderRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java new file mode 100644 index 00000000..cb1a4b00 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -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 purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purArrivalResponses); + PageSimpleResponse 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 purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purArrivalResponses); + PageSimpleResponse 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 purOrderDetailEntities = purArrivalDetailService.findByOrderId(purArrivalEntity.getId() + ""); + + //对计划单里面的供应商进行分组 + Map> 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> 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 purOrderDetailResponseList = purArrivalDetailService.joinQueryList(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageSimpleResponse 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("删除成功"); + } + +} diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java new file mode 100644 index 00000000..655283d1 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -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 purDeliveryResponses = purDeliveryService.queryPageList(purDeliveryRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purDeliveryResponses); + PageSimpleResponse 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 purDeliveryResponses = purDeliveryService.queryPageList(purDeliveryRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purDeliveryResponses); + PageSimpleResponse 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 purOrderDetailEntities = purDeliveryDetailService.findByOrderId(purDeliveryEntity.getId() + ""); + + //对计划单里面的供应商进行分组 + Map> 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> 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 purDeliveryDetailResponses = purDeliveryDetailService.joinQueryList(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purDeliveryDetailResponses); + PageSimpleResponse 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("删除成功"); + } + +} diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index acfe154d..8ced2256 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -85,8 +85,8 @@ public class PurOrderController { purOrderEntity.setUpdateUser(userId + ""); purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态 - if(postPurOrderRequest.getType()!=null){ - String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); + if (postPurOrderRequest.getType() != null) { + String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")); purOrderEntity.setBillNo(billNo); } @@ -153,7 +153,7 @@ public class PurOrderController { purOrderEntity.setAuditUser(userId + ""); purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); purOrderService.update(purOrderEntity); - String billNo=""; + String billNo = ""; List purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); //对计划单里面的供应商进行分组 @@ -161,13 +161,13 @@ public class PurOrderController { if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { - if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase()==true - && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction()) ) { + if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true + && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { - for (Map.Entry> m:map.entrySet()) { + for (Map.Entry> m : map.entrySet()) { //生产单据表信息 - IoOrderEntity ioOrderEntity=new IoOrderEntity(); - ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd"))); + 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(postPurOrderRequest.getTargetBillAction()); @@ -184,9 +184,9 @@ public class PurOrderController { ioOrderEntity.setDeptCode(postPurOrderRequest.getTargetDeptCode()); ioOrderEntity.setInvCode(postPurOrderRequest.getTargetSubInv()); ioOrderService.insertOrder(ioOrderEntity); - billNo+=ioOrderEntity.getBillNo()+","; - //插入业务单表 - for (PurOrderDetailEntity obj:m.getValue()) { + billNo += ioOrderEntity.getBillNo() + ","; + //插入业务单表 + for (PurOrderDetailEntity obj : m.getValue()) { BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); @@ -207,7 +207,7 @@ public class PurOrderController { ioOrderDetailBizService.insert(ioOrderDetailBizEntity); } } - purOrderEntity.setStockOrderNo(billNo.substring(0,billNo.length()-1)); + purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); purOrderService.update(purOrderEntity); } } @@ -235,55 +235,55 @@ public class PurOrderController { * 添加申购单到采购单里面 */ @PostMapping("/purchase/order/addPlanDetailAndOrder") - public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) { + public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) { if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) { - return ResultVOUtils.error(999,"参数错误！"); + return ResultVOUtils.error(999, "参数错误！"); } //查询申购单详情 - PurPlanDetailRequest purPlanDetailRequest=new PurPlanDetailRequest(); - purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId()+""); - List purApplyDetailEntityList=purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); + PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest(); + purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId() + ""); + List purApplyDetailEntityList = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); //使用stream拷贝list List purOrderDetailEntityList = purApplyDetailEntityList.stream() - .map(e-> { + .map(e -> { PurOrderDetailEntity d = new PurOrderDetailEntity(); BeanUtils.copyProperties(e, d); return d; }) .collect(Collectors.toList()); - for (PurOrderDetailEntity obj:purOrderDetailEntityList){ - obj.setOrderIdFk(purOrderRequest.getId()+""); + for (PurOrderDetailEntity obj : purOrderDetailEntityList) { + obj.setOrderIdFk(purOrderRequest.getId() + ""); } //获取详情表信息 - PurOrderDetailRequest PurOrderDetailRequest=new PurOrderDetailRequest(); + PurOrderDetailRequest PurOrderDetailRequest = new PurOrderDetailRequest(); PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + ""); - List purOrderDetailEntities=purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest); + List purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest); - List ids=new ArrayList<>(); - for (PurOrderDetailEntity obj:purOrderDetailEntities){ - for (PurOrderDetailEntity obj1:purOrderDetailEntityList){ - if(obj.getProductId().equals(obj1.getProductId())){ + List ids = new ArrayList<>(); + for (PurOrderDetailEntity obj : purOrderDetailEntities) { + for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) { + if (obj.getProductId().equals(obj1.getProductId())) { //获取存在在详情表和申购单里面一样的产品 - ids.add(obj.getId().longValue()); + ids.add(obj.getId().longValue()); break; } } } //删除存在的产品 - if(ids.size()>0){ + if (ids.size() > 0) { purOrderDetailService.deleteByIds(ids); } - boolean falg= purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); - if(falg){ + boolean falg = purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); + if (falg) { //查询申购单 return ResultVOUtils.success("添加成功"); - }else{ + } else { return ResultVOUtils.success("添加失败"); } } @@ -293,14 +293,14 @@ public class PurOrderController { * 添加产品到采购单里面 */ @PostMapping("/purchase/order/addOrderDetail") - public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { + public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { - boolean falg=purOrderDetailService.insert(purOrderDetailEntity); - if(falg){ - return ResultVOUtils.success("添加成功"); - }else { - return ResultVOUtils.success("添加失败"); - } + boolean falg = purOrderDetailService.insert(purOrderDetailEntity); + if (falg) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.success("添加失败"); + } } @@ -312,13 +312,13 @@ public class PurOrderController { @PostMapping("/purchase/order/add") public BaseResponse add() { Long userId = customerService.getUserId(); - PurOrderEntity purOrderEntity= new PurOrderEntity(); + PurOrderEntity purOrderEntity = new PurOrderEntity(); purOrderEntity.setCreateUser(userId + ""); purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateUser(userId + ""); purOrderService.insert(purOrderEntity); - Long id=purOrderEntity.getId(); + Long id = purOrderEntity.getId(); return ResultVOUtils.success(id); } @@ -329,13 +329,13 @@ public class PurOrderController { @PostMapping("/purchase/order/delOrderDetailAll") public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { - if(purApplyEntity.getId()!=null){ + if (purApplyEntity.getId() != null) { purOrderService.deleteById(purApplyEntity.getId()); - purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); - }else { - return ResultVOUtils.error(999,"参数有误！"); + purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + ""); + } else { + return ResultVOUtils.error(999, "参数有误！"); } - return ResultVOUtils.success(); + return ResultVOUtils.success(); } /** @@ -347,6 +347,7 @@ public class PurOrderController { purOrderDetailService.update(purOrderDetailEntity); return ResultVOUtils.success("修改成功"); } + /** * 删除采购订单 * diff --git a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java new file mode 100644 index 00000000..229b1613 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java @@ -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 purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purReturnedResponses); + PageSimpleResponse 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 purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purReturnedResponses); + PageSimpleResponse 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 purReturnedDetailEntities = purReturnedDetailService.findByOrderId(purReturnedEntity.getId() + ""); + + //对计划单里面的供应商进行分组 + Map> 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> 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 purOrderDetailResponseList = purReturnedDetailService.joinQueryList(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageSimpleResponse 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("删除成功"); + } + + +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java new file mode 100644 index 00000000..68d48ee1 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java @@ -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 { + + List queryPageList(PurArrivalRequest purArrivalRequest); +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java new file mode 100644 index 00000000..db15cbbf --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java @@ -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 { + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean update(PurArrivalDetailEntity purArrivalDetailEntity); + + Boolean deleteByIds(@Param("ids") List ids); + + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + + boolean insertPurArrivalDetailEntity(@Param("datas") List purArrivalDetailEntities); + + BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); + +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java new file mode 100644 index 00000000..3cc894d6 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java @@ -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 { + + List queryPageList(PurDeliveryRequest purDeliveryRequest); +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java new file mode 100644 index 00000000..06c378b3 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java @@ -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 { + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity); + + Boolean deleteByIds(@Param("ids") List ids); + + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + + boolean insertPurDeliveryDetailEntity(@Param("datas") List purOrderDetailEntityList); + + BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); + +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java index af60ca52..7af0b48e 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java @@ -7,10 +7,12 @@ import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; 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 PurOrderDetailDao extends BaseMapper { List queryPageList(PurOrderDetailRequest purOrderDetailRequest); @@ -26,4 +28,4 @@ public interface PurOrderDetailDao extends BaseMapper { boolean insertPurOrderDetailEntity(@Param("datas") List purOrderDetailEntityList); BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java new file mode 100644 index 00000000..f2324d42 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java @@ -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 { + + List queryPageList(PurReturnedRequest purReturnedRequest); +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java new file mode 100644 index 00000000..e19cbcca --- /dev/null +++ b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java @@ -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 { + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean update(PurReturnedDetailEntity purOrderDetailEntity); + + Boolean deleteByIds(@Param("ids") List ids); + + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + + boolean insertPurReturnedDetailEntity(@Param("datas") List purOrderDetailEntityList); + + BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id); +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurArrivalDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurArrivalDetailEntity.java new file mode 100644 index 00000000..e5616931 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurArrivalDetailEntity.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurArrivalEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurArrivalEntity.java new file mode 100644 index 00000000..c699441f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurArrivalEntity.java @@ -0,0 +1,135 @@ +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; + +import java.util.Date; + +/** + * 到货单 + */ +@Data +@TableName(value = "pur_arrival") +public class PurArrivalEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据日期 + */ + @TableField(value = "billDate") + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 订单类型 + */ + @TableField(value = "billType") + private String billType; + + /** + * 订单说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 当前分库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 所属部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 审核说明 + */ + @TableField(value = "auditRemark") + private String auditRemark; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 申购人 + */ + @TableField(value = "applyCreateUser") + private String applyCreateUser; + + /** + * 申购审核人 + */ + @TableField(value = "applyAuditUser") + private String applyAuditUser; + + /** + * 申购说明 + */ + @TableField(value = "applyRemark") + private String applyRemark; + + /** + * 申购单据号，多单以逗号隔开 + */ + @TableField(value = "applyBillNo") + private String applyBillNo; + + /** + * 生成采购入库业务单据 + */ + @TableField(value = "stockOrderNo") + private String stockOrderNo; + +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurDeliveryDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryDetailEntity.java new file mode 100644 index 00000000..900eca98 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryDetailEntity.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java new file mode 100644 index 00000000..824850aa --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java @@ -0,0 +1,134 @@ +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; + +import java.util.Date; +/** + * 送货单 + */ + +@Data +@TableName(value = "pur_delivery") +public class PurDeliveryEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据日期 + */ + @TableField(value = "billDate") + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 订单类型 + */ + @TableField(value = "billType") + private String billType; + + /** + * 订单说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 当前分库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 所属部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 审核说明 + */ + @TableField(value = "auditRemark") + private String auditRemark; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 申购人 + */ + @TableField(value = "applyCreateUser") + private String applyCreateUser; + + /** + * 申购审核人 + */ + @TableField(value = "applyAuditUser") + private String applyAuditUser; + + /** + * 申购说明 + */ + @TableField(value = "applyRemark") + private String applyRemark; + + /** + * 申购单据号，多单以逗号隔开 + */ + @TableField(value = "applyBillNo") + private String applyBillNo; + + /** + * 生成采购入库业务单据 + */ + @TableField(value = "stockOrderNo") + private String stockOrderNo; +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 14ed1551..0c56735f 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -166,4 +166,4 @@ public class PurOrderEntity { public static final String COL_APPLYBILLNO = "applyBillNo"; public static final String COL_STOCKORDERNO = "stockOrderNo"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurReturnedDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurReturnedDetailEntity.java new file mode 100644 index 00000000..c51719c8 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurReturnedDetailEntity.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurReturnedEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurReturnedEntity.java new file mode 100644 index 00000000..bcd09d14 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/purchase/PurReturnedEntity.java @@ -0,0 +1,135 @@ +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; + +import java.util.Date; + +/** + * 退货单 + */ +@Data +@TableName(value = "pur_returned") +public class PurReturnedEntity { + + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据日期 + */ + @TableField(value = "billDate") + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 订单类型 + */ + @TableField(value = "billType") + private String billType; + + /** + * 订单说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 当前分库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 所属部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 审核说明 + */ + @TableField(value = "auditRemark") + private String auditRemark; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 申购人 + */ + @TableField(value = "applyCreateUser") + private String applyCreateUser; + + /** + * 申购审核人 + */ + @TableField(value = "applyAuditUser") + private String applyAuditUser; + + /** + * 申购说明 + */ + @TableField(value = "applyRemark") + private String applyRemark; + + /** + * 申购单据号，多单以逗号隔开 + */ + @TableField(value = "applyBillNo") + private String applyBillNo; + + /** + * 生成采购入库业务单据 + */ + @TableField(value = "stockOrderNo") + private String stockOrderNo; +} diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurArrivalRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurArrivalRequest.java new file mode 100644 index 00000000..c7c71af9 --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PostPurArrivalRequest.java @@ -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 purArrivalDetailEntities; + Integer type; + boolean autoPurchase; + String targetSubInv; + String targetBillAction; + String targetDeptCode; + +} diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurDeliveryRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurDeliveryRequest.java new file mode 100644 index 00000000..287cb97e --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PostPurDeliveryRequest.java @@ -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 purDeliveryDetailEntities; + Integer type; + boolean autoPurchase; + String targetSubInv; + String targetBillAction; + String targetDeptCode; + +} diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java index 170118cd..e78fdd1a 100644 --- a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java @@ -15,7 +15,6 @@ public class PostPurOrderRequest { int editStatus; PurOrderEntity purOrderEntity; List purOrderDetailEntityList; -// List subErpOrders; Integer type; boolean autoPurchase; String targetSubInv; diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurReturnedRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurReturnedRequest.java new file mode 100644 index 00000000..586855af --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PostPurReturnedRequest.java @@ -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 purReturnedDetailEntities; + Integer type; + boolean autoPurchase; + String targetSubInv; + String targetBillAction; + String targetDeptCode; + +} diff --git a/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java b/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java new file mode 100644 index 00000000..99e243f4 --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PurArrivalRequest.java @@ -0,0 +1,70 @@ +package com.glxp.api.req.purchase; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class PurArrivalRequest extends ListPageRequest { + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + + /** + * 申购类型 + */ + private Long billType; + + /** + * 申购说明 + */ + private String remark; + + /** + * 当前仓库 + */ + private String invCode; + + /** + * 所属部门 + */ + private String deptCode; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 审核时间 + */ + private Date auditTime; + + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + private String startDate; + private String endDate; + + private Long applyId; + +} diff --git a/src/main/java/com/glxp/api/req/purchase/PurDeliveryRequest.java b/src/main/java/com/glxp/api/req/purchase/PurDeliveryRequest.java new file mode 100644 index 00000000..d15da084 --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PurDeliveryRequest.java @@ -0,0 +1,70 @@ +package com.glxp.api.req.purchase; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class PurDeliveryRequest extends ListPageRequest { + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + + /** + * 申购类型 + */ + private Long billType; + + /** + * 申购说明 + */ + private String remark; + + /** + * 当前仓库 + */ + private String invCode; + + /** + * 所属部门 + */ + private String deptCode; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 审核时间 + */ + private Date auditTime; + + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + private String startDate; + private String endDate; + + private Long applyId; + +} diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java index 6d4bc6da..ee86ecb3 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java @@ -13,37 +13,31 @@ public class PurOrderDetailRequest extends ListPageRequest { /** * */ - @NotNull(message = "不能为空") private Long id; /** * 订单外键 */ - @NotBlank(message = "订单外键不能为空") private String orderIdFk; /** * 产品ID */ - @NotNull(message = "产品ID不能为空") private Long productId; /** * 产品名称 */ - @NotBlank(message = "产品名称不能为空") private String productName; /** * 数量 */ - @NotNull(message = "数量不能为空") private Long count; /** * 供应商ID */ - @NotBlank(message = "供应商ID不能为空") private String supId; diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java index 1800d685..8532a5d1 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -90,9 +90,7 @@ public class PurOrderRequest extends ListPageRequest { private String startDate; private String endDate; - private Long applyId; - - + private Long applyId; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurReturnedRequest.java b/src/main/java/com/glxp/api/req/purchase/PurReturnedRequest.java new file mode 100644 index 00000000..52d6d81a --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/PurReturnedRequest.java @@ -0,0 +1,69 @@ +package com.glxp.api.req.purchase; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class PurReturnedRequest extends ListPageRequest { + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + + /** + * 申购类型 + */ + private Long billType; + + /** + * 申购说明 + */ + private String remark; + + /** + * 当前仓库 + */ + private String invCode; + + /** + * 所属部门 + */ + private String deptCode; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 审核时间 + */ + private Date auditTime; + + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + private String startDate; + private String endDate; + + private Long applyId; +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurArrivalDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurArrivalDetailResponse.java new file mode 100644 index 00000000..d4e36747 --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurArrivalDetailResponse.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurArrivalResponse.java b/src/main/java/com/glxp/api/res/purchase/PurArrivalResponse.java new file mode 100644 index 00000000..230d1cbd --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurArrivalResponse.java @@ -0,0 +1,73 @@ +package com.glxp.api.res.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PurArrivalResponse { + /** + * + */ + private Integer id; + /** + * 单据号 + */ + private String billNo; + /** + * 单据日期 + */ + private Date billDate; + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + /** + * 申购类型 + */ + private String billType; + /** + * 申购说明 + */ + private String remark; + private String invCode; + /** + * 所属部门 + */ + private String deptCode; + /** + * 审核人 + */ + private String auditBy; + /** + * 审核时间 + */ + private Date auditTime; + + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private Date updateTime; + + private String invName; + private String subInvName; + private String deptName; + private String auditRemark; + + private String applyCreateBy; //申购人 + private String applyAuditBy; //申购审核人 + private String applyRemark; //申购说明 + private String applyBillNo; //申购单据号，多单以逗号隔开 + + private String stockOrderNo; + + private String createUser; + private String updateUser; + + private String createUserName; + private String auditUserName; +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurDeliveryDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurDeliveryDetailResponse.java new file mode 100644 index 00000000..b88940e7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurDeliveryDetailResponse.java @@ -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; +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java b/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java new file mode 100644 index 00000000..59f87c70 --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurDeliveryResponse.java @@ -0,0 +1,73 @@ +package com.glxp.api.res.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PurDeliveryResponse { + /** + * + */ + private Integer id; + /** + * 单据号 + */ + private String billNo; + /** + * 单据日期 + */ + private Date billDate; + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + /** + * 申购类型 + */ + private String billType; + /** + * 申购说明 + */ + private String remark; + private String invCode; + /** + * 所属部门 + */ + private String deptCode; + /** + * 审核人 + */ + private String auditBy; + /** + * 审核时间 + */ + private Date auditTime; + + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private Date updateTime; + + private String invName; + private String subInvName; + private String deptName; + private String auditRemark; + + private String applyCreateBy; //申购人 + private String applyAuditBy; //申购审核人 + private String applyRemark; //申购说明 + private String applyBillNo; //申购单据号，多单以逗号隔开 + + private String stockOrderNo; + + private String createUser; + private String updateUser; + + private String createUserName; + private String auditUserName; +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurReturnedDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurReturnedDetailResponse.java new file mode 100644 index 00000000..40d1ddd3 --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurReturnedDetailResponse.java @@ -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; + + +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurReturnedResponse.java b/src/main/java/com/glxp/api/res/purchase/PurReturnedResponse.java new file mode 100644 index 00000000..ce9d606f --- /dev/null +++ b/src/main/java/com/glxp/api/res/purchase/PurReturnedResponse.java @@ -0,0 +1,73 @@ +package com.glxp.api.res.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PurReturnedResponse { + /** + * + */ + private Integer id; + /** + * 单据号 + */ + private String billNo; + /** + * 单据日期 + */ + private Date billDate; + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + /** + * 申购类型 + */ + private String billType; + /** + * 申购说明 + */ + private String remark; + private String invCode; + /** + * 所属部门 + */ + private String deptCode; + /** + * 审核人 + */ + private String auditBy; + /** + * 审核时间 + */ + private Date auditTime; + + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private Date updateTime; + + private String invName; + private String subInvName; + private String deptName; + private String auditRemark; + + private String applyCreateBy; //申购人 + private String applyAuditBy; //申购审核人 + private String applyRemark; //申购说明 + private String applyBillNo; //申购单据号，多单以逗号隔开 + + private String stockOrderNo; + + private String createUser; + private String updateUser; + + private String createUserName; + private String auditUserName; +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java new file mode 100644 index 00000000..3f70c54b --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java @@ -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 joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + List findByOrderId(String orderId); + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity); + + Boolean update(PurArrivalDetailEntity purReturnedDetailEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteByOrderId(String orderIdfK); + + boolean insertPurArrivalDetailEntity(List purReturnedDetailEntity); + + BasicProductsEntity selectIoOrderDetailBiz(long id); + +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java b/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java new file mode 100644 index 00000000..7a105889 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java @@ -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 queryPageList(PurArrivalRequest purArrivalRequest); + + Boolean insert(PurArrivalEntity purArrivalEntity); + + Boolean update(PurArrivalEntity purArrivalEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteById(long id); + +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java new file mode 100644 index 00000000..09aaafeb --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java @@ -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 joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + List findByOrderId(String orderId); + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean insert(PurDeliveryDetailEntity purDeliveryDetailEntity); + + Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteByOrderId(String orderIdfK); + + boolean insertPurDeliveryDetailEntity(List purDeliveryDetailEntitys); + + BasicProductsEntity selectIoOrderDetailBiz(long id); + +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurDeliveryService.java b/src/main/java/com/glxp/api/service/purchase/PurDeliveryService.java new file mode 100644 index 00000000..0ab3400a --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurDeliveryService.java @@ -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 queryPageList(PurDeliveryRequest purDeliveryRequest); + + Boolean insert(PurDeliveryEntity purDeliveryEntity); + + Boolean update(PurDeliveryEntity purDeliveryEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteById(long id); +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java index 55da6781..ec7f9659 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java @@ -15,7 +15,6 @@ public interface PurOrderDetailService { List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); - List findByOrderId(String orderId); List queryPageList(PurOrderDetailRequest purOrderDetailRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java new file mode 100644 index 00000000..0bbaa59e --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java @@ -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 joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + + List findByOrderId(String orderId); + + List queryPageList(PurOrderDetailRequest purOrderDetailRequest); + + List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); + + Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity); + + Boolean update(PurReturnedDetailEntity purReturnedDetailEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteByOrderId(String orderIdfK); + + boolean insertPurReturnedDetailEntity(List purReturnedDetailEntity); + + BasicProductsEntity selectIoOrderDetailBiz(long id); + + +} diff --git a/src/main/java/com/glxp/api/service/purchase/PurReturnedService.java b/src/main/java/com/glxp/api/service/purchase/PurReturnedService.java new file mode 100644 index 00000000..0787d492 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/PurReturnedService.java @@ -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 queryPageList(PurReturnedRequest purReturnedRequest); + + Boolean insert(PurReturnedEntity purReturnedEntity); + + Boolean update(PurReturnedEntity purReturnedEntity); + + Boolean deleteByIds(List ids); + + Boolean deleteById(long id); + +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java new file mode 100644 index 00000000..6b916e92 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java @@ -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 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 data = purArrivalDetailDao.joinQueryList(purOrderDetailRequest); + return data; + } + + @Override + public List findByOrderId(String orderId) { + PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest(); + purOrderDetailRequest.setOrderIdFk(orderId); + List data = purArrivalDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 data = purArrivalDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 ids) { + return purArrivalDetailDao.deleteByIds(ids); + } + + @Override + public Boolean deleteByOrderId(String orderIdfK) { + return purArrivalDetailDao.deleteByOrderId(orderIdfK); + } + + @Override + public boolean insertPurArrivalDetailEntity(List purReturnedDetailEntity) { + return purArrivalDetailDao.insertPurArrivalDetailEntity(purReturnedDetailEntity); + } + + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return purArrivalDetailDao.selectIoOrderDetailBiz(id); + } +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java new file mode 100644 index 00000000..6df1162d --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java @@ -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 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 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 ids) { + return purArrivalDao.deleteBatchIds(ids) > 0 ? true : false; + } + + @Override + public Boolean deleteById(long id) { + return purArrivalDao.deleteById(id) > 0 ? true : false; + } +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java new file mode 100644 index 00000000..363b45b3 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java @@ -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 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 data = purDeliveryDetailDao.joinQueryList(purOrderDetailRequest); + return data; + } + + @Override + public List findByOrderId(String orderId) { + PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest(); + purOrderDetailRequest.setOrderIdFk(orderId); + List data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 data = purDeliveryDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 ids) { + return purDeliveryDetailDao.deleteByIds(ids); + } + + @Override + public Boolean deleteByOrderId(String orderIdfK) { + return purDeliveryDetailDao.deleteByOrderId(orderIdfK); + } + + @Override + public boolean insertPurDeliveryDetailEntity(List purReturnedDetailEntity) { + return purDeliveryDetailDao.insertPurDeliveryDetailEntity(purReturnedDetailEntity); + } + + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return purDeliveryDetailDao.selectIoOrderDetailBiz(id); + } +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java new file mode 100644 index 00000000..0aa94354 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java @@ -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 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 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 ids) { + return purDeliveryDao.deleteBatchIds(ids) > 0 ? true : false; + } + + @Override + public Boolean deleteById(long id) { + return purDeliveryDao.deleteById(id) > 0 ? true : false; + } +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index ad9919da..db5639a0 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -20,9 +20,6 @@ import java.util.List; @Service public class PurOrderServiceImpl implements PurOrderService { - @Resource - PurPlanDao purPlanDao; - @Resource PurOrderDao purOrderDao; @@ -41,21 +38,21 @@ public class PurOrderServiceImpl implements PurOrderService { @Override public Boolean insert(PurOrderEntity purOrderEntity) { - return purOrderDao.insert(purOrderEntity)>0 ? true:false; + return purOrderDao.insert(purOrderEntity) > 0 ? true : false; } @Override public Boolean update(PurOrderEntity purOrderEntity) { - return purOrderDao.updateById(purOrderEntity)>0 ? true:false; + return purOrderDao.updateById(purOrderEntity) > 0 ? true : false; } @Override public Boolean deleteByIds(List ids) { - return purOrderDao.deleteBatchIds(ids)>0 ? true:false; + return purOrderDao.deleteBatchIds(ids) > 0 ? true : false; } @Override public Boolean deleteById(long id) { - return purOrderDao.deleteById(id)>0 ? true:false; + return purOrderDao.deleteById(id) > 0 ? true : false; } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java new file mode 100644 index 00000000..f4e429a6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java @@ -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 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 data = purReturnedDetailDao.joinQueryList(purOrderDetailRequest); + return data; + } + + @Override + public List findByOrderId(String orderId) { + PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest(); + purOrderDetailRequest.setOrderIdFk(orderId); + List data = purReturnedDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 data = purReturnedDetailDao.queryPageList(purOrderDetailRequest); + return data; + } + + @Override + public List 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 ids) { + return purReturnedDetailDao.deleteByIds(ids); + } + + @Override + public Boolean deleteByOrderId(String orderIdfK) { + return purReturnedDetailDao.deleteByOrderId(orderIdfK); + } + + @Override + public boolean insertPurReturnedDetailEntity(List purReturnedDetailEntity) { + return purReturnedDetailDao.insertPurReturnedDetailEntity(purReturnedDetailEntity); + } + + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return purReturnedDetailDao.selectIoOrderDetailBiz(id); + } +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java new file mode 100644 index 00000000..7a586591 --- /dev/null +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java @@ -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 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 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 ids) { + return purReturnedDao.deleteBatchIds(ids) > 0 ? true : false; + } + + @Override + public Boolean deleteById(long id) { + return purReturnedDao.deleteById(id) > 0 ? true : false; + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index afaae9e7..833ca2c7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: pro jmx: enabled: true diff --git a/src/main/resources/mybatis/mapper/purchase/PurArrivalDao.xml b/src/main/resources/mybatis/mapper/purchase/PurArrivalDao.xml new file mode 100644 index 00000000..893286b9 --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurArrivalDao.xml @@ -0,0 +1,54 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurArrivalDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurArrivalDetailDao.xml new file mode 100644 index 00000000..fe8a0524 --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurArrivalDetailDao.xml @@ -0,0 +1,117 @@ + + + + + + + + + + DELETE + FROM pur_arrival_detail WHERE id in + + #{item} + + + + + + DELETE + FROM pur_arrival_detail + WHERE orderIdFk = #{orderIdFk} + + + + UPDATE pur_arrival_detail + + + orderIdFk=#{orderIdFk}, + + + productId=#{productId}, + + + productName=#{productName}, + + + `count`=#{count}, + + + supId=#{supId}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + WHERE id = #{id} + + + + + REPLACE INTO pur_arrival_detail + (orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values + + + (#{item.orderIdFk}, + #{item.productId}, + #{item.productName}, + #{item.count}, + #{item.supId}, + #{item.zczbhhzbapzbh}) + + + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml new file mode 100644 index 00000000..4a85bb75 --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDao.xml @@ -0,0 +1,54 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurDeliveryDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDetailDao.xml new file mode 100644 index 00000000..22e15d3b --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurDeliveryDetailDao.xml @@ -0,0 +1,117 @@ + + + + + + + + + + DELETE + FROM pur_delivery_detail WHERE id in + + #{item} + + + + + + DELETE + FROM pur_delivery_detail + WHERE orderIdFk = #{orderIdFk} + + + + UPDATE pur_delivery_detail + + + orderIdFk=#{orderIdFk}, + + + productId=#{productId}, + + + productName=#{productName}, + + + `count`=#{count}, + + + supId=#{supId}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + WHERE id = #{id} + + + + + REPLACE INTO pur_delivery_detail + (orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values + + + (#{item.orderIdFk}, + #{item.productId}, + #{item.productName}, + #{item.count}, + #{item.supId}, + #{item.zczbhhzbapzbh}) + + + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurReturnedDao.xml b/src/main/resources/mybatis/mapper/purchase/PurReturnedDao.xml new file mode 100644 index 00000000..ee891795 --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurReturnedDao.xml @@ -0,0 +1,54 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurReturnedDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurReturnedDetailDao.xml new file mode 100644 index 00000000..e294df5d --- /dev/null +++ b/src/main/resources/mybatis/mapper/purchase/PurReturnedDetailDao.xml @@ -0,0 +1,117 @@ + + + + + + + + + + DELETE + FROM pur_returned_detail WHERE id in + + #{item} + + + + + + DELETE + FROM pur_returned_detail + WHERE orderIdFk = #{orderIdFk} + + + + UPDATE pur_returned_detail + + + orderIdFk=#{orderIdFk}, + + + productId=#{productId}, + + + productName=#{productName}, + + + `count`=#{count}, + + + supId=#{supId}, + + + zczbhhzbapzbh=#{zczbhhzbapzbh}, + + + WHERE id = #{id} + + + + + REPLACE INTO pur_returned_detail + (orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values + + + (#{item.orderIdFk}, + #{item.productId}, + #{item.productName}, + #{item.count}, + #{item.supId}, + #{item.zczbhhzbapzbh}) + + + + +