From 9782e2a47d6032f95756acb733ea19cd99fb369d Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 14 Oct 2024 14:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 68 ++-- .../controller/inout/IoOrderController.java | 5 - .../inout/IoOrderDetailBizController.java | 2 - .../inv/InvPreinOrderController.java | 9 - .../controller/inv/InvProductController.java | 2 - .../inv/InvUserProductController.java | 41 --- .../controller/inv/UdiTraceController.java | 4 - .../thrsys/ForThirdSysApiController.java | 1 - .../api/dao/inv/InvPreInProductDetailDao.java | 1 - .../api/dao/inv/InvPreProductDetailDao.java | 1 - .../glxp/api/dao/inv/InvProductDetailDao.java | 3 - .../entity/inv/InvProductDetailEntity.java | 138 -------- .../api/req/inv/AddInvPlaceOrderRequest.java | 1 - .../DeviceReceiveOrderDetailServiceImpl.java | 1 - .../api/service/inout/IoAddInoutService.java | 2 - .../service/inout/IoChangeInoutService.java | 55 +--- .../api/service/inout/IoCheckInvService.java | 1 - .../api/service/inout/IoGenInvService.java | 28 +- .../api/service/inout/impl/IoCodeService.java | 2 - .../inout/impl/IoOrderServiceImpl.java | 3 - .../inv/InvPreProductDetailService.java | 2 - .../inv/impl/InvProductDetailService.java | 306 ------------------ 22 files changed, 33 insertions(+), 643 deletions(-) delete mode 100644 src/main/java/com/glxp/api/controller/inv/InvUserProductController.java delete mode 100644 src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java delete mode 100644 src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java 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 0c4b199e9..7f8b813aa 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,25 +1,17 @@ package com.glxp.api.controller.inout; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.collect.IoCollectCode; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderOrigin; -import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.service.collect.*; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductDetailService; -import org.aspectj.weaver.ast.Var; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -42,7 +34,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeTempResponse; -import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; @@ -92,8 +83,6 @@ public class IoCodeTempController extends BaseController { @Resource InvPreinProductDetailService invPreinProductDetailService; @Resource - InvProductDetailService invProductDetailService; - @Resource IoCodeLostService codeLostService; @Resource IoOrderDetailBizService orderDetailBizService; @@ -960,19 +949,21 @@ public class IoCodeTempController extends BaseController { String priceFifo = systemParamConfigService.selectValueByParamKey("price_fifo"); if (IntUtil.value(priceFifo) > 0) { if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - //1.获取当前批次已出库数量 - Integer outCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_OUT); - //2.获取当前批次入库数量 - Integer inCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT); - if ((IntUtil.value(inCount) - IntUtil.value(outCount) - IntUtil.value(exitLocalEntity.getReCount())) < 0) { - InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT, exitLocalEntity.getInBatchNo()); - if (nextInvProduct != null) { - genDetaiEntity.setPrice(nextInvProduct.getPrice()); - genDetaiEntity.setInBatchNo(nextInvProduct.getInBatchNo()); - codeTempService.insert(genDetaiEntity); - update = false; - } - } + // TODO: 2024/10/14 判断价格先进先出 + +// //1.获取当前批次已出库数量 +// Integer outCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_OUT); +// //2.获取当前批次入库数量 +// Integer inCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT); +// if ((IntUtil.value(inCount) - IntUtil.value(outCount) - IntUtil.value(exitLocalEntity.getReCount())) < 0) { +// InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT, exitLocalEntity.getInBatchNo()); +// if (nextInvProduct != null) { +// genDetaiEntity.setPrice(nextInvProduct.getPrice()); +// genDetaiEntity.setInBatchNo(nextInvProduct.getInBatchNo()); +// codeTempService.insert(genDetaiEntity); +// update = false; +// } +// } // checkPrice(); } @@ -1423,19 +1414,22 @@ public class IoCodeTempController extends BaseController { String priceFifo = systemParamConfigService.selectValueByParamKey("price_fifo"); if (IntUtil.value(priceFifo) > 0) { if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - //1.获取当前批次已出库数量 - Integer outCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_OUT); - //2.获取当前批次入库数量 - Integer inCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT); - if ((IntUtil.value(inCount) - IntUtil.value(outCount) - IntUtil.value(exitLocalEntity.getReCount())) < 0) { - InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT, exitLocalEntity.getInBatchNo()); - if (nextInvProduct != null) { - genDetaiEntity.setPrice(nextInvProduct.getPrice()); - genDetaiEntity.setInBatchNo(nextInvProduct.getInBatchNo()); - codeTempService.insert(genDetaiEntity); - update = false; - } - } + + + // TODO: 2024/10/14 价格先进先出 +// //1.获取当前批次已出库数量 +// Integer outCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_OUT); +// //2.获取当前批次入库数量 +// Integer inCount = invProductDetailService.selectCountByInBatch(exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), bussinessTypeEntity, exitLocalEntity.getInBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT); +// if ((IntUtil.value(inCount) - IntUtil.value(outCount) - IntUtil.value(exitLocalEntity.getReCount())) < 0) { +// InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, exitLocalEntity.getRelId() + "", exitLocalEntity.getBatchNo(), exitLocalEntity.getInvCode(), ConstantType.TYPE_PUT, exitLocalEntity.getInBatchNo()); +// if (nextInvProduct != null) { +// genDetaiEntity.setPrice(nextInvProduct.getPrice()); +// genDetaiEntity.setInBatchNo(nextInvProduct.getInBatchNo()); +// codeTempService.insert(genDetaiEntity); +// update = false; +// } +// } // checkPrice(); } 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 ee22b8439..fdc60c49d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -25,7 +25,6 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.req.basic.BasicDataRequest; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.req.inout.*; import com.glxp.api.req.system.DeleteRequest; @@ -34,7 +33,6 @@ import com.glxp.api.res.inout.*; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvBusUserService; import com.glxp.api.service.auth.InvWarehouseService; -import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; @@ -42,7 +40,6 @@ import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; @@ -93,8 +90,6 @@ public class IoOrderController extends BaseController { InvPreProductDetailService invPreProductDetailService; @Resource InvPreinProductDetailService invPreinProductDetailService; - @Resource - InvProductDetailService invProductDetailService; @Resource IoOrderInvoiceService ioOrderInvoiceService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 8d15c8a72..cf9838dcd 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -44,7 +43,6 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inout.impl.ReceiveDetailService; import com.glxp.api.service.inout.impl.ReceiveService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.purchase.PurOrderService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 82df88b67..8a1a77732 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -10,15 +10,9 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inout.CheckPreInInvRequest; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreinDetailResponse; @@ -27,13 +21,10 @@ import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.regexp.RE; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index b445e92c5..190e38d01 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.inv; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.inv.impl.InvProductService; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; @@ -17,7 +16,6 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductRequest; diff --git a/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java b/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java deleted file mode 100644 index 80a41b8d7..000000000 --- a/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.controller.inv; - -import com.glxp.api.controller.BaseController; -import com.glxp.api.service.inv.InvUserProductService; -import com.glxp.api.service.inv.impl.InvProductDetailService; -import groovy.util.logging.Slf4j; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * 用户库存查询接口 - */ -@Slf4j -@RestController -public class InvUserProductController extends BaseController { - - @Resource - private InvUserProductService invUserProductService; - @Resource - private InvProductDetailService invProductDetailServicel; - - -// /** -// * 添加库存 -// * -// * @param invUserProductEntity -// * @return -// */ -// @PostMapping("/spms/inv/user/product/add") -// @Log(title = "用户库存查询", businessType = BusinessType.INSERT) -// public BaseResponse addInvUserProduct(@RequestBody InvUserProductEntity invUserProductEntity) { -// -// invUserProductService. -// -// -// } - - - -} diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 881d46c07..125ccfd2b 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -9,7 +9,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterCodeTraceRequest; @@ -21,7 +20,6 @@ import com.glxp.api.res.inv.UdiTraceResponse; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -40,8 +38,6 @@ public class UdiTraceController { @Resource UdiProductService udiProductService; @Resource - InvProductDetailService invProductDetailService; - @Resource IoOrderService orderService; @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java index 8d86adc0d..69d1e55d4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java @@ -23,7 +23,6 @@ import com.glxp.api.service.forthird.impl.ForThirdSysApiService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java index 245cdc5d2..2f72c3ab1 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java index 5153f09fd..7f296b7e2 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java index 353e7aa07..b5f9ca676 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java @@ -1,15 +1,12 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; -import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.res.inv.InvPreinProductResponse; import com.glxp.api.res.inv.InvProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java deleted file mode 100644 index 6fdb7f7f2..000000000 --- a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.glxp.api.entity.inv; - -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.math.BigDecimal; -import java.util.Date; - -@Data -@TableName(value = "inv_product_detail") -public class InvProductDetailEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - /** - * UDI码 - */ - @TableField(value = "code") - private String code; - - /** - * 订单号外键 - */ - @TableField(value = "orderId") - private String orderId; - - /** - * 耗材字典ID - */ - @TableField(value = "relId") - private Long relId; - - /** - * 最小销售标识 - */ - @TableField(value = "nameCode") - private String nameCode; - - /** - * 批次号 - */ - @TableField(value = "batchNo") - private String batchNo; - - /** - * 生产日期 - */ - @TableField(value = "produceDate") - private String produceDate; - - /** - * 失效日期 - */ - @TableField(value = "expireDate") - private String expireDate; - - /** - * 序列号 - */ - @TableField(value = "serialNo") - private String serialNo; - - /** - * 供应商 - */ - @TableField(value = "supId") - private String supId; - - /** - * 扫码数量 - */ - @TableField(value = "`count`") - private Integer count; - - /** - * 实际数量 - */ - @TableField(value = "reCount") - private Integer reCount; - - - @TableField(value = "inCount") - private Integer inCount; - - - @TableField(value = "outCount") - private Integer outCount; - - /** - * 部门编码 - */ - @TableField(value = "deptCode") - private String deptCode; - - /** - * 仓库编码 - */ - @TableField(value = "invCode") - private String invCode; - - /** - * 货位编码 - */ - @TableField(value = "invSpaceCode") - private String invSpaceCode; - - /** - * 采购类型 - */ - @TableField(value = "purchaseType") - private Integer purchaseType; - - /** - * 更新时间 - */ - @TableField(value = "updateTime") - private Date updateTime; - - @TableField(value = "mainAction") - private String mainAction; - - @TableField(value = "action") - private String action; - - /** - * 价格 - */ - @TableField(value = "price") - private BigDecimal price; - /** - * 入院批号 - */ - @TableField(value = "inBatchNo") - private String inBatchNo; -} diff --git a/src/main/java/com/glxp/api/req/inv/AddInvPlaceOrderRequest.java b/src/main/java/com/glxp/api/req/inv/AddInvPlaceOrderRequest.java index e4ca26b12..4ac0287c1 100644 --- a/src/main/java/com/glxp/api/req/inv/AddInvPlaceOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddInvPlaceOrderRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.inv; -import com.glxp.api.entity.inv.InvProductDetailEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java index 5802b13bd..037c812ba 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -15,7 +15,6 @@ import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.dev.DeptDeviceDetailEntity; import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.dev.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 27473ad86..9533662e1 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.inv.impl.InvProductService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -22,7 +21,6 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.req.inout.PdaPostOrderRequest; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 30b1a9189..8d3ff8c37 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.util.*; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; @@ -17,7 +16,6 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -43,8 +41,6 @@ public class IoChangeInoutService { @Resource IoOrderService orderService; @Resource - InvProductDetailService invProductDetailService; - @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource GennerOrderUtils gennerOrderUtils; @@ -84,7 +80,7 @@ public class IoChangeInoutService { //普通出入库单据流转 - public void genNewOrder(IoOrderEntity orderEntity, List invProductDetailEntities) { + public void genNewOrder(IoOrderEntity orderEntity) { if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP && (orderEntity.getOutChangeEnable() != null && !orderEntity.getOutChangeEnable())) { return; @@ -92,59 +88,10 @@ public class IoChangeInoutService { BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction()); List codeEnttities = codeService.findByOrderId(orderEntity.getBillNo()); if (basicBusTypePreEntity.getSupplementAll()) {//全量补单 - invProductDetailService.insertList(invProductDetailEntities); buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity, false); - } else { //缺量补单 - List inList = new ArrayList<>(); - for (IoCodeEntity warehouseEntity : codeEnttities) { - Integer invCount = getInvCount(warehouseEntity); - Integer count = warehouseEntity.getMyReCount(); - if (invCount > 0) {//仓库已存在该产品 - if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装 - if (count > invCount) { //该产品实际数量大于结余数量，说明是多级包装，直接补 - inList.add(warehouseEntity); - } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 - int lea = count - invCount; - warehouseEntity.setCount(lea / (count)); // - inList.add(warehouseEntity); - } - } - } else { //结余数量《=0直接补 - inList.add(warehouseEntity); - } - InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode()); - invProductDetailService.insert(invProductDetailEntity); - } - buildInOrder(basicBusTypePreEntity, inList, orderEntity, false); } } - public InvProductDetailEntity filterInvByCode(List invProductDetailEntities, String - code) { - for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - if (invProductDetailEntity.getCode().equals(code)) { - return invProductDetailEntity; - } - } - return null; - } - - //计算当前库存数量 - public int getInvCount(IoCodeEntity codeEntity) { - - List resultLists = invProductDetailService.selectByUnique(codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getSupId(), codeEntity.getDeptCode(), codeEntity.getInvCode()); - int invCount = 0; - if (CollUtil.isNotEmpty(resultLists)) { - for (InvProductDetailEntity invProductDetailEntity : resultLists) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailEntity.getReCount(); - } else { - invCount = invCount + invProductDetailEntity.getReCount(); - } - } - } - return invCount; - } @Resource UdiRelevanceService udiRelevanceService; diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java index 4b72c8979..b542e82c4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java @@ -14,7 +14,6 @@ import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 8e6eb77c7..cef5f3b07 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -1,13 +1,10 @@ package com.glxp.api.service.inout; import com.glxp.api.service.dev.DeviceChangeOrderService; -import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.inv.impl.InvProductService; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; -import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicBusTypePreEntity; @@ -19,7 +16,6 @@ import com.glxp.api.entity.inv.*; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.*; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -33,8 +29,6 @@ public class IoGenInvService { @Resource InvProductService invProductService; @Resource - InvProductDetailService invProductDetailService; - @Resource InvPreinOrderService invPreinOrderService; @Resource InvPreinDetailService invPreinDetailService; @@ -106,29 +100,9 @@ public class IoGenInvService { invProductService.update(invProductEntity); } - //生成库存码详情 - List invProductDetailEntities = new ArrayList<>(); - for (IoCodeEntity codeEntity : codeEnttities) { - InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invProductDetailEntity); - invProductDetailEntity.setRelId(codeEntity.getRelId()); - invProductDetailEntity.setUpdateTime(new Date()); - invProductDetailEntity.setId(null); - invProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode()); - invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invProductDetailEntity.setInCount(invProductDetailEntity.getReCount()); - } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invProductDetailEntity.setOutCount(invProductDetailEntity.getReCount()); - } - - invProductDetailEntities.add(invProductDetailEntity); - } BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction()); if (basicBusTypePreEntity != null) { //进行单据流转 - ioChangeInoutService.genNewOrder(orderEntity, invProductDetailEntities); - } else { //生成库存结束 - invProductDetailService.insertList(invProductDetailEntities); + ioChangeInoutService.genNewOrder(orderEntity); } //若设备入库单，则生成设备登记单，入到科室设备 diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java index 0bb29f90f..23b11182f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java @@ -1,8 +1,6 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.InvProductDetailDao; -import com.glxp.api.entity.inv.InvProductDetailEntity; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 146a27a41..028aa7db6 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.service.inv.impl.InvProductDetailService; import com.glxp.api.service.inv.impl.InvProductService; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; @@ -55,10 +54,8 @@ import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Field; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java index 89ca02183..ac5868298 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java @@ -1,8 +1,6 @@ package com.glxp.api.service.inv; -import com.glxp.api.entity.inv.InvPreInProductDetailEntity; import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java deleted file mode 100644 index eb98fed87..000000000 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java +++ /dev/null @@ -1,306 +0,0 @@ -package com.glxp.api.service.inv.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.dao.basic.UdiProductDao; -import com.glxp.api.dao.inout.IoOrderDao; -import com.glxp.api.dao.inv.InvPreInProductDetailDao; -import com.glxp.api.dao.inv.InvPreProductDetailDao; -import com.glxp.api.dao.inv.InvProductDetailDao; -import com.glxp.api.entity.auth.InvSpace; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.res.inv.InvProductDetailResponse; -import com.glxp.api.service.auth.InvSpaceService; -import com.glxp.api.util.MsDateUtil; -import com.glxp.api.util.IntUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class InvProductDetailService extends ServiceImpl { - - @Resource - private InvProductDetailDao invProductDetailDao; - @Resource - private BasicBussinessTypeDao bussinessTypeDao; - @Resource - private IoOrderDao orderDao; - @Resource - private UdiProductDao udiProductDao; - - - public int insert(InvProductDetailEntity invProductDetailEntity) { - invProductDetailEntity.setId(null); - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invProductDetailEntity.setInCount(invProductDetailEntity.getReCount()); - } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invProductDetailEntity.setOutCount(invProductDetailEntity.getReCount()); - } - return invProductDetailDao.insert(invProductDetailEntity); - } - - public List selectByOrderIdFk(String billNo) { - if (StrUtil.isEmpty(billNo)) - return null; - List invProductDetailEntities = invProductDetailDao.selectList(new QueryWrapper().eq("orderId", billNo)); - return invProductDetailEntities; - } - - - public InvProductDetailEntity selectByCode(String billNo, String code, BigDecimal price) { - List invProductDetailEntities = invProductDetailDao.selectList - (new QueryWrapper().eq("code", code).eq("orderId", billNo).eq(price != null, "price", price)); - if (CollUtil.isNotEmpty(invProductDetailEntities)) { - for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - if (IntUtil.value(invProductDetailEntity.getReCount()) > 0) { - return invProductDetailEntity; - } - } - return invProductDetailEntities.get(0); - } else - return null; - } - - - public int deleteByOrderId(String billNo) { - return invProductDetailDao.delete(new QueryWrapper().eq("orderId", billNo)); - } - - - public int deleteById(Integer id) { - return invProductDetailDao.deleteById(id); - } - - - public int update(InvProductDetailEntity invProductDetailEntity) { - - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invProductDetailEntity.setInCount(invProductDetailEntity.getReCount()); - } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invProductDetailEntity.setOutCount(invProductDetailEntity.getReCount()); - } - - return invProductDetailDao.updateById(invProductDetailEntity); - } - - - public List selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) { - return invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(supId != null, "supId", supId).eq(deptCode != null, "deptCode", deptCode).eq(invCode != null, "invCode", invCode)); - } - - - public InvProductDetailEntity sortFindByCode(String code) { - List invProductDetailEntities = invProductDetailDao.selectList(new QueryWrapper().eq("code", code).orderByDesc("id")); - if (CollUtil.isNotEmpty(invProductDetailEntities)) - return invProductDetailEntities.get(0); - else - return null; - } - - - public boolean insertList(List invProductDetailEntities) { - return invProductDetailDao.insertBatch(invProductDetailEntities); - } - - - public List filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) { - if (null == filterInvProductDetailRequest) { - return Collections.emptyList(); - } - if (null != filterInvProductDetailRequest.getPage() && null != filterInvProductDetailRequest.getLimit()) { - PageHelper.offsetPage((filterInvProductDetailRequest.getPage() - 1) * filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getLimit()); - } - return invProductDetailDao.filterInvProductDetailList(filterInvProductDetailRequest); - } - - - public boolean deleteInvProductDetail(FilterInvProductDetailRequest detailRequest) { - return invProductDetailDao.deleteInvProductDetail(detailRequest); - } - - @Resource - InvSpaceService invSpaceService; - - - public void setOrderInfo(InvProductDetailResponse response) { - //查询DI层级，根据DI层级设置数量取值 - Integer packLevel = udiProductDao.selectPackLevel(response.getNameCode()); - //设置出入库中文及出入库数量 - if (null != packLevel && packLevel != 1) { - //多级包装 - if (response.getMainAction().equals(ConstantType.TYPE_OUT)) { - response.setMainActionStr("出库"); - response.setOutCount(response.getReCount()); - } else { - response.setMainActionStr("入库"); - response.setInCount(response.getReCount()); - } - } else { - //单层包装 - if (response.getMainAction().equals(ConstantType.TYPE_OUT)) { - response.setMainActionStr("出库"); - response.setOutCount(response.getCount()); - } else { - response.setMainActionStr("入库"); - response.setInCount(response.getCount()); - } - } - InvSpace invSpace = invSpaceService.findByCode(response.getInvCode(), response.getInvSpaceCode()); - if (invSpace != null) - response.setInvSpaceName(invSpace.getName()); - - //设置单据类型名称 - BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper().select("name").eq("action", response.getAction())); - if (busType != null) - response.setActionName(busType.getName()); - //设置单据日期 - IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("createTime").eq("billNo", response.getOrderId())); - if (order != null) - response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - } - - /** - * 校验入账库库存 - */ - public int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode, Boolean vailBatchNo) { - if (relId == null) { - return 0; - } - List datas = null; - if (vailBatchNo || StrUtil.isNotEmpty(batchNo)) { - datas = - invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode) - .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) - .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")) - ); - } else { - datas = - invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId) - .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode) - .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) - ); - } - - - log.error("校验入账库存日志打印：" + relId + "," + batchNo + "," + supId + "," + deptCode + "," + invCode + "," + invSpaceCode); - int count = 0; - if (CollUtil.isNotEmpty(datas)) { - for (InvProductDetailEntity invProductDetailEntity : datas) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - } - - - public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) { - List datas = - invProductDetailDao.selectList(new QueryWrapper().eq("deptCode", deptCode).eq("invCode", invCode) - .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) - .eq("code", code) - ); - - int count = 0; - if (CollUtil.isNotEmpty(datas)) { - for (InvProductDetailEntity invProductDetailEntity : datas) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - } - - - public List findByGroupCode(String invCode, String code, Boolean isCheckSpace) { - if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { - List datas = - invProductDetailDao.findByGroupCode(invCode, code, isCheckSpace); - return datas; - } - - return null; - } - - @Resource - InvPreInProductDetailDao invPreInProductDetailDao; - @Resource - InvPreProductDetailDao invPreProductDetailDao; - - public InvProductDetailEntity selectLastInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) { - - - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectLastInBatch(relId, batchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectLastInBatch(relId, batchNo, mainAction); - } else { - return invProductDetailDao.selectLastInBatch(relId, batchNo, invCode, mainAction); - } - - - } - - public InvProductDetailEntity selectFirstInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) { - - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction); - } else { - return invProductDetailDao.selectFirstInBatch(relId, batchNo, invCode, mainAction); - } - - } - - public Integer selectCountByInBatch(String relId, String batchNo, BasicBussinessTypeEntity bussinessTypeEntity, String inBatchNo, String invCode, String mainAction) { - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction); - } else { - return invProductDetailDao.selectCountByInBatch(relId, batchNo, invCode, inBatchNo, mainAction); - } - - } - - public InvProductDetailEntity selectNextInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction, String inBatchNo) { - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo); - } else { - return invProductDetailDao.selectNextInBatch(relId, batchNo, invCode, mainAction, inBatchNo); - } - - } - - -}