From 065717fbebabd559746521fe2594a12b066a4881 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 22 Aug 2024 17:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3goodsSpuSid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillDetail.java | 2 +- .../AsBusrepairInventorybillDetailDto.java | 2 +- .../AsBusrepairInventorybillDetailSDto.java | 2 +- .../as/feign/sms/smssalesbill/SalesGoodsVo.java | 2 +- .../as/feign/wms/wmsInventory/WmsInventory.java | 2 +- .../pmspurchasebill/PmsPurchaseBillDetailDto.java | 4 ++-- .../pms/pmspurchasebill/PmsPurchaseBillService.java | 2 +- .../pmspurchasebilldetail/PmsPurchaseBillDetail.java | 2 +- .../PmsPurchaseBillDetailVo.java | 2 +- .../feign/wms/wmsansbill/WmsAnsBillDetailDto.java | 2 +- .../com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java | 2 +- .../yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml | 2 +- .../biz/smssalesbilldetail/SmsSalesBillDetail.java | 2 +- .../SmsSalesBillDetailDetailsVo.java | 4 ++-- .../smssalesbilldetail/SmsSalesBillDetailDto.java | 4 ++-- .../smssalesbilldetail/SmsSalesBillDetailQuery.java | 2 +- .../biz/smssalesbilldetail/SmsSalesBillDetailVo.java | 2 +- .../sms/biz/smssalesreturn/SalesGoodsReturnVo.java | 2 +- .../smssalesreturn/SmsSalesReturnDetailsGoodsVo.java | 2 +- .../smssalesreturndetail/SmsSalesReturnDetail.java | 2 +- .../SmsSalesReturnDetailDetailsVo.java | 4 ++-- .../SmsSalesReturnDetailDto.java | 4 ++-- .../SmsSalesReturnDetailQuery.java | 2 +- .../smssalesreturndetail/SmsSalesReturnDetailVo.java | 2 +- .../AsBusrepairInventorybillDetail.java | 2 +- .../yxt/sms/feign/wms/wmsinventory/WmsInventory.java | 2 +- .../feign/wms/wmsinventory/WmsInventorySalesVo.java | 2 +- .../wmsinventoryrecord/WmsInventoryRecordDto.java | 2 +- .../biz/inventory/wmsansbill/WmsAnsBillMapper.xml | 2 +- .../inventory/wmsansbilldetail/WmsAnsBillDetail.java | 2 +- .../wmsansbilldetail/WmsAnsBillDetailDto.java | 2 +- .../wmsansbilldetail/WmsAnsBillDetailMapper.xml | 6 +++--- .../wmsansbilldetail/WmsAnsBillDetailVo.java | 2 +- .../wmsansbilldetail/WmsAnsListDetailsVo.java | 2 +- .../WmsDistributeBillDetail.java | 2 +- .../WmsDistributeBillDetailDto.java | 2 +- .../WmsDistributeBillDetailVo.java | 2 +- .../wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java | 2 +- .../biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java | 2 +- .../biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml | 2 +- .../inventory/wmsgoodstag/WmsGoodsTagService.java | 4 ++-- .../wms/biz/inventory/wmsinventory/WmsInventory.java | 2 +- .../biz/inventory/wmsinventory/WmsInventoryDto.java | 2 +- .../inventory/wmsinventory/WmsInventoryMapper.xml | 4 ++-- .../inventory/wmsinventory/WmsInventorySalesVo.java | 2 +- .../inventory/wmsinventory/WmsInventorySaveDto.java | 2 +- .../WmsInventoryBillDetail.java | 2 +- .../WmsInventoryBillDetailInDto.java | 4 ++-- .../WmsInventoryBillDetailMapper.xml | 6 +++--- .../WmsInventoryBillDetailOutDto.java | 2 +- .../WmsInventoryBillDetailService.java | 2 +- .../WmsInventoryCheckbillService.java | 4 ++-- .../WmsInventoryProfitinService.java | 4 ++-- .../wmsinventoryrecord/WmsInventoryRecord.java | 2 +- .../WmsInventoryRecordDetailsVo.java | 4 ++-- .../wmsinventoryrecord/WmsInventoryRecordDto.java | 2 +- .../wmsinventoryrecord/WmsInventoryRecordQuery.java | 2 +- .../wmsinventoryrecord/WmsInventoryRecordVo.java | 2 +- .../WmsInventorySettlebillDetail.java | 2 +- .../wmsoldinventory/WmsOldInventoryDto.java | 2 +- .../inventory/wmsoutbill/WmsOutBillInventoryVo.java | 2 +- .../biz/inventory/wmsoutbill/WmsOutBillMapper.xml | 2 +- .../biz/inventory/wmsoutbill/WmsOutBillService.java | 2 +- .../inventory/wmsoutbilldetail/WmsOutBillDetail.java | 2 +- .../wmsoutbilldetail/WmsOutBillDetailDto.java | 2 +- .../wmsoutbilldetail/WmsOutBillDetailMapper.xml | 4 ++-- .../wmsreceiptbill/WmsReceiptBillMapper.xml | 4 ++-- .../wmsreceiptbill/WmsReceiptBillService.java | 4 ++-- .../wmsreceiptbilldetail/WmsReceiptBillDetail.java | 2 +- .../WmsReceiptBillDetailDto2.java | 4 ++-- .../wmsreceiptbilldetail/WmsReceiptBillDetailVo.java | 4 ++-- .../inventory/wmsshelfbill/WmsShelfBillService.java | 12 ++++++------ .../wmsshelfbilldetail/ShelfInitListVo.java | 2 +- .../wmsshelfbilldetail/WmsShelfBillDetail.java | 2 +- .../wmsshelfbilldetail/WmsShelfBillDetailDto.java | 2 +- .../wmsshelfbilldetail/WmsShelfBillDetailMapper.xml | 2 +- .../wmsshelfbilldetail/WmsShelfBillDetailVos.java | 2 +- 77 files changed, 102 insertions(+), 102 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java index d3205b78da..4e5861d7e9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -27,7 +27,7 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { @ApiModelProperty("商品ID") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java index d5c8e7109e..008f1b37bf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java @@ -23,7 +23,7 @@ public class AsBusrepairInventorybillDetailDto { @JsonProperty("goodsID") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java index 16352e20ec..fb8d9fdbf5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java @@ -24,7 +24,7 @@ public class AsBusrepairInventorybillDetailSDto { @JsonProperty("goodsID") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/smssalesbill/SalesGoodsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/smssalesbill/SalesGoodsVo.java index 59906aaf2f..88ee074388 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/smssalesbill/SalesGoodsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/smssalesbill/SalesGoodsVo.java @@ -14,7 +14,7 @@ public class SalesGoodsVo { private String goodsSkuTitle; // 商品Sku名称 private String sid; //商品sid - private String goodSpuSid; + private String goodsSpuSid; private String inventorySid; private String goodsSkuSid; //商品名称 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventory.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventory.java index 02983886e2..0f0e8639e4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventory.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventory.java @@ -21,7 +21,7 @@ public class WmsInventory extends BaseEntity { @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java index eefd58ebd3..313388ca94 100644 --- a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java +++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java @@ -55,7 +55,7 @@ public class PmsPurchaseBillDetailDto implements Dto { @ApiModelProperty("单据sid") private String billSid; // 单据sid @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") @@ -95,4 +95,4 @@ public class PmsPurchaseBillDetailDto implements Dto { @ApiModelProperty("最低零售价") private BigDecimal minimumSalesPrice; // 最低零售价 -} \ No newline at end of file +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 93e6544fa4..3743836d8d 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -487,7 +487,7 @@ public class PmsPurchaseBillService extends MybatisBaseService pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(businessSid); for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto(); - wmsAnsBillDetailDto.setGoodSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodSpuSid()); + wmsAnsBillDetailDto.setGoodsSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodSpuSid()); wmsAnsBillDetailDto.setGoodsSpuName(pmsPurchaseBillDetailDetailsVo.getGoodsSpuName()); wmsAnsBillDetailDto.setGoodsSkuSid(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid()); wmsAnsBillDetailDto.setGoodsSkuTitle(pmsPurchaseBillDetailDetailsVo.getGoodsSkuTitle()); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java index 2129db487f..865e56c1ee 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java @@ -57,7 +57,7 @@ public class PmsPurchaseBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; // 单据sid @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java index c545ea93f4..8d8c5f9646 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java @@ -58,7 +58,7 @@ public class PmsPurchaseBillDetailVo implements Vo { @ApiModelProperty("单据sid") private String billSid; // 单据sid @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java index 96821af66b..7837eae389 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java @@ -12,7 +12,7 @@ import lombok.Data; public class WmsAnsBillDetailDto { @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index 4363282bd5..41e582004a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -16,7 +16,7 @@ public class SalesGoodsVo { private String goodsSkuTitle; // 商品Sku名称 private String sid; //商品sid - private String goodSpuSid; + private String goodsSpuSid; private String inventorySid; private String goodsSkuSid; //商品名称 diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index b228510ba5..5e5350edfa 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -81,7 +81,7 @@ LEFT JOIN sms_sales_bill AS s ON d.billSid = s.sid LEFT JOIN sms_sales_return AS r ON s.sid = r.sourceBillSid LEFT JOIN sms_sales_return_detail AS rd ON r.sid = rd.billSid - AND d.goodSpuSid = rd.goodSpuSid + AND d.goodsSpuSid = rd.goodsSpuSid ${ew.sqlSegment} - select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodSpuSid + select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodsSpuSid from wms_ans_bill_detail wd ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java index b8b58f6287..e98b6ae4d0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java @@ -17,7 +17,7 @@ public class WmsAnsBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java index 1c9b56870f..16beecd80f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; public class WmsAnsBillDetailDto { @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml index b0cd6eb5a6..83d2e34e7e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml @@ -21,17 +21,17 @@ wd.taxPrice, wd.amount, wd.goodsSkuSid, - wd.goodSpuSid + wd.goodsSpuSid from wms_ans_bill_detail wd where billSid = #{sid} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailVo.java index e82d86abd0..fe9d64b900 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailVo.java @@ -16,7 +16,7 @@ public class WmsAnsBillDetailVo { @ApiModelProperty("来源单号") private String sourceBillNo; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java index 92e52102e7..c3d7fb0311 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java @@ -49,7 +49,7 @@ public class WmsAnsListDetailsVo { @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; /* @ApiModelProperty("商品名称") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetail.java index f6cb4c9281..c68b1d4746 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetail.java @@ -18,7 +18,7 @@ public class WmsDistributeBillDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailDto.java index 10fc9423a4..73a4ff78f7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailDto.java @@ -16,7 +16,7 @@ public class WmsDistributeBillDetailDto { @ApiModelProperty("出库单明细sid") private String outBillDetailSid; @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailVo.java index fd9c7bc717..3bd1889a7c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsdistributebilldetail/WmsDistributeBillDetailVo.java @@ -16,7 +16,7 @@ public class WmsDistributeBillDetailVo { @ApiModelProperty("出库单明细sid") private String outBillDetailSid; @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java index efe66bd715..4f65c3aadc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java @@ -22,7 +22,7 @@ public class WmsGoodsTag extends BaseEntity { @ApiModelProperty("商品ID") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java index 0921779bd1..be137a3e30 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java @@ -25,7 +25,7 @@ public interface WmsGoodsTagMapper extends BaseMapper { IPage goodsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selByBillSidAndBillDetailsSidAndGoodsSpuSid(@Param("billSid") String billSid, @Param("sid")String sid, @Param("goodSpuSid")String goodSpuSid); + List selByBillSidAndBillDetailsSidAndGoodsSpuSid(@Param("billSid") String billSid, @Param("sid")String sid, @Param("goodsSpuSid")String goodsSpuSid); String selectGoodsIDNum(String s); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml index 0e586622ff..e02017496a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml @@ -30,7 +30,7 @@ SELECT i.sid AS inventorySid, i.goodsID, - i.goodSpuSid, + i.goodsSpuSid, i.goodsSpuName, i.goodsSkuSid, i.goodsSkuTitle, @@ -151,7 +151,7 @@ - select goodSpuSid, + select goodsSpuSid, goodsSpuName, goodsSkuSid, goodsSkuTitle, @@ -64,7 +64,7 @@ - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java index e75ee0f62d..48e7f1b7f7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java @@ -12,7 +12,7 @@ import lombok.Data; public class WmsInventoryBillDetailOutDto { @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品库存sid") private String inventorySid; @ApiModelProperty("商品名称") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailService.java index 944a364e28..01adb6c609 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailService.java @@ -124,7 +124,7 @@ public class WmsInventoryBillDetailService extends MybatisBaseService selPkByDeptSid(String deptSid) { return baseMapper.selPkByDeptSid(deptSid); } -} \ No newline at end of file +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java index 2234923a0b..b11e5b1302 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java @@ -426,7 +426,7 @@ public class WmsInventoryProfitinService extends MybatisBaseService wmsAnsBillDetailDtos = new ArrayList<>(); for (WmsInventoryProfitinDetailDetailsVo wmsInventoryProfitinDetailDetailsVo : wmsInventoryProfitinDetailDetailsVos) { WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto(); - wmsAnsBillDetailDto.setGoodSpuSid(wmsInventoryProfitinDetailDetailsVo.getGoodsSid()); + wmsAnsBillDetailDto.setGoodsSpuSid(wmsInventoryProfitinDetailDetailsVo.getGoodsSid()); wmsAnsBillDetailDto.setGoodsSpuName(wmsInventoryProfitinDetailDetailsVo.getGoodsSpuName()); wmsAnsBillDetailDto.setGoodsSkuSid(wmsInventoryProfitinDetailDetailsVo.getGoodsSkuSid()); wmsAnsBillDetailDto.setGoodsSkuTitle(wmsInventoryProfitinDetailDetailsVo.getGoodsName()); @@ -631,4 +631,4 @@ public class WmsInventoryProfitinService extends MybatisBaseService sourceBillBySid(String sid) { return wmsInventoryCheckbillDetailService.sourceBillBySid(sid); } -} \ No newline at end of file +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java index d87ab180db..4a31da3610 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java @@ -73,7 +73,7 @@ public class WmsInventoryRecord extends BaseEntity { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDetailsVo.java index c5cfb952f4..5463247c59 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDetailsVo.java @@ -74,7 +74,7 @@ public class WmsInventoryRecordDetailsVo implements Vo { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") @@ -100,4 +100,4 @@ public class WmsInventoryRecordDetailsVo implements Vo { @ApiModelProperty("库位编号") private String warehouseRackCode; // 库位编号 -} \ No newline at end of file +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java index 3db5816633..a07c165387 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java @@ -76,7 +76,7 @@ public class WmsInventoryRecordDto implements Dto { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordQuery.java index 3c775921d0..2c825ae502 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordQuery.java @@ -72,7 +72,7 @@ public class WmsInventoryRecordQuery implements Query { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordVo.java index 4e8111cd15..dddeab657d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordVo.java @@ -74,7 +74,7 @@ public class WmsInventoryRecordVo implements Vo { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java index 2466f70197..378ceda2c1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java @@ -60,7 +60,7 @@ public class WmsInventorySettlebillDetail extends BaseEntity { private Integer settleType; // 库存结算类型（1月结 2年结） @ApiModelProperty("商品库存sid") private String inventorySid; // 商品库存sid - private String goodSpuSid;//商品基础信息sid + private String goodsSpuSid;//商品基础信息sid private String goodsSpuName;//商品名称 private String goodsSkuSid;//商品Skusid private String goodsSkuTitle;//商品Sku名称 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java index 5a8238ed68..b37bd258c9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java @@ -17,7 +17,7 @@ public class WmsOldInventoryDto { //厂家 private String manufacturerName; //商品基础信息sid - private String goodSpuSid; + private String goodsSpuSid; //商品名称 private String goodsSpuName; //商品Skusid diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java index c02fa81b75..de3fda9d3f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java @@ -15,7 +15,7 @@ public class WmsOutBillInventoryVo { @ApiModelProperty("商品ID") private String goodsID; @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("图号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml index 252003e405..1ef2c274a4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml @@ -32,7 +32,7 @@ - select wbd.goodSpuSid, + select wbd.goodsSpuSid, wbd.goodsSpuName, wbd.goodsSkuSid, wbd.goodsSkuTitle, @@ -18,4 +18,4 @@ from wms_out_bill_detail wbd where wbd.billSid = #{sid} - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml index c13f64aa7c..6986faf40f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml @@ -64,7 +64,7 @@ FROM wms_receipt_bill_detail AS d LEFT JOIN wms_receipt_bill AS b ON d.billSid = b.sid - WHERE d.goodSpuSid = #{goodsSpuSid} AND b.sourceBillSid = #{sourceBillSid} + WHERE d.goodsSpuSid = #{goodsSpuSid} AND b.sourceBillSid = #{sourceBillSid}