diff --git a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java index e9a336049..11e026126 100644 --- a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java +++ b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java @@ -76,6 +76,5 @@ public class HdSchemaExecutor implements ApplicationRunner { public void buildSchemas() { // schema.add(new SchemaData("v2.1", "schema_v2.1.sql")); schema.add(new SchemaData("v2.2", "schema_v2.2.sql")); -// schema.add(new SchemaData("v2.3", "schema_v2.3.sql")); } } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index b91a85950..7a5d604cb 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -121,11 +121,11 @@ public class BasicCorpController { BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); - if(basicUnitMaintainSaveRequest.getCorpType()==1){ + if (basicUnitMaintainSaveRequest.getCorpType() == 1) { basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); - }else if(basicUnitMaintainSaveRequest.getCorpType()==2){ + } else if (basicUnitMaintainSaveRequest.getCorpType() == 2) { basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); - }else{ + } else { basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN); } basicUnitMaintainEntity.setUpdateTime(new Date()); @@ -164,7 +164,11 @@ public class BasicCorpController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + List corpTypeLists = new ArrayList<>(); + corpTypeLists.add(1); + corpTypeLists.add(2); + basicUnitMaintainFilterRequest.setCorpTypeLists(corpTypeLists); + basicUnitMaintainFilterRequest.setOutType(0); List basicUnitMaintainEntities; basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java index 9ac22485b..d018d4b81 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java @@ -87,6 +87,35 @@ public class InvPreProductController extends BaseController { return ResultVOUtils.success(pageResponse); } + /** + * 寄售库存查询接口过滤零库存和负库存 + * + * @param filterInvPreProductRequest + * @return + */ + @GetMapping("/spms/inv/pre/product/filterStock") + public BaseResponse filterListStock(FilterInvPreProductRequest filterInvPreProductRequest) { + boolean showSup = false; //前端控制表格显示字段 + if (StrUtil.isNotBlank(filterInvPreProductRequest.getUdiCode())) { + filterInvPreProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvPreProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvPreProductRequest.setInvCodes(invCodes); + } + } + List list = invPreProductService.filterListStock(filterInvPreProductRequest); + + PageInfo pageInfo = new PageInfo<>(list); + InvPreProductPageResponse pageResponse = new InvPreProductPageResponse<>(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + pageResponse.setShowSup(showSup); + return ResultVOUtils.success(pageResponse); + } + /** * 查询寄售库存详情 * diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index 96d89df4a..8b1e089e4 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -8,15 +8,14 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.*; +import com.glxp.api.res.inv.InvPreProductDetailResponse; +import com.glxp.api.res.inv.InvPreProductPageResponse; +import com.glxp.api.res.inv.InvPreinProductResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.WarehouseUserService; -import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.inv.InvPreinProductService; import com.glxp.api.util.udi.FilterUdiUtils; @@ -78,6 +77,36 @@ public class InvPreinProductController extends BaseController { return ResultVOUtils.success(pageResponse); } + /** + * 预验收库存查询接口过滤零库存和负库存 + * + * @param filterInvPreinProductRequest + * @return + */ + @GetMapping("/spms/inv/pre/in/product/filterStock") + public BaseResponse filterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest) { + boolean showSup = false; //前端控制表格显示字段 + if (StrUtil.isNotBlank(filterInvPreinProductRequest.getUdiCode())) { + filterInvPreinProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreinProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvPreinProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvPreinProductRequest.setInvCodes(invCodes); + } + } + + List list = invPreinProductService.filterListStock(filterInvPreinProductRequest); + + PageInfo pageInfo = new PageInfo<>(list); + InvPreProductPageResponse pageResponse = new InvPreProductPageResponse<>(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + pageResponse.setShowSup(showSup); + return ResultVOUtils.success(pageResponse); + } + /** * 查询预验收库存详情 * 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 cffcca4b5..a1852a610 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -119,6 +119,40 @@ public class InvProductController extends BaseController { return ResultVOUtils.success(pageResponse); } + /** + * 库存列表查询接口过滤零库存负库存 + * + * @param filterInvProductRequest + * @return + */ + @GetMapping("/spms/inv/product/filterStock") + public BaseResponse filterListStock(FilterInvProductRequest filterInvProductRequest) { + boolean showSup = false; //前端控制表格显示列字段 + if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) { + filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvProductRequest.setInvCodes(invCodes); + } + } + + List list = invProductService.filterListStock(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + InvProductPageResponse pageResponse = new InvProductPageResponse(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + pageResponse.setShowSup(showSup); + return ResultVOUtils.success(pageResponse); + } + + + + + + /** * 查询库存详情 * diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 5715c8050..ce8dc4f7d 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -12,6 +12,9 @@ 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.controller.inv.InvPreProductController; +import com.glxp.api.controller.inv.InvPreinProductController; +import com.glxp.api.controller.inv.InvProductController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; @@ -26,23 +29,33 @@ import com.glxp.api.req.inout.AddReceiveDetailRequest; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; -import com.glxp.api.req.purchase.*; +import com.glxp.api.req.inv.FilterInvPreProductRequest; +import com.glxp.api.req.inv.FilterInvPreinProductRequest; +import com.glxp.api.req.inv.FilterInvProductRequest; +import com.glxp.api.req.purchase.purReceiveRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inout.ReceiveResponse; +import com.glxp.api.res.inv.InvPreProductResponse; +import com.glxp.api.res.inv.InvPreinProductResponse; +import com.glxp.api.res.inv.InvProductResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.ReceiveService; import com.glxp.api.service.inout.ReceivedetailService; +import com.glxp.api.service.inv.InvPreProductService; +import com.glxp.api.service.inv.InvPreinProductService; +import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.purchase.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import org.springframework.beans.BeanUtils; +import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -88,6 +101,13 @@ public class PurOrderReceiveController extends BaseController { IoOrderDetailBizService ioOrderDetailBizService; @Resource IoPurChangeService purChangeService; + @Resource + InvPreProductController invPreProductController; + @Resource + InvPreinProductController invPreinProductController; + @Resource + InvProductController invProductController; + @AuthRuleAnnotation("") @@ -199,12 +219,66 @@ public class PurOrderReceiveController extends BaseController { return ResultVOUtils.success(orderNo); } + @Resource + WarehouseUserService warehouseUserService; + @Resource + InvPreProductService invPreProductService; + @Resource + InvPreinProductService invPreinProductService; + @Resource + InvProductService invProductService; + @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/detail/Update") public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //判断库存 + List list = new ArrayList<>(); + List listinvprein = new ArrayList<>(); + List listInv = new ArrayList<>(); + if(updateReceiveDetailRequest.getAdvanceType() == 3){ + //寄售 + FilterInvPreProductRequest request = new FilterInvPreProductRequest(); + // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + request.setNameCode(updateReceiveDetailRequest.getNameCode()); + request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); + list = selectFilterInvPreProductRequest(request); + + }else if(updateReceiveDetailRequest.getAdvanceType() == 2){ + //预验收 + FilterInvPreinProductRequest request = new FilterInvPreinProductRequest(); + // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + request.setNameCode(updateReceiveDetailRequest.getNameCode()); + request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); + listinvprein = selectfilterListStock(request); + + }else{ + FilterInvProductRequest request = new FilterInvProductRequest(); + // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + request.setNameCode(updateReceiveDetailRequest.getNameCode()); + request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); + listInv = selectFilterInvProductRequest(request); + + } + if(list != null && list.size()>0 ){ + if( list.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){ + return ResultVOUtils.error(999, "库存不足！"); + } + } + if(listinvprein != null && listinvprein.size()>0 ){ + if(listinvprein.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){ + return ResultVOUtils.error(999, "库存不足！"); + } + } + if(listInv != null && listInv.size()>0 ){ + if(listInv.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){ + return ResultVOUtils.error(999, "库存不足！"); + } + } + + boolean falg = receivedetailService.updateReceiveDetail(updateReceiveDetailRequest); if (falg) { return ResultVOUtils.success(); @@ -213,6 +287,59 @@ public class PurOrderReceiveController extends BaseController { } } + public List selectFilterInvPreProductRequest(FilterInvPreProductRequest filterInvPreProductRequest){ + if (StrUtil.isNotBlank(filterInvPreProductRequest.getUdiCode())) { + filterInvPreProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvPreProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvPreProductRequest.setInvCodes(invCodes); + } + } + List list = invPreProductService.filterListStock(filterInvPreProductRequest); + return list; + } + + public List selectfilterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest){ + boolean showSup = false; //前端控制表格显示字段 + if (StrUtil.isNotBlank(filterInvPreinProductRequest.getUdiCode())) { + filterInvPreinProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreinProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvPreinProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvPreinProductRequest.setInvCodes(invCodes); + } + } + + List list = invPreinProductService.filterListStock(filterInvPreinProductRequest); + + return list; + } + + public List selectFilterInvProductRequest(FilterInvProductRequest filterInvProductRequest){ + boolean showSup = false; //前端控制表格显示列字段 + if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) { + filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); + } + + if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) { + List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); + if (CollUtil.isNotEmpty(invCodes)) { + filterInvProductRequest.setInvCodes(invCodes); + } + } + + List list = invProductService.filterListStock(filterInvProductRequest); + + return list; + } + + + @AuthRuleAnnotation("") @GetMapping("/udiwms/receive/order/del") diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java index 363c17af3..9ad5009a5 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java @@ -2,11 +2,8 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreProductEntity; -import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductRequest; -import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreProductResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +20,8 @@ public interface InvPreProductDao extends BaseMapperPlus filterList(FilterInvPreProductRequest invPreProductRequest); + List filterListStock(FilterInvPreProductRequest invPreProductRequest); + /** diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java index 90ae59f22..195660a9c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java @@ -2,9 +2,7 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreinProductEntity; -import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; -import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,6 +23,8 @@ public interface InvPreinProductDao extends BaseMapperPlus filterList(FilterInvPreinProductRequest invPreProductRequest); + List filterListStock(FilterInvPreinProductRequest invPreProductRequest); + void batchBindSpace(@Param("ids") List ids, @Param("invSpaceCode") String invSpaceCode); /** diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java index 3269a95bb..adac7dd2c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java @@ -28,6 +28,14 @@ public interface InvProductDao extends BaseMapperPlus filterProductList(FilterInvProductRequest filterInvProductRequest); + /** + * 查询库存列表过滤零库存和负库存 + * + * @param filterInvProductRequest + * @return + */ + List filterProductListStock(FilterInvProductRequest filterInvProductRequest); + /** * 库存统计查询 * diff --git a/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java index 2f2fd7078..25f2f32a8 100644 --- a/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java @@ -1,10 +1,7 @@ package com.glxp.api.req.inout; -import com.glxp.api.entity.inout.PurReceiveEntity; import lombok.Data; -import java.util.List; - @Data public class UpdateReceiveDetailRequest { @@ -38,4 +35,8 @@ public class UpdateReceiveDetailRequest { private String expireDate; + private Integer advanceType; + + private String targetInvCode; + } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java index f276d679e..8c682e5a5 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java @@ -1,12 +1,8 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreProductEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPreProductRequest; -import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.inv.InvPreProductResponse; -import com.glxp.api.res.inv.InvProductResponse; import java.util.List; @@ -32,6 +28,8 @@ public interface InvPreProductService { */ List filterList(FilterInvPreProductRequest invPreProductRequest); + List filterListStock(FilterInvPreProductRequest invPreProductRequest); + List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java index fdf98ea66..9f3121129 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinProductEntity; -import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; -import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import java.util.List; @@ -30,6 +28,9 @@ public interface InvPreinProductService { */ List filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest); + + List filterListStock(FilterInvPreinProductRequest filterInvPreinDetailRequest); + /** * 查询寄售库存列表 * diff --git a/src/main/java/com/glxp/api/service/inv/InvProductService.java b/src/main/java/com/glxp/api/service/inv/InvProductService.java index 28b39e092..7e2b64c0b 100644 --- a/src/main/java/com/glxp/api/service/inv/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java @@ -25,6 +25,14 @@ public interface InvProductService { */ List filterList(FilterInvProductRequest filterInvProductRequest); + /** + * 库存查询过滤零库存和负库存 + * + * @param filterInvProductRequest + * @return + */ + List filterListStock(FilterInvProductRequest filterInvProductRequest); + /** * 库存查询 * diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index 126f48011..cd3f0a043 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreProductDao; import com.glxp.api.entity.inv.InvPreProductEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.service.inv.InvPreProductService; @@ -58,6 +57,17 @@ public class InvPreProductServiceImpl implements InvPreProductService { return invPreProductDao.filterList(invPreProductRequest); } + @Override + public List filterListStock(FilterInvPreProductRequest invPreProductRequest) { + if (null == invPreProductRequest) { + return Collections.emptyList(); + } + if (null != invPreProductRequest.getPage()) { + PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); + } + return invPreProductDao.filterListStock(invPreProductRequest); + } + @Override public List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest) { if (null == invPreProductRequest) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index eb5f45a85..b19b7c4bf 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -57,6 +57,17 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { return invPreinProductDao.filterList(invPreProductRequest); } + @Override + public List filterListStock(FilterInvPreinProductRequest invPreProductRequest) { + if (null == invPreProductRequest) { + return Collections.emptyList(); + } + if (null != invPreProductRequest.getPage()) { + PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); + } + return invPreinProductDao.filterListStock(invPreProductRequest); + } + @Override public List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) { if (null == invPreProductRequest) { @@ -79,6 +90,7 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { return invPreinProductDao.findGroupBySpace(invPreProductRequest); } + @Override public InvPreinProductEntity findById(String id) { return invPreinProductDao.selectById(id); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java index fa8704a8b..7d5629767 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java @@ -58,6 +58,17 @@ public class InvProductServiceImpl implements InvProductService { return invProductDao.filterProductList(filterInvProductRequest); } + @Override + public List filterListStock(FilterInvProductRequest filterInvProductRequest) { + if (null == filterInvProductRequest) { + return Collections.emptyList(); + } + if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { + PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); + } + return invProductDao.filterProductListStock(filterInvProductRequest); + } + @Override public List filterListProduct(FilterInvProductRequest filterInvProductRequest) { diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 3862d6d79..2981aad4c 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1294,7 +1294,6 @@ public class HeartService { if (CollUtil.isNotEmpty(syncDataResponse.getDeptUserEntities())) logs = logs + "部门用户信息：" + syncDataResponse.getDeptUserEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getInvSpaces())) logs = logs + "货位信息：" + syncDataResponse.getInvSpaces().size() + "条\n"; @@ -1341,10 +1340,6 @@ public class HeartService { for (IoOrderEntity orderEntity : orderEntities) { SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); orderEntity.setUpdateTime(null); - orderEntity.setFromType(ConstantStatus.FROM_UDISP); - orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); - orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); if (syncDataBustypeEntity != null) { if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) { orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); @@ -1356,6 +1351,10 @@ public class HeartService { } IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { + orderEntity.setFromType(ConstantStatus.FROM_UDISP); + orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); + orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setId(null); orderService.insertOrder(orderEntity); insetOrderDb(syncDataResponse, orderEntity); diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml index aebb81fbb..76e3e4845 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml @@ -80,6 +80,86 @@ group by ipp.id + + - select ipp.id, ipp.nameCode, diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 97ea4c22f..d6cea9d26 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -79,6 +79,85 @@ group by ipp.id + + + +