From b07db84f3977d0c8c1e08d05eb512cad652d3361 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 30 Oct 2024 10:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventroy/WmsInventoryRecordRest.java | 8 ++ .../wmsinventory/WmsInventoryMapper.java | 2 + .../wmsinventory/WmsInventoryMapper.xml | 3 + .../wmsinventory/WmsInventoryService.java | 4 + .../InventoryRecordDto.java | 92 +++++++++++++++++++ .../WmsInventoryRecordService.java | 54 +++++++++++ 6 files changed, 163 insertions(+) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/InventoryRecordDto.java diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java index 71c8fbd173..e109086d30 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java @@ -172,4 +172,12 @@ public class WmsInventoryRecordRest { ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response); } + + + @ApiOperation("新增出入库记录") + @PostMapping("/saveInventoryRecord") + ResultBean saveInventoryRecord(@RequestBody InventoryRecordDto dto){ + return wmsInventoryRecordService.saveInventoryRecord(dto); + } + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 2167408718..2533d8301e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -84,4 +84,6 @@ public interface WmsInventoryMapper extends BaseMapper { List selJJByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List rackSids); List selJJByDeptSid(String deptSid); + + WmsInventory selbyGoodsId(@Param("goodsID") String goodsID); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 945746f09a..6ee6f7d049 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -619,4 +619,7 @@ AND wwi.warehouseTypeKey = '02' AND RIGHT(wi.`goodsID`,2) = '-O' + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index ad9a7d3172..f03b54e703 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -978,4 +978,8 @@ public class WmsInventoryService extends MybatisBaseService selJJByDeptSid(String deptSid) { return baseMapper.selJJByDeptSid(deptSid); } + + public WmsInventory selbyGoodsId(String goodsID) { + return baseMapper.selbyGoodsId(goodsID); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/InventoryRecordDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/InventoryRecordDto.java new file mode 100644 index 0000000000..9cdec42286 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/InventoryRecordDto.java @@ -0,0 +1,92 @@ +package com.yxt.wms.biz.inventory.wmsinventoryrecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/10/30 10:19 + */ +@Data +public class InventoryRecordDto { + + private String sid; // sid + + @ApiModelProperty("库存sid") + private String inventorySid; // 库存sid + @ApiModelProperty("创建人sid") + private String createBySid; // 商品ID + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("来源单sid（业务单sid）") + private String sourceBillSid; // 来源单sid（业务单sid） + @ApiModelProperty("来源单据编号") + private String billNo; // 来源单据编号 + @ApiModelProperty("单据类型（1入库、0出库）") + private String billType; // 单据类型（1入库、0出库） + @ApiModelProperty("业务类型key（采购入库、维修出入库、销售出入库等）") + private String busTypeKey; // 业务类型key（采购入库、维修出入库、销售出入库等） + @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") + private String busTypeValue; // 业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等） + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 +// @ApiModelProperty("出入库后的库存量") +// private String currentCount; // 出入库后的库存量 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位编号") + private String warehouseRackCode; // 库位编号 + @ApiModelProperty("入库单价") + private String cost; + @ApiModelProperty("税率") + private String taxRate; + @ApiModelProperty("入库金额") + private String amount; + @ApiModelProperty("经办人sid") + private String handlerSid; // 库位sid + @ApiModelProperty("经办人") + private String handlerName; // 库位编号 + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + + @ApiModelProperty("销售指导价") + private String guidPrice; + @ApiModelProperty("客户/供应商sid，出库是为客户，入库时为供应商") + private String supplierSid; + @ApiModelProperty("客户/供应商名称") + private String supplierName; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("前一单据明细sid（溯源使用）") + private String preBillSid; + @ApiModelProperty("前一单编号") + private String preBillNo; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 35c92a3d53..24824ee309 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -370,4 +370,58 @@ public class WmsInventoryRecordService extends MybatisBaseService