From 8c1e61acad53b7bc3f21213c9c4300dc7a21ef96 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sun, 26 May 2024 22:15:34 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E7=AD=89=E6=96=B0=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllocationBillController.java | 32 ++-- .../controller/EasOutInBillController.java | 23 --- .../eas/controller/ReceiptBillController.java | 28 ++- .../wms/database/eas/dao/AllocationBill.java | 168 ++---------------- .../nl/wms/database/eas/dao/ReceiptBill.java | 159 +++-------------- .../eas/dao/mapper/AllocationBillMapper.java | 8 + .../eas/dao/mapper/EasOutInBillMapper.java | 7 - .../eas/dao/mapper/ReceiptBillMapper.java | 2 + .../eas/dao/xml/AllocationBillMapper.xml | 44 ++++- .../eas/dao/xml/EasOutInBillMapper.xml | 68 ------- .../eas/dao/xml/ReceiptBillMapper.xml | 26 ++- .../eas/dto/AllocationBillDetailDto.java | 97 ++++++++++ .../database/eas/dto/AllocationBillDto.java | 167 +++-------------- .../database/eas/dto/AllocationBillQuery.java | 77 +++++++- .../database/eas/dto/AllocationBillVO.java | 143 ++++----------- .../database/eas/dto/AllocationEasData.java | 16 ++ .../eas/dto/ReceiptBillDetailDto.java | 49 +++++ .../wms/database/eas/dto/ReceiptBillDto.java | 140 +++------------ .../database/eas/dto/ReceiptBillQuery.java | 112 ++++++++++-- .../wms/database/eas/dto/ReceiptBillVO.java | 142 +++++---------- .../eas/service/IallocationBillService.java | 16 +- .../eas/service/IeasOutInBillService.java | 14 -- .../eas/service/IreceiptBillService.java | 12 +- .../impl/AllocationBillServiceImpl.java | 113 +++++++++++- .../service/impl/EasOutInBillServiceImpl.java | 26 --- .../service/impl/ReceiptBillServiceImpl.java | 91 +++++++++- 26 files changed, 828 insertions(+), 952 deletions(-) create mode 100644 nlsso-server/src/main/java/org/nl/wms/database/eas/dto/AllocationBillDetailDto.java create mode 100644 nlsso-server/src/main/java/org/nl/wms/database/eas/dto/AllocationEasData.java create mode 100644 nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDetailDto.java diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java index 3a8cfa9..9bfa255 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java @@ -8,7 +8,9 @@ import org.nl.common.base.CommonPage; import org.nl.common.base.CommonResult; import org.nl.common.base.RestBusinessTemplate; import org.nl.common.base.ResultCode; +import org.nl.common.exception.BadRequestException; import org.nl.wms.database.eas.dao.AllocationBill; +import org.nl.wms.database.eas.dto.AllocationBillQuery; import org.springframework.web.bind.annotation.*; import lombok.RequiredArgsConstructor; @@ -23,7 +25,7 @@ import org.nl.wms.database.eas.service.IallocationBillService; /** - * (AllocationBill)控制层 + * 诺力三期WMS出入库新增功能 */ @RestController @RequiredArgsConstructor @@ -36,6 +38,18 @@ public class AllocationBillController { private IallocationBillService allocationBillService; + /** + * 查询调拨单据 + * + * @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } + */ + @PostMapping("/allocationPage") + @Log("分页查询") + public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) { + return new ResponseEntity<>(allocationBillService.allocationPage(params), HttpStatus.OK); + } + + /** * 分页查询 * @@ -43,7 +57,7 @@ public class AllocationBillController { */ @PostMapping("/page") @Log("分页查询") - public ResponseEntity> page(@RequestBody AllocationBillVO params) { + public ResponseEntity> page(@RequestBody AllocationBillQuery params) { return new ResponseEntity<>(allocationBillService.page(params), HttpStatus.OK); } @@ -61,19 +75,17 @@ public class AllocationBillController { /** * 单据直接调拨 - * - * @param ids 传入审核对象主键，例：{"id":"1"} - * @return 单据直接调拨 */ - @PostMapping("/allocationConfirm") + @PostMapping("/confirm") @Log("单据直接调拨") @SaIgnore //@SaCheckPermission("@el.check(allocationConfirm:edit')") - public CommonResult allocationConfirm(@RequestBody List ids) { - if (ids == null || ids.isEmpty()) { - return CommonResult.failed(ResultCode.FAILED); + public CommonResult confirm(@RequestBody List params) { + if (params.isEmpty()) { + throw new BadRequestException("参数为空！"); } - return RestBusinessTemplate.execute(() -> allocationBillService.allocationConfirm(ids)); + // return RestBusinessTemplate.execute(() -> allocationBillService.allocationConfirm(params)); + return RestBusinessTemplate.execute(() -> null); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java index f98ad5a..39b0de1 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java @@ -84,29 +84,6 @@ public class EasOutInBillController { } - /** - * 查询调拨单据 - * - * @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } - */ - @PostMapping("/allocationPage") - @Log("分页查询") - public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) { - return new ResponseEntity<>(easOutInBillService.allocationPage(params), HttpStatus.OK); - } - - - /** - * 查询收货单据 - * - * @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } - */ - @PostMapping("/receiptPage") - @Log("分页查询") - public ResponseEntity> receiptPage(@RequestBody ReceiptBillQuery params) { - return new ResponseEntity<>(easOutInBillService.receiptPage(params), HttpStatus.OK); - } - /** * 查询出入库单据 diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java index 5bd42f3..0567280 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java @@ -8,7 +8,10 @@ import org.nl.common.base.CommonPage; import org.nl.common.base.CommonResult; import org.nl.common.base.RestBusinessTemplate; import org.nl.common.base.ResultCode; +import org.nl.common.exception.BadRequestException; import org.nl.wms.database.eas.dao.ReceiptBill; +import org.nl.wms.database.eas.dto.ReceiptBillQuery; +import org.nl.wms.ext.srm.WmsToSrmService; import org.springframework.web.bind.annotation.*; import lombok.RequiredArgsConstructor; @@ -23,7 +26,7 @@ import org.nl.wms.database.eas.service.IreceiptBillService; /** - * (ReceiptBill)控制层 + * 诺力三期WMS出入库新增功能1 */ @RestController @RequiredArgsConstructor @@ -35,6 +38,17 @@ public class ReceiptBillController { @Resource private IreceiptBillService receiptBillService; + /** + * 查询收货单据 + * + * @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } + */ + @PostMapping("/receiptPage") + @Log("分页查询") + public ResponseEntity> receiptPage(@RequestBody ReceiptBillQuery params) { + return new ResponseEntity<>(receiptBillService.receiptPage(params), HttpStatus.OK); + } + /** * 分页查询 @@ -63,18 +77,18 @@ public class ReceiptBillController { /** * 收货单确认 * - * @param ids 传入审核对象主键，例：{"id":"1"} * @return 收货单确认 */ - @PostMapping("/receiptConfirm") + @PostMapping("/confirm") @Log("收货单确认") @SaIgnore //@SaCheckPermission("@el.check(receiptConfirm:edit')") - public CommonResult receiptConfirm(@RequestBody List ids) { - if (ids == null || ids.isEmpty()) { - return CommonResult.failed(ResultCode.FAILED); + public CommonResult confirm(@RequestBody List params) { + if (params.isEmpty()) { + throw new BadRequestException("参数为空！"); } - return RestBusinessTemplate.execute(() -> receiptBillService.receiptConfirm(ids)); + // return RestBusinessTemplate.execute(() -> receiptBillService.receiptConfirm(params)); + return RestBusinessTemplate.execute(() -> null); } /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java index 4ea0949..020a892 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java @@ -21,133 +21,53 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; public class AllocationBill extends Model { private static final long serialVersionUID = -7739291296662381393L; - //@TableId(value = "id", type = IdType.NONE) + /** * 单据ID */ + @TableId(value = "djid", type = IdType.NONE) private String djid; - /** * 单据编号 */ - private String djbh; - - - /** - * 业务类型 - */ - private String ywlx; + private String djbh; /** * 业务日期 */ - private String ywrq; - - - /** - * 调出库存组织编码 - */ - private String dckcbm; - - - /** - * 调出库存组织名称 - */ - private String dckcmc; - - - /** - * 调入库存组织编码 - */ - private String drkcbm; - - - /** - * 调入库存组织名称 - */ - private String drkcmc; - - - /** - * 调出部门 - */ - private String dcbm; + private String ywrq; - /** - * 调入部门 - */ - private String drbm; /** * 表头备注 */ - private String btbz; - - - /** - * 制单时间 - */ - private String cjsj; - - - /** - * 创建人 - */ - private String cjr; + private String btbz; - /** - * 单据状态 - */ - private String djzt; - /** - * 分录ID - */ - private String flid; - /** * 分录序号 */ - private String flxh; - - - /** - * 物料编码 - */ - private String wlbm; + private String flxh; - /** - * 物料名称 - */ - private String wlmc; /** - * 规格型号 + * 分录id */ - private String ggxh; - - /** - * 批次 - */ - private String pc; + private String flid; - /** - * 辅助属性 - */ - private String fzsx; /** @@ -155,90 +75,34 @@ public class AllocationBill extends Model { */ private String jldw; - - /** - * 基本计量单位 - */ - private String jbjldw; - - /** * 数量 */ private String sl; - /** - * 基本数量 - */ - private String jbsl; - - - /** - * 库存类型 - */ - private String kclx; - - - /** - * 库存状态 - */ - private String kczt; - /** - * 调出仓库编码 + * 调出仓库 */ private String dcckbm; - /** - * 调出仓库名称 - */ - private String dcckmc; - - - /** - * 调出库位编码 + * 调出库位 */ private String dckwbm; - /** - * 调出库位名称 - */ - private String dckwmc; - - - /** - * 调入仓库编码 + * 调入仓库 */ private String drckbm; - /** - * 调入仓库名称 - */ - private String drckmc; - - - /** - * 调入库位编码 + * 调入库位 */ private String drkwbm; - /** - * 调入库位名称 - */ - private String drkwmc; - - - /** - * 跟踪号 - */ - private String gzh; - /** * 计划调入日期 @@ -247,16 +111,14 @@ public class AllocationBill extends Model { /** - * 计划调出日期 + * 计划调入日期 */ private String jhdcrq; - /** - * 分录备注 + * 备注 */ - private String flbz; - + private String bz; /** * 获取主键值 diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java index 5dc26c6..73fda17 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java @@ -21,73 +21,27 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; public class ReceiptBill extends Model { private static final long serialVersionUID = -7739291296662381393L; - //@TableId(value = "id", type = IdType.NONE) /** - * 送货单号 - */ - private String djbh; - - - /** - * 送贷日期 - */ - private String ywrq; - - - /** - * 提交时间 - */ - private String tjsj; - - - /** - * 采购订单号 - */ - private String cgbh; - - - /** - * 采购公司 - */ - private String cggs; - - - /** - * 物料编码 - */ - private String wlbm; - - - /** - * 物科名称 + * 送货单id */ - private String wlmc; + @TableId(value = "djid", type = IdType.NONE) + private String djid; /** - * 规格型号 - */ - private String ggxh; - - - /** - * 单位 + * 送货单号 */ - private String jldw; + private String djbh; /** - * 订单量 + * 送货日期 */ - private String ddsl; + private String ywrq; - /** - * 本次送货数量 - */ - private String bcshsl; /** @@ -96,119 +50,48 @@ public class ReceiptBill extends Model { private String shsl; - /** - * 件数 - */ - private String num; /** - * 收货组织 + * 收货组织编码 */ private String zzbm; /** - * 收货仓库 + * 收货仓库编码 */ - private String zzmc; - + private String ckbm; /** - * 收货库位 + * 收货库位编码 */ - private String shcw; + private String kwbm; /** - * 是否质检 + * 分录ID */ - private String sfzj; + private String flid; /** - * 批次管理 + * 分录序号 */ - private String pcgl; - + private String flxh; /** - * 批次 + * 备注 */ - private String pc; + private String bz; /** - * 所属厂区 + * 表头备注 */ - private String sscq; + private String btbz; - /** - * 供应商编码 - */ - private String gysbm; - - - /** - * 供应商 - */ - private String gys; - - - /** - * 到货日期 - */ - private String dhrq; - - - /** - * 创建入编码 - */ - private String cjr; - - - /** - * 创建日期 - */ - private String cjrq; - - - /** - * 采购员 - */ - private String cgy; - - - /** - * 送货人 - */ - private String shy; - - - /** - * 收货人 - */ - private String shr; - - - /** - * 预计到货日期 - */ - private String yjdhrq; - - - /** - * 收货地址 - */ - private String shdz; - - - /** - * 包装类别 - */ - private String bzlb; - /** * 获取主键值 @@ -217,7 +100,7 @@ public class ReceiptBill extends Model { */ @Override protected Serializable pkVal() { - return this.djbh; + return this.djid; } } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java index ef24282..0411254 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java @@ -15,6 +15,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface AllocationBillMapper extends BaseMapper { + @Select("SELECT COUNT(*) FROM receiptBill") + @DS("oracle_eas") + Long getAllocationCount(); + + @DS("oracle_eas") + Page allocationPage(Page page, @Param("fuzzy") String fuzzy); + + @Select("SELECT COUNT(*) FROM EAS_NOBLE.receiptBill WHERE DJBH = #{djbh}") @DS("oracle_eas") Long getTotalCount(@Param("djbh") String djbh); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java index cf32cb3..d4c7b8b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java @@ -45,14 +45,7 @@ public interface EasOutInBillMapper extends BaseMapper { @DS("oracle_eas") List getWarehouseInfo(); - @Select("SELECT COUNT(*) FROM receiptBill") - @DS("oracle_eas") - Long getTotalCount(); - @DS("oracle_eas") - Page allocationPage(Page page, @Param("fuzzy") String fuzzy); - @DS("mysql_srm") - Page receiptPage(Page page, @Param("fuzzy") String fuzzy); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java index 2ed6057..c73b30b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java @@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2024-05-25 */ public interface ReceiptBillMapper extends BaseMapper { + @DS("mysql_srm") + Page receiptPage(Page page, @Param("fuzzy") String fuzzy); @DS("mysql_srm") Page receiptDetailPage(Page page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml index 8d944ae..57ac28f 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml @@ -1,7 +1,49 @@ - + WITH ranked_data AS ( + SELECT + t.*, + ROW_NUMBER() OVER (PARTITION BY djbh ORDER BY jhdrrq DESC) AS rn + FROM + EAS_NOBLE.V_UC_STOCKTRANSFERBILL t + ), + grouped_data AS ( + SELECT * + FROM + ranked_data + WHERE + rn = 1 + ) + SELECT * + FROM ( + SELECT + temp.*, + ROWNUM AS row_num + FROM ( + SELECT * + FROM grouped_data + WHERE + + (djbh LIKE '%' || #{fuzzy} || '%' OR + wlbm LIKE '%' || #{fuzzy} || '%' OR + wlmc LIKE '%' || #{fuzzy} || '%' OR + ggxh LIKE '%' || #{fuzzy} || '%' OR + dckcmc LIKE '%' || #{fuzzy} || '%' OR + dcckmc LIKE '%' || #{fuzzy} || '%' OR + drkcmc LIKE '%' || #{fuzzy} || '%' OR) + + ORDER BY jhdrrq DESC + ) temp + WHERE + + ) + WHERE #{size} * (#{page} - 1) ]]> + + + + - - - - - - + +