From 92e2a0fe8917414b6495826048757e2290d99d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 12 May 2023 11:10:03 +0800 Subject: [PATCH] =?UTF-8?q?inv=5Fuser=5Fproduct,inv=5Fuser=5Fproduct=5Fdet?= =?UTF-8?q?ail=E8=A1=A8=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/InvUserProductController.java | 55 +++++++++++++++++++ .../inv/InvUserProductDetailController.java | 17 ++++++ ...ductMapper.java => InvUserProductDao.java} | 5 +- ...pper.java => InvUserProductDetailDao.java} | 5 +- ...l.java => InvUserProductDetailEntity.java} | 2 +- ...Product.java => InvUserProductEntity.java} | 2 +- .../impl/InvUserProductDetailServiceImpl.java | 39 ++++++++++--- .../inv/impl/InvUserProductServiceImpl.java | 40 +++++++++++--- ...cHospTypeDao.xml => InvUserProductDao.xml} | 0 ...nvoiceMapper.xml => InvUserProductDao.xml} | 0 ...uctDetailDao.xml => InvUserProductDao.xml} | 0 .../mapper/inv/InvUserProductDetailMapper.xml | 34 +----------- .../mapper/inv/InvUserProductMapper.xml | 37 +------------ ...nuHelpMapper.xml => InvUserProductDao.xml} | 0 14 files changed, 144 insertions(+), 92 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/InvUserProductController.java create mode 100644 src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java rename src/main/java/com/glxp/api/dao/inv/{InvUserProductMapper.java => InvUserProductDao.java} (58%) rename src/main/java/com/glxp/api/dao/inv/{InvUserProductDetailMapper.java => InvUserProductDetailDao.java} (56%) rename src/main/java/com/glxp/api/entity/inv/{InvUserProductDetail.java => InvUserProductDetailEntity.java} (98%) rename src/main/java/com/glxp/api/entity/inv/{InvUserProduct.java => InvUserProductEntity.java} (98%) rename src/main/resources/mybatis/mapper/basic/{BasicHospTypeDao.xml => InvUserProductDao.xml} (100%) rename src/main/resources/mybatis/mapper/inout/{IoOrderInvoiceMapper.xml => InvUserProductDao.xml} (100%) rename src/main/resources/mybatis/mapper/inv/{InvPreProductDetailDao.xml => InvUserProductDao.xml} (100%) rename src/main/resources/mybatis/mapper/system/{SysMenuHelpMapper.xml => InvUserProductDao.xml} (100%) diff --git a/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java b/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java new file mode 100644 index 000000000..05792e6b3 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/InvUserProductController.java @@ -0,0 +1,55 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.inv.InvProductDetailEntity; +import com.glxp.api.entity.inv.InvProductEntity; +import com.glxp.api.entity.inv.InvUserProductEntity; +import com.glxp.api.req.inv.FilterInvProductDetailRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.service.inv.InvProductDetailService; +import com.glxp.api.service.inv.InvUserProductService; +import groovy.util.logging.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 用户库存查询接口 + */ +@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/InvUserProductDetailController.java b/src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java new file mode 100644 index 000000000..1484650d8 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java @@ -0,0 +1,17 @@ +package com.glxp.api.controller.inv; + +import com.glxp.api.controller.BaseController; +import groovy.util.logging.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用户库存查询接口 + */ +@Slf4j +@RestController +public class InvUserProductDetailController{ + + + + +} diff --git a/src/main/java/com/glxp/api/dao/inv/InvUserProductMapper.java b/src/main/java/com/glxp/api/dao/inv/InvUserProductDao.java similarity index 58% rename from src/main/java/com/glxp/api/dao/inv/InvUserProductMapper.java rename to src/main/java/com/glxp/api/dao/inv/InvUserProductDao.java index 743965f2d..7212a8b8a 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvUserProductMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/InvUserProductDao.java @@ -2,15 +2,14 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvUserProduct; +import com.glxp.api.entity.inv.InvUserProductEntity; /** * @author Lenovo * @description 针对表【inv_user_product(用户库存表)】的数据库操作Mapper * @createDate 2023-05-12 10:19:43 -* @Entity com.glxp.api.entity.InvUserProduct */ -public interface InvUserProductMapper extends BaseMapper { +public interface InvUserProductDao extends BaseMapper { } diff --git a/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java similarity index 56% rename from src/main/java/com/glxp/api/dao/inv/InvUserProductDetailMapper.java rename to src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java index d5beddee6..f1f02e967 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java @@ -2,15 +2,14 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvUserProductDetail; +import com.glxp.api.entity.inv.InvUserProductDetailEntity; /** * @author Lenovo * @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Mapper * @createDate 2023-05-12 10:19:43 -* @Entity com.glxp.api.entity.InvUserProductDetail */ -public interface InvUserProductDetailMapper extends BaseMapper { +public interface InvUserProductDetailDao extends BaseMapper { } diff --git a/src/main/java/com/glxp/api/entity/inv/InvUserProductDetail.java b/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/InvUserProductDetail.java rename to src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java index 19137bc41..59434006c 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvUserProductDetail.java +++ b/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java @@ -15,7 +15,7 @@ import java.util.Date; */ @TableName(value ="inv_user_product_detail") @Data -public class InvUserProductDetail{ +public class InvUserProductDetailEntity { @TableId(value = "id", type = IdType.AUTO) private Integer id; diff --git a/src/main/java/com/glxp/api/entity/inv/InvUserProduct.java b/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/InvUserProduct.java rename to src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java index fee401783..a52aa9872 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvUserProduct.java +++ b/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java @@ -15,7 +15,7 @@ import java.util.Date; */ @TableName(value ="inv_user_product") @Data -public class InvUserProduct{ +public class InvUserProductEntity { @TableId(value = "id", type = IdType.AUTO) private Integer id; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java index e73487506..fede624fe 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java @@ -1,17 +1,42 @@ package com.glxp.api.service.inv.impl; -import com.glxp.api.dao.inv.InvUserProductDetailMapper; -import com.glxp.api.entity.inv.InvUserProductDetail; +import com.glxp.api.dao.inv.InvUserProductDetailDao; +import com.glxp.api.entity.inv.InvUserProductDetailEntity; import com.glxp.api.service.inv.InvUserProductDetailService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** -* @author Lenovo -* @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Service实现 -* @createDate 2023-05-12 10:19:43 -*/ + * @author Lenovo + * @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Service实现 + * @createDate 2023-05-12 10:19:43 + */ @Service -public class InvUserProductDetailServiceImpl implements InvUserProductDetailService{ +public class InvUserProductDetailServiceImpl implements InvUserProductDetailService { + + @Resource + InvUserProductDetailDao invUserProductDetailDao; + + @Override + public List filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity) { + return null; + } + + @Override + public Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { + return invUserProductDetailDao.insert(invUserProductDetailEntity) == 1 ? true : false; + } + + @Override + public Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { + return invUserProductDetailDao.updateById(invUserProductDetailEntity) == 1 ? true : false; + } + @Override + public Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { + return invUserProductDetailDao.deleteById(invUserProductDetailEntity) == 1 ? true : false; + } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java index 571474c29..78cc0dfc8 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java @@ -1,18 +1,42 @@ package com.glxp.api.service.inv.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.InvUserProductMapper; -import com.glxp.api.entity.inv.InvUserProduct; +import com.glxp.api.dao.inv.InvUserProductDao; +import com.glxp.api.entity.inv.InvUserProductEntity; import com.glxp.api.service.inv.InvUserProductService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** -* @author Lenovo -* @description 针对表【inv_user_product(用户库存表)】的数据库操作Service实现 -* @createDate 2023-05-12 10:19:43 -*/ + * @author Lenovo + * @description 针对表【inv_user_product(用户库存表)】的数据库操作Service实现 + * @createDate 2023-05-12 10:19:43 + */ @Service -public class InvUserProductServiceImpl implements InvUserProductService{ +public class InvUserProductServiceImpl implements InvUserProductService { + + @Resource + InvUserProductDao invUserProductDao; + + @Override + public List filterInvUserProductList(InvUserProductEntity invUserProductEntity) { + return null; + } + + @Override + public Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity) { + return invUserProductDao.insert(invUserProductEntity) == 1 ? true : false; + } + + @Override + public Boolean updateInvUserProduct(InvUserProductEntity invUserProductEntity) { + return invUserProductDao.updateById(invUserProductEntity) == 1 ? true : false; + } + @Override + public Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity) { + return invUserProductDao.deleteById(invUserProductEntity) == 1 ? true : false; + } } diff --git a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml b/src/main/resources/mybatis/mapper/basic/InvUserProductDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml rename to src/main/resources/mybatis/mapper/basic/InvUserProductDao.xml diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml rename to src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml rename to src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml diff --git a/src/main/resources/mybatis/mapper/inv/InvUserProductDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/InvUserProductDetailMapper.xml index 5ce19766e..a00ae93fb 100644 --- a/src/main/resources/mybatis/mapper/inv/InvUserProductDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/InvUserProductDetailMapper.xml @@ -2,39 +2,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - id,code,mainAction, - action,orderId,relId, - nameCode,batchNo,produceDate, - expireDate,serialNo,supId, - count,reCount,deptCode, - invCode,invSpaceCode,purchaseType, - updateTime,inCount,outCount - diff --git a/src/main/resources/mybatis/mapper/inv/InvUserProductMapper.xml b/src/main/resources/mybatis/mapper/inv/InvUserProductMapper.xml index 807a59cf0..d5ccd853f 100644 --- a/src/main/resources/mybatis/mapper/inv/InvUserProductMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/InvUserProductMapper.xml @@ -2,41 +2,6 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - id,relIdFk,nameCode, - batchNo,productionDate,expireDate, - inCount,outCount,reCount, - customerId,supId,deptCode, - invCode,invSpaceCode,createTime, - updateTime,nowStock,frozenCount, - planInCount,planOutCount,onWayCount, - availableStock - diff --git a/src/main/resources/mybatis/mapper/system/SysMenuHelpMapper.xml b/src/main/resources/mybatis/mapper/system/InvUserProductDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/system/SysMenuHelpMapper.xml rename to src/main/resources/mybatis/mapper/system/InvUserProductDao.xml