更正goodsSpuSid

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")

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")

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")

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;
     //商品名称

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")

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; // 最低零售价
 
-}
+}

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -487,7 +487,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                 List<PmsPurchaseBillDetailDetailsVo> 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());

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")

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")

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")

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;
     //商品名称

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
         <where>${ew.sqlSegment}</where>
     </select>
     <select id="goodsTrendReport" resultType="com.yxt.sms.biz.smssalesbill.report.SmsSalesTrendVo">

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java

@@ -57,7 +57,7 @@ public class SmsSalesBillDetail extends BaseEntity {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetailDetailsVo.java

@@ -60,7 +60,7 @@ public class SmsSalesBillDetailDetailsVo implements Vo {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")
@@ -94,4 +94,4 @@ public class SmsSalesBillDetailDetailsVo implements Vo {
 	@ApiModelProperty("已出库数量（仓储中具体出库数量）")
     private BigDecimal outboundCount; // 已出库数量（仓储中具体出库数量）
 
-}
+}

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetailDto.java

@@ -60,7 +60,7 @@ public class SmsSalesBillDetailDto implements Dto {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")
@@ -94,4 +94,4 @@ public class SmsSalesBillDetailDto implements Dto {
 	@ApiModelProperty("已出库数量（仓储中具体出库数量）")
     private BigDecimal outboundCount; // 已出库数量（仓储中具体出库数量）
 
-}
+}

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetailQuery.java

@@ -58,7 +58,7 @@ public class SmsSalesBillDetailQuery implements Query {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetailVo.java

@@ -60,7 +60,7 @@ public class SmsSalesBillDetailVo implements Vo {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SalesGoodsReturnVo.java

@@ -16,7 +16,7 @@ public class SalesGoodsReturnVo {
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
     @ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
     @ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnDetailsGoodsVo.java

@@ -16,7 +16,7 @@ public class SmsSalesReturnDetailsGoodsVo {
     @ApiModelProperty("商品库存sid")
     private String inventorySid; // 商品库存sid
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
     @ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
     @ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetail.java

@@ -57,7 +57,7 @@ public class SmsSalesReturnDetail extends BaseEntity {
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetailDetailsVo.java

@@ -58,7 +58,7 @@ public class SmsSalesReturnDetailDetailsVo implements Vo {
 	@ApiModelProperty("商品库存sid")
     private String inventorySid; // 商品库存sid
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")
@@ -84,4 +84,4 @@ public class SmsSalesReturnDetailDetailsVo implements Vo {
 	@ApiModelProperty("退货金额")
     private BigDecimal backAmount; // 退货金额
 
-}
+}

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetailDto.java

@@ -58,7 +58,7 @@ public class SmsSalesReturnDetailDto implements Dto {
 	@ApiModelProperty("商品库存sid")
     private String inventorySid; // 商品库存sid
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")
@@ -84,4 +84,4 @@ public class SmsSalesReturnDetailDto implements Dto {
 	@ApiModelProperty("退货金额")
     private BigDecimal backAmount; // 退货金额
 
-}
+}

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetailQuery.java

@@ -56,7 +56,7 @@ public class SmsSalesReturnDetailQuery implements Query {
 	@ApiModelProperty("商品库存sid")
     private String inventorySid; // 商品库存sid
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetailVo.java

@@ -58,7 +58,7 @@ public class SmsSalesReturnDetailVo implements Vo {
 	@ApiModelProperty("商品库存sid")
     private String inventorySid; // 商品库存sid
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/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")

yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventory/WmsInventory.java

@@ -19,7 +19,7 @@ public class WmsInventory extends BaseEntity {
 //    private String remarks;
 //    private String isEnable;
     private String goodsID;//商品ID（唯一编码，入库时生成）
-    private String goodSpuSid;//商品基础信息sid
+    private String goodsSpuSid;//商品基础信息sid
     private String goodsSpuName;//商品名称
     private String goodsSkuSid;//商品Skusid
     private String goodsSkuTitle;//商品Sku名称

yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventory/WmsInventorySalesVo.java

@@ -13,7 +13,7 @@ public class WmsInventorySalesVo implements Vo {
 
     private String inventorySid;
     private String goodsID;
-    private String goodSpuSid;//商品基础信息sid
+    private String goodsSpuSid;//商品基础信息sid
     private String goodsSpuName;//商品名称
     private String goodsSkuSid;//商品Skusid
     private String goodsSkuTitle;//商品Sku名称

yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventoryrecord/WmsInventoryRecordDto.java

@@ -73,7 +73,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")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillMapper">
     <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailVo">
-        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
         <where>
             ${ew.sqlSegment}

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")

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")

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}
     </select>
     <select id="selGoodsCountBySpuSidAndSouceSid" resultType="java.lang.String">
         SELECT IFNULL(d.orderCount,0) FROM wms_ans_bill_detail as d
-        WHERE d.goodSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
+        WHERE d.goodsSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
     </select>
     <select id="fetchBySpuSidAndBillSid"
             resultType="com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail">
         SELECT * FROM wms_ans_bill_detail as d
-        WHERE d.goodSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
+        WHERE d.goodsSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
     </select>
 </mapper>

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")

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("商品名称")

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")

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")

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")

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")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java

@@ -25,7 +25,7 @@ public interface WmsGoodsTagMapper extends BaseMapper<WmsGoodsTag> {
 
     IPage<GoodsTagListVo> goodsList(IPage<WmsReceiptBill> page, @Param(Constants.WRAPPER)  QueryWrapper<WmsReceiptBill> qw);
 
-    List<WmsGoodsTag> selByBillSidAndBillDetailsSidAndGoodsSpuSid(@Param("billSid") String billSid, @Param("sid")String sid, @Param("goodSpuSid")String goodSpuSid);
+    List<WmsGoodsTag> selByBillSidAndBillDetailsSidAndGoodsSpuSid(@Param("billSid") String billSid, @Param("sid")String sid, @Param("goodsSpuSid")String goodsSpuSid);
 
     String selectGoodsIDNum(String s);
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml

@@ -30,7 +30,7 @@
     </select>
     <select id="selByBillSidAndBillDetailsSidAndGoodsSpuSid"
             resultType="com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag">
-        select * from wms_goods_tag where billSid =#{billSid} and billDetailSid =#{sid} and goodSpuSid =#{goodSpuSid}
+        select * from wms_goods_tag where billSid =#{billSid} and billDetailSid =#{sid} and goodsSpuSid =#{goodsSpuSid}
     </select>
     <select id="selectGoodsIDNum" resultType="java.lang.String">
         select RIGHT (goodsID, 4)

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java

@@ -121,8 +121,8 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
         return vo;
     }
 
-    public List<WmsGoodsTag> selByBillSidAndBillDetailsSidAndGoodsSpuSid(String billSid, String sid, String goodSpuSid) {
-        return baseMapper.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid,sid,goodSpuSid);
+    public List<WmsGoodsTag> selByBillSidAndBillDetailsSidAndGoodsSpuSid(String billSid, String sid, String goodsSpuSid) {
+        return baseMapper.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid,sid,goodsSpuSid);
     }
 
     public String selectGoodsIDNum(String s) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java

@@ -23,7 +23,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")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryDto.java

@@ -43,6 +43,6 @@ public class WmsInventoryDto implements Dto {
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
 
-    private String goodSpuSid;
+    private String goodsSpuSid;
     private String goodsSkuSid;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -135,7 +135,7 @@
     <select id="listPageSales" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySalesVo">
         SELECT i.sid AS inventorySid,
         i.goodsID,
-        i.goodSpuSid,
+        i.goodsSpuSid,
         i.goodsSpuName,
         i.goodsSkuSid,
         i.goodsSkuTitle,
@@ -151,7 +151,7 @@
         </where>
     </select>
     <select id="getPackageGoodsVo" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryPackageVo">
-        SELECT v.goodSpuSid goodsSid,
+        SELECT v.goodsSpuSid goodsSid,
         v.goodsSpuName goodsName,
         v.goodsSkuCode goodsCode,
         v.unit,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySalesVo.java

@@ -16,7 +16,7 @@ public class WmsInventorySalesVo implements Vo {
 
     private String inventorySid;
     private String goodsID;
-    private String goodSpuSid;//商品基础信息sid
+    private String goodsSpuSid;//商品基础信息sid
     private String goodsSpuName;//商品名称
     private String goodsSkuSid;//商品Skusid
     private String goodsSkuTitle;//商品Sku名称

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySaveDto.java

@@ -19,7 +19,7 @@ public class WmsInventorySaveDto {
     @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）")
     private String goodsID;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetail.java

@@ -38,7 +38,7 @@ public class WmsInventoryBillDetail extends BaseEntity {
      private String operUserSid;//操作人*/
     private String billSid;//单据sid
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品库存sid")
     private String inventorySid;
     @ApiModelProperty("商品名称")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailInDto.java

@@ -13,9 +13,9 @@ import java.util.Date;
  **/
 @Data
 public class WmsInventoryBillDetailInDto {
-    
+
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailMapper.xml

@@ -33,7 +33,7 @@
 
     <select id="selectByBillSid"
             resultType="com.yxt.wms.biz.inventory.wmsinventorybilldetail.WmsInventoryBillDetailInDto">
-        select goodSpuSid,
+        select goodsSpuSid,
                goodsSpuName,
                goodsSkuSid,
                goodsSkuTitle,
@@ -64,7 +64,7 @@
 
     <select id="selectByBillSidOut"
             resultType="com.yxt.wms.biz.inventory.wmsinventorybilldetail.WmsInventoryBillDetailOutDto">
-        select goodSpuSid,
+        select goodsSpuSid,
                goodsSpuName,
                goodsSkuSid,
                goodsSkuTitle,
@@ -92,4 +92,4 @@
         from wms_inventory_bill_detail
         where billSid = #{sid}
     </select>
-</mapper>
+</mapper>

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("商品名称")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailService.java

@@ -124,7 +124,7 @@ public class WmsInventoryBillDetailService extends MybatisBaseService<WmsInvento
                     wmsInventoryDto.setBillSid(billSid);
                     wmsInventoryDto.setGoodsID(goodsId);
                     wmsInventoryDto.setGoodsSkuSid(v.getGoodsSkuSid());
-                    wmsInventoryDto.setGoodSpuSid(v.getGoodSpuSid());
+                    wmsInventoryDto.setGoodsSpuSid(v.getGoodsSpuSid());
                     wmsInventoryService.saveOrUpdate(wmsInventoryDto);
 
                 } else {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -324,7 +324,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
             WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto = new WmsInventoryCheckbillDetailDto();
             wmsInventoryCheckbillDetailDto.setBillSid(sid);
             wmsInventoryCheckbillDetailDto.setGoodsID(wmsInventory.getGoodsID());
-            wmsInventoryCheckbillDetailDto.setGoodsSpuSid(wmsInventory.getGoodSpuSid());
+            wmsInventoryCheckbillDetailDto.setGoodsSpuSid(wmsInventory.getGoodsSpuSid());
             wmsInventoryCheckbillDetailDto.setGoodsSpuName(wmsInventory.getGoodsSpuName());
             wmsInventoryCheckbillDetailDto.setGoodsSkuSid(wmsInventory.getGoodsSkuSid());
             wmsInventoryCheckbillDetailDto.setGoodsSkuTitle(wmsInventory.getGoodsSkuTitle());
@@ -909,4 +909,4 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public List<InventoryBillVo> selPkByDeptSid(String deptSid) {
         return baseMapper.selPkByDeptSid(deptSid);
     }
-}
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java

@@ -426,7 +426,7 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
                     List<WmsAnsBillDetailDto> 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<WmsInventory
     public List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid) {
         return wmsInventoryCheckbillDetailService.sourceBillBySid(sid);
     }
-}
+}

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")

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; // 库位编号
 
-}
+}

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")

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")

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")

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名称

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

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("图号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@@ -32,7 +32,7 @@
 
     <select id="getInventoryList" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillInventoryVo">
         select wi.goodsID,
-        wi.goodSpuSid,
+        wi.goodsSpuSid,
         wi.goodsSpuName,
         wi.goodsSkuTitle,
         wi.goodsSkuCode,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java

@@ -205,7 +205,7 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
                 wmsInventoryRecordDto.setBillNo(wmsOutBill.getBillNo());
                 wmsInventoryRecordDto.setBillType("0");
                 wmsInventoryRecordDto.setBatchNumber(wmsInventoryRecordDto.getBatchNumber());
-                wmsInventoryRecordDto.setGoodSpuSid(wmsInventoryRecordDto.getGoodSpuSid());
+                wmsInventoryRecordDto.setGoodsSpuSid(wmsInventoryRecordDto.getGoodsSpuSid());
                 wmsInventoryRecordDto.setGoodsSpuName(wmsInventoryRecordDto.getGoodsSpuName());
                 wmsInventoryRecordDto.setGoodsSkuSid(wmsInventoryRecordDto.getGoodsSkuSid());
                 wmsInventoryRecordDto.setGoodsSkuCode(wmsInventoryRecordDto.getGoodsSkuCode());

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbilldetail/WmsOutBillDetail.java

@@ -18,7 +18,7 @@ public class WmsOutBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbilldetail/WmsOutBillDetailDto.java

@@ -19,7 +19,7 @@ public class WmsOutBillDetailDto {
     private String inventorySid;
 
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbilldetail/WmsOutBillDetailMapper.xml

@@ -8,7 +8,7 @@
     </delete>
 
     <select id="selectDetailsList" resultType="com.yxt.wms.biz.inventory.wmsoutbilldetail.WmsOutBillDetailDto">
-        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}
     </select>
-</mapper>
+</mapper>

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}
     </select>
     <select id="selGoodsListCountBySpuSidAndSouceSid"
             resultType="com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail">
@@ -73,7 +73,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}
     </select>
     <select id="getUpShlefListBySid" resultType="com.yxt.wms.biz.inventory.wmsreceiptbilldetail.ShelfListVo">
         select wrb.sid as billSid,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -203,7 +203,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
 //                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
                 wmsReceiptBillDetailService.deleteByBillSid(sid);
                 for (WmsReceiptBillDetailDto2 detail : list) {
-                    String goodsSpuSid = detail.getGoodSpuSid();
+                    String goodsSpuSid = detail.getGoodsSpuSid();
                     String sourceBillSid = dto.getSourceBillSid();
                     String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
                     WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
@@ -276,7 +276,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                 wmsReceiptBillDetailService.deleteByBillSid(sid);
 //                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
                 for (WmsReceiptBillDetailDto2 detail : list) {
-                    String goodsSpuSid = detail.getGoodSpuSid();
+                    String goodsSpuSid = detail.getGoodsSpuSid();
                     String sourceBillSid = dto.getSourceBillSid();
                     String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
                     WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java

@@ -17,7 +17,7 @@ public class WmsReceiptBillDetail extends BaseEntity {
     @ApiModelProperty("单据sid")
     private String billSid;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java

@@ -17,8 +17,8 @@ public class WmsReceiptBillDetailDto2 {
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
-    @ApiModelProperty("商品goodSpuSid")
-    private String goodSpuSid;
+    @ApiModelProperty("商品goodsSpuSid")
+    private String goodsSpuSid;
     @ApiModelProperty("商品Sku名称")
     private String goodsSkuTitle;
     @ApiModelProperty("商品sku编码")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java

@@ -18,8 +18,8 @@ public class WmsReceiptBillDetailVo {
 
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
-    @ApiModelProperty("商品goodSpuSid")
-    private String goodSpuSid;
+    @ApiModelProperty("商品goodsSpuSid")
+    private String goodsSpuSid;
     @ApiModelProperty("商品Sku名称")
 //    private String goodsSkuTitle;
     private String goodsSpuName;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -358,7 +358,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 dto.setCreateBySid(wmsShelfBill.getCreateBySid());
                 dto.setBatchNumber(s.getBatchNumber());
                 dto.setGoodsID(getGoodsId(s.getGoodsSkuSid()));
-                dto.setGoodSpuSid(s.getGoodSpuSid());
+                dto.setGoodsSpuSid(s.getGoodsSpuSid());
                 dto.setGoodsSpuName(s.getGoodsSpuName());
                 dto.setGoodsSkuSid(s.getGoodsSkuSid());
                 dto.setGoodsSkuTitle(s.getGoodsSkuTitle());
@@ -385,7 +385,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 wmsInventoryRecordDto.setBillNo(wmsShelfBill.getSourceBillNo());
                 wmsInventoryRecordDto.setBillType("1");
                 wmsInventoryRecordDto.setBatchNumber(dto.getBatchNumber());
-                wmsInventoryRecordDto.setGoodSpuSid(dto.getGoodSpuSid());
+                wmsInventoryRecordDto.setGoodsSpuSid(dto.getGoodsSpuSid());
                 wmsInventoryRecordDto.setGoodsSpuName(dto.getGoodsSpuName());
                 wmsInventoryRecordDto.setGoodsSkuSid(dto.getGoodsSkuSid());
                 wmsInventoryRecordDto.setGoodsSkuCode(dto.getGoodsSkuCode());
@@ -956,8 +956,8 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         for (String sid : sids) {
             WmsReceiptBillDetail receiptBillDetail = wmsReceiptBillDetailService.fetchBySid(sid);
             String billSid = receiptBillDetail.getBillSid();
-            String goodSpuSid = receiptBillDetail.getGoodSpuSid();
-            List<WmsGoodsTag> wmsGoodsTags = wmsGoodsTagService.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid, sid, goodSpuSid);
+            String goodsSpuSid = receiptBillDetail.getGoodsSpuSid();
+            List<WmsGoodsTag> wmsGoodsTags = wmsGoodsTagService.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid, sid, goodsSpuSid);
             String goodsSkuCode = receiptBillDetail.getGoodsSkuCode();
             String rule = goodsSkuCode + format;
             if (!wmsGoodsTags.isEmpty() && wmsGoodsTags.size() > 0) {
@@ -976,7 +976,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 }
             } else {
                 //查询该商品是否为一物一码
-                String isGoodsID = baseGoodsSpuFeign.selIsGoodsID(goodSpuSid).getData();
+                String isGoodsID = baseGoodsSpuFeign.selIsGoodsID(goodsSpuSid).getData();
                 BigDecimal actualInCount = receiptBillDetail.getActualInCount();
                 int actualInCountInt = actualInCount.intValue();
                 if (actualInCountInt > 1) {
@@ -1115,7 +1115,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                         int actualInCountInt = actualInCount.intValue();
                         if (actualInCountInt > 1) {
                             //查询该商品是否为一物一码
-                            String isGoodsID = baseGoodsSpuFeign.selIsGoodsID(receiptBillDetail.getGoodSpuSid()).getData();
+                            String isGoodsID = baseGoodsSpuFeign.selIsGoodsID(receiptBillDetail.getGoodsSpuSid()).getData();
                             if (isGoodsID.equals("0")) {
                                 wmsGoodsTag.setGoodsCount(receiptBillDetail.getActualInCount());
                             } else {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java

@@ -18,7 +18,7 @@ public class ShelfInitListVo {
     @ApiModelProperty("批次号")
     private String batchNumber;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java

@@ -20,7 +20,7 @@ public class WmsShelfBillDetail extends BaseEntity {
     @ApiModelProperty("批次号")
     private String batchNumber;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java

@@ -18,7 +18,7 @@ public class WmsShelfBillDetailDto {
     @ApiModelProperty("批次号")
     private String batchNumber;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml

@@ -19,7 +19,7 @@
     </select>
 
     <select id="selectByBillSid" resultType="com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailVos">
-        select wrbd.goodSpuSid,
+        select wrbd.goodsSpuSid,
                wrbd.goodsSpuName,
                wrbd.goodsSkuSid,
                wrbd.goodsSkuTitle,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailVos.java

@@ -14,7 +14,7 @@ public class WmsShelfBillDetailVos {
     private String detailsSid;
 
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")