From f2bdeb264172d0bdbbea323acc149188e1b2e1a7 Mon Sep 17 00:00:00 2001 From: yangzhenli <13467167538@163.com> Date: Tue, 29 Oct 2024 14:11:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=8B=E8=AF=95=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=88=86=E5=A0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/mapper/TBookGoWhereMapper.java | 2 +- .../java/jnpf/service/ILibraryService.java | 6 + .../jnpf/service/TBookGoWhereService.java | 2 +- .../jnpf/service/impl/LibraryServiceImpl.java | 38 ++- .../service/impl/TBookGoWhereServiceImpl.java | 4 +- .../impl/TReceiveGoodsMainServiceImpl.java | 251 ++++++++++++------ .../TSelectionOrderingMainServiceImpl.java | 1 + .../resources/mapper/TBookGoWhereMapper.xml | 3 +- .../ReceiveGoodsMainController.java | 37 ++- .../java/jnpf/enump/ReceiveGoodsMainEnum.java | 2 +- .../jnpf/model/dto/ReceiveGoodsMainDto.java | 2 +- 11 files changed, 247 insertions(+), 101 deletions(-) diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBookGoWhereMapper.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBookGoWhereMapper.java index 1e666fa..fae9d5f 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBookGoWhereMapper.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBookGoWhereMapper.java @@ -19,6 +19,6 @@ public interface TBookGoWhereMapper extends BaseMapper { List getStackingInformation(@Param("bookNumber") String bookNumber,@Param("corpId") String corpId); - List getStackingInformationByRelationId(@Param("id") Long id); + List getStackingInformationByRelationId(@Param("bookNumber") String bookNumber,@Param("id") Long id); } diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/ILibraryService.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/ILibraryService.java index dea779d..dc84e2e 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/ILibraryService.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/ILibraryService.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import jnpf.entity.TBookGoWhere; import jnpf.entity.TLibrary; import jnpf.entity.TSelectionOrderingBooks; +import jnpf.model.dto.ReceiveGoodsMainDto; import jnpf.model.dto.SelectionOrderingMainDto; import java.util.List; import java.util.Map; +import java.util.Set; /** * 图书去向表(TBookGoWhere)表服务接口 @@ -18,5 +20,9 @@ import java.util.Map; */ public interface ILibraryService extends IService{ IPage getLibraryList(SelectionOrderingMainDto.GetLibraryListParam param); + + ReceiveGoodsMainDto.BunchingInfo getBunchingInfoByBookNumber(String bookNumber); + + List getListByBookNumberList(Set queryBookInfoNumberList); } diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TBookGoWhereService.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TBookGoWhereService.java index 3618929..f7075c4 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TBookGoWhereService.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TBookGoWhereService.java @@ -18,6 +18,6 @@ public interface TBookGoWhereService extends IService { List getStackingInformation(String bookNumber,String corpId); - List getStackingInformationByRelationId(Long id); + List getStackingInformationByRelationId(String bookNumber,Long id); } diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/LibraryServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/LibraryServiceImpl.java index 4b99133..de19b95 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/LibraryServiceImpl.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/LibraryServiceImpl.java @@ -1,5 +1,6 @@ package jnpf.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,17 +8,23 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.entity.TBookGoWhere; import jnpf.entity.TLibrary; import jnpf.entity.TSelectionOrderingBooks; +import jnpf.exception.DataException; import jnpf.mapper.LibraryMapper; import jnpf.mapper.TBookGoWhereMapper; +import jnpf.model.dto.ReceiveGoodsMainDto; import jnpf.model.dto.SelectionOrderingMainDto; import jnpf.service.ILibraryService; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; +import java.util.Optional; +import java.util.Set; /** * 图书去向表(TBookGoWhere)表服务实现类 @@ -31,6 +38,35 @@ public class LibraryServiceImpl extends ServiceImpl imp @Override public IPage getLibraryList(SelectionOrderingMainDto.GetLibraryListParam param) { - return this.lambdaQuery().page(new Page<>(param.getCurrent(),param.getSize())); + return this.lambdaQuery().page(new Page<>(param.getCurrent(), param.getSize())); + } + + @Override + public ReceiveGoodsMainDto.BunchingInfo getBunchingInfoByBookNumber(String bookNumber) { +// List libraryList = this.baseMapper.getLibraryList(); +// Optional bookInfo = libraryList.stream().findFirst(); + //查询图书信息 + Optional bookInfo = this.lambdaQuery() + .eq(TLibrary::getBookNumber, bookNumber) + .list().stream().findFirst(); + if (!bookInfo.isPresent()) { + throw new DataException("未查询到图书信息"); + } + TLibrary library = bookInfo.get(); + ReceiveGoodsMainDto.BunchingInfo bunchingInfo = new ReceiveGoodsMainDto.BunchingInfo(); + bunchingInfo.setBookNumber(bookNumber); + bunchingInfo.setBookName(library.getBookName()); + bunchingInfo.setCoverImage(library.getCoverImage()); + bunchingInfo.setPress(library.getPress()); + bunchingInfo.setPrice(library.getPrice()); + return bunchingInfo; + } + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) + public List getListByBookNumberList(Set queryBookInfoNumberList) { + return this.lambdaQuery() + .in(TLibrary::getBookNumber, queryBookInfoNumberList) + .list(); } } diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBookGoWhereServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBookGoWhereServiceImpl.java index afca657..886f0b0 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBookGoWhereServiceImpl.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBookGoWhereServiceImpl.java @@ -30,7 +30,7 @@ public class TBookGoWhereServiceImpl extends ServiceImpl getStackingInformationByRelationId(Long id) { - return this.baseMapper.getStackingInformationByRelationId(id); + public List getStackingInformationByRelationId(String bookNumber,Long id) { + return this.baseMapper.getStackingInformationByRelationId(bookNumber,id); } } diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveGoodsMainServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveGoodsMainServiceImpl.java index 289ceb3..bd17baf 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveGoodsMainServiceImpl.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveGoodsMainServiceImpl.java @@ -103,9 +103,9 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl bunchingInfoList = param.getBunchingInfoList(); Integer quantityReceived = receiveGoodsMain.getQuantityReceived(); + if (null == quantityReceived) { + quantityReceived = 0; + } final UserInfo user = UserProvider.getUser(); //计算签收数量 for (ReceiveGoodsMainDto.BunchingInfo bunchingInfo : bunchingInfoList) { @@ -196,9 +200,9 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl bookInfo = libraryService.lambdaQuery() - .eq(TLibrary::getBookNumber, bookNumber) - .list().stream().findFirst(); - if (!bookInfo.isPresent()) { - throw new DataException("未查询到图书信息"); - } - TLibrary library = bookInfo.get(); - ReceiveGoodsMainDto.BunchingInfo bunchingInfo = new ReceiveGoodsMainDto.BunchingInfo(); - bunchingInfo.setBookNumber(bookNumber); - bunchingInfo.setBookName(library.getBookName()); - bunchingInfo.setCoverImage(library.getCoverImage()); - bunchingInfo.setPress(library.getPress()); - bunchingInfo.setPrice(library.getPrice()); //todo 新增下印册书 - return bunchingInfo; + //查询图书信息 + return libraryService.getBunchingInfoByBookNumber(bookNumber); } @Override @@ -298,7 +289,16 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl deptOptional = organizeService.lambdaQuery() + .eq(OrganizeEntity::getId, UserProvider.getUser().getOrganizeId()) + .eq(OrganizeEntity::getEnabledMark, "1").list().stream().findFirst(); + if (deptOptional.isPresent()) { + OrganizeEntity dept = deptOptional.get(); + OrganizeEntity corp = getCorp(dept); + param.setCorpId(corp.getId()); + } + } } try { LocalDateTimeUtil.parse(param.getStartTime(), "yyyy-MM-dd HH:mm:ss"); @@ -324,14 +324,26 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl deptOptional = organizeService.lambdaQuery() + .eq(OrganizeEntity::getId, UserProvider.getUser().getOrganizeId()) + .eq(OrganizeEntity::getEnabledMark, "1").list().stream().findFirst(); + if (deptOptional.isPresent()) { + OrganizeEntity dept = deptOptional.get(); + OrganizeEntity corp = getCorp(dept); + //查询初始化去向数据 + return bookGoWhereService.getStackingInformation(receiveGoodsBooks.getBookNumber(), corp.getId()); + } + } + return null; + } //todo 添加已发数 } @@ -355,9 +367,17 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl deptOptional = organizeService.lambdaQuery() + .eq(OrganizeEntity::getId, UserProvider.getUser().getOrganizeId()) + .eq(OrganizeEntity::getEnabledMark, "1").list().stream().findFirst(); + if (deptOptional.isPresent()) { + OrganizeEntity dept = deptOptional.get(); + OrganizeEntity corp = getCorp(dept); + //查询初始化去向数据 + corpId = corp.getId(); + } + } + //确定时对所有未保存的分堆信息进行保存(即无需分堆的图书) + //校验该选书是否进行过保存分堆信息 + final String organizeId = corpId; + //先查询已保存的图书列表 +// CompletableFuture.runAsync(() -> { + for (TReceiveGoodsBooks tReceiveGoodsBooks : receiveGoodsBooksService.lambdaQuery() + .eq(TReceiveGoodsBooks::getRelationId, tReceiveGoodsMain.getId()) + .eq(TReceiveGoodsBooks::getDelFlag, "0") + .list()) { + boolean exists = bookGoWhereService.lambdaQuery() + .eq(TBookGoWhere::getDelFlag, "0") + .eq(TBookGoWhere::getType, "1") + .eq(TBookGoWhere::getBookNumber, tReceiveGoodsBooks.getBookNumber()) + .eq(TBookGoWhere::getRelationId, tReceiveGoodsBooks.getId()) + .exists(); + if (exists) { + continue; + } + List stackingInformation = bookGoWhereService.getStackingInformation(tReceiveGoodsBooks.getBookNumber(), organizeId); + ReceiveGoodsMainDto.SaveStackingInformationParam saveParam = new ReceiveGoodsMainDto.SaveStackingInformationParam(); + saveParam.setOrderType(param.getOrderType()); + saveParam.setId(tReceiveGoodsBooks.getId().toString()); + + List stackingList = new ArrayList<>(); + for (ReceiveGoodsMainDto.TBookGoWhereEntity tBookGoWhereEntity : stackingInformation) { + stackingList.add(BeanUtil.copyProperties(tBookGoWhereEntity, TBookGoWhere.class)); + } + saveParam.setBookGoWhereList(stackingList); + this.saveStackingInformation(saveParam); + } +// }); //以下逻辑全是确定 ReceiveGoodsMainEnum.MainStatusEnum mainStatusEnum = ReceiveGoodsMainEnum.MainStatusEnum.LISTING; //查询图书编号列表 @@ -418,35 +482,6 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl bunchingInfoList=new ArrayList<>(); - //查询图书编号 - Set queryBookInfoNumberList = bookGoWhereService.lambdaQuery() - .eq(TBookGoWhere::getType, "0") - .eq(TBookGoWhere::getDelFlag, "0") - .eq(TBookGoWhere::getWarehouseEntryFlag, "0") - .in(TBookGoWhere::getBookNumber, bookNumberList) - .eq(TBookGoWhere::getCreateCorpId, UserProvider.getUser().getOrganizeId()) - .eq(TBookGoWhere::getOrderType, orderTypeEnum.getCode()) - .list().stream().map(TBookGoWhere::getBookNumber).collect(Collectors.toSet()); - List libraryList = libraryService.lambdaQuery() - .in(TLibrary::getBookNumber, queryBookInfoNumberList) - .list(); - //创建收货单 - if (CollUtil.isNotEmpty(libraryList)){ - for (TLibrary tLibrary : libraryList) { - bunchingInfoList.add(BeanUtil.copyProperties(tLibrary,ReceiveGoodsMainDto.BunchingInfo.class)); - } - newReceiptParam.setBunchingInfoList(bunchingInfoList); - this.newReceipt(newReceiptParam); - } - if (CollUtil.isNotEmpty(bookNumberList)) { //修改图书去向 即之后样书室新建后进行分堆不会再查到老数据 bookGoWhereService.lambdaUpdate() @@ -454,20 +489,74 @@ public class TReceiveGoodsMainServiceImpl extends ServiceImpl otherSH = bookGoWhereService.lambdaQuery() + .eq(TBookGoWhere::getType, "0") + .eq(TBookGoWhere::getDelFlag, "0") + .eq(TBookGoWhere::getWarehouseEntryFlag, "0") + .in(TBookGoWhere::getTargetName, Arrays.asList(ReceiveGoodsMainEnum.OrderTypeEnum.BUSINESS_DEPARTMENT.getDescribe(), ReceiveGoodsMainEnum.OrderTypeEnum.VERSION_LIBRARY.getDescribe())) + .in(TBookGoWhere::getBookNumber, bookNumberList) + .eq(TBookGoWhere::getCreateCorpId, corpId) + .list().stream().map(TBookGoWhere::getTargetName).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(otherSH)) { + for (String sh : otherSH) { + String orderType =""; + if (StrUtil.equals(ReceiveGoodsMainEnum.OrderTypeEnum.BUSINESS_DEPARTMENT.getDescribe(),sh)){ + orderType=ReceiveGoodsMainEnum.OrderTypeEnum.BUSINESS_DEPARTMENT.getCode(); + } + if (StrUtil.equals(ReceiveGoodsMainEnum.OrderTypeEnum.VERSION_LIBRARY.getDescribe(),sh)){ + orderType=ReceiveGoodsMainEnum.OrderTypeEnum.VERSION_LIBRARY.getCode(); + } + if (StrUtil.isBlank(orderType)){ + continue; + } + //生成版本馆/业务部收货单 + ReceiveGoodsMainDto.NewReceiptParam newReceiptParam = new ReceiveGoodsMainDto.NewReceiptParam(); + + newReceiptParam.setOrderType(orderType); + newReceiptParam.setReceiptNumber(tReceiveGoodsMain.getReceiptNumber()); + newReceiptParam.setPackageQuantity(tReceiveGoodsMain.getPackageQuantity()); + newReceiptParam.setDeliveryParty(tReceiveGoodsMain.getDeliveryParty()); + newReceiptParam.setReceiveTime(tReceiveGoodsMain.getReceiveTime()); + newReceiptParam.setSaveType("1"); + newReceiptParam.setPackageSituation(tReceiveGoodsMain.getPackageSituation()); + List bunchingInfoList = new ArrayList<>(); + //查询图书编号 + Set queryBookInfoNumberList = bookGoWhereService.lambdaQuery() + .eq(TBookGoWhere::getType, "0") + .eq(TBookGoWhere::getDelFlag, "0") + .eq(TBookGoWhere::getWarehouseEntryFlag, "0") +// .in(TBookGoWhere::getTargetName, Arrays.asList(ReceiveGoodsMainEnum.OrderTypeEnum.BUSINESS_DEPARTMENT.getDescribe(), ReceiveGoodsMainEnum.OrderTypeEnum.VERSION_LIBRARY.getDescribe())) + .in(TBookGoWhere::getBookNumber, bookNumberList) + .eq(TBookGoWhere::getCreateCorpId, corpId) + .eq(TBookGoWhere::getOrderType, orderType) + .list().stream().map(TBookGoWhere::getBookNumber).collect(Collectors.toSet()); + List libraryList = libraryService.getListByBookNumberList(queryBookInfoNumberList); + //创建收货单 + if (CollUtil.isNotEmpty(libraryList)) { + for (TLibrary tLibrary : libraryList) { + bunchingInfoList.add(BeanUtil.copyProperties(tLibrary, ReceiveGoodsMainDto.BunchingInfo.class)); + } + newReceiptParam.setBunchingInfoList(bunchingInfoList); + this.newReceipt(newReceiptParam); + } + } + + } //生成二维码 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); DictionaryDataEntity data = dictionaryDataApi.getByTypeDataCode("SampleLibrary", "xtaddr").getData(); - String systemUrl="http://61.169.37.106:9172/api/file/Image/preview/"; - if (null!=data){ - systemUrl=data.getDescription(); + String systemUrl = "http://61.169.37.106:9172/api/file/Image/preview/"; + if (null != data) { + systemUrl = data.getDescription(); } - QrCodeUtil.generate(systemUrl, 1000, 1000,"", byteArrayOutputStream); + QrCodeUtil.generate(systemUrl, 1000, 1000, "", byteArrayOutputStream); MockMultipartFile mockMultipartFile = new MockMultipartFile("上架.png", "上架.png", "text/plain", byteArrayOutputStream.toByteArray()); FileInfo preview = fileUploadApi.uploadFile(mockMultipartFile, fileApi.getPath(FileTypeConstant.BIVISUALPATH), "preview", "上架.png"); diff --git a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSelectionOrderingMainServiceImpl.java b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSelectionOrderingMainServiceImpl.java index 5d68ec6..83e57ce 100644 --- a/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSelectionOrderingMainServiceImpl.java +++ b/jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSelectionOrderingMainServiceImpl.java @@ -349,6 +349,7 @@ public class TSelectionOrderingMainServiceImpl extends ServiceImpl from t_book_go_where where relation_id = #{id} - and warehouse_entry_flag = '1' + and book_number = #{bookNumber} + and warehouse_entry_flag = '0' and del_flag = '0' and type = '1' diff --git a/jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/ReceiveGoodsMainController.java b/jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/ReceiveGoodsMainController.java index 64f7ee3..7db7e8f 100644 --- a/jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/ReceiveGoodsMainController.java +++ b/jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/ReceiveGoodsMainController.java @@ -1,6 +1,7 @@ package jnpf.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -8,12 +9,17 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.Page; +import jnpf.constant.MsgCode; +import jnpf.entity.TLibrary; +import jnpf.exception.DataException; import jnpf.model.dto.ReceiveGoodsMainDto; +import jnpf.service.ILibraryService; import jnpf.service.TReceiveGoodsMainService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Optional; @RestController @Api("收货管理") @@ -22,12 +28,13 @@ import java.util.List; @AllArgsConstructor public class ReceiveGoodsMainController { private final TReceiveGoodsMainService tReceiveGoodsMainService; + private final ILibraryService libraryService; @Operation(summary = "收货单新建") @PostMapping("newReceipt") public ActionResult newReceipt(@RequestBody ReceiveGoodsMainDto.NewReceiptParam param) { - return ActionResult.success(tReceiveGoodsMainService.newReceipt(param)); + return ActionResult.success(MsgCode.SU000.get(),tReceiveGoodsMainService.newReceipt(param)); } @@ -39,7 +46,7 @@ public class ReceiveGoodsMainController { @Operation(summary = "根据id查询收货详情") @GetMapping("getInfoById") - public ActionResult getInfoById(@ApiParam("收货单id")@RequestParam String id) { + public ActionResult getInfoById(@ApiParam("收货单id") @RequestParam String id) { return ActionResult.success(tReceiveGoodsMainService.getInfoById(id)); } @@ -51,10 +58,12 @@ public class ReceiveGoodsMainController { } - @Operation(summary = "通过图书编号查询图书基本信息-(拆包扫图书条码)") @GetMapping("getBunchingInfoByBookNumber") - public ActionResult getBunchingInfoByBookNumber(@ApiParam("图书编号")@RequestParam String bookNumber) { + public ActionResult getBunchingInfoByBookNumber(@ApiParam("图书编号") @RequestParam String bookNumber) { + if (StrUtil.isBlank(bookNumber)) { + throw new DataException("请输入图书编号"); + } return ActionResult.success(tReceiveGoodsMainService.getBunchingInfoByBookNumber(bookNumber)); } @@ -62,23 +71,18 @@ public class ReceiveGoodsMainController { @Operation(summary = "删除收货单") @PostMapping("/delete") public ActionResult delete(@RequestParam String id) { - tReceiveGoodsMainService.delete(id,true); + tReceiveGoodsMainService.delete(id, true); return ActionResult.success(); } - - - // 分堆 - - @Operation(summary = "根据选书id查询分堆信息(根据验收类型:1-业务部 2-版本馆 3-样书室)") @GetMapping("getStackingInformation") - public ActionResult> getStackingInformation(@ApiParam("选书id")@RequestParam Long id,@ApiParam("验收类型:1-业务部 2-版本馆 3-样书室")@RequestParam String orderType) { - return ActionResult.success(tReceiveGoodsMainService.getStackingInformation(id,orderType)); + public ActionResult> getStackingInformation(@ApiParam("选书id") @RequestParam Long id, @ApiParam("验收类型:1-业务部 2-版本馆 3-样书室") @RequestParam String orderType) { + return ActionResult.success(tReceiveGoodsMainService.getStackingInformation(id, orderType)); } @@ -97,4 +101,13 @@ public class ReceiveGoodsMainController { return ActionResult.success(); } + + + //h5上架使用 + + + + + + } diff --git a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/ReceiveGoodsMainEnum.java b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/ReceiveGoodsMainEnum.java index 962e8eb..2031c7a 100644 --- a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/ReceiveGoodsMainEnum.java +++ b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/ReceiveGoodsMainEnum.java @@ -38,7 +38,7 @@ public class ReceiveGoodsMainEnum { //签收类型:1-业务部 2-版本馆 3-样书室 4-重点书 @Getter public enum OrderTypeEnum { - BUSINESS_DEPARTMENT("1", "业务部"), + BUSINESS_DEPARTMENT("1", "锐雯家"), VERSION_LIBRARY("2", "版本馆"), SAMPLE_BOOKSTORE("3", "样书室"); diff --git a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/ReceiveGoodsMainDto.java b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/ReceiveGoodsMainDto.java index 70ab6cb..491ead7 100644 --- a/jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/ReceiveGoodsMainDto.java +++ b/jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/ReceiveGoodsMainDto.java @@ -123,7 +123,7 @@ public class ReceiveGoodsMainDto { private String orderType; - @ApiModelProperty("验收类型:1-业务部 2-版本馆 3-样书室") + @ApiModelProperty("分堆信息") private List bookGoWhereList; }