Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationByHandOver.vue

@@ -182,6 +182,7 @@ export default {
         recipient: '',
         transferRemarks: ''
       }
+      this.submitdisabled = false
       this.$emit('doback')
     }
   }

doc/databases/yxt-as.sql

@@ -81,25 +81,32 @@ CREATE TABLE `as_busrepair_inventorybill_detail`
     `createBySid`       varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`       varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `billSid`           varchar(64)          DEFAULT NULL COMMENT '单据sid',
+    `sitemSid`          varchar(64)          DEFAULT NULL COMMENT '工单服务项目记录sid',
     `inventorySid`      varchar(64)          DEFAULT NULL COMMENT '商品库存sid',
-    `goodsSid`      varchar(64)          DEFAULT NULL COMMENT '商品sid',
+    `goodsID`           varchar(64)          DEFAULT NULL COMMENT '商品ID',
-    `goodsName`     varchar(64)          DEFAULT NULL COMMENT '商品名称',
+    `goodSpuSid`        varchar(64)          DEFAULT NULL COMMENT '商品基础信息Sid',
-    `goodsCode`     varchar(64)          DEFAULT NULL COMMENT '商品编码（图号）',
+    `goodsSpuName`      varchar(64)          DEFAULT NULL COMMENT '商品名称',
-    `specification` varchar(64)          DEFAULT NULL COMMENT '规格',
+    `goodsSkuSid`       varchar(64)          DEFAULT NULL COMMENT '商品Skusid',
-    `goodsModel`    varchar(64)          DEFAULT NULL COMMENT '型号',
+    `goodsSkuTitle`     varchar(64)          DEFAULT NULL COMMENT '商品Sku名称',
-    `currentCount`  decimal(10,0)              DEFAULT NULL COMMENT '出库前的库存量',
+    `goodsSkuCode`      varchar(64)          DEFAULT NULL COMMENT '商品编码（图号）',
+    `goodsSkuOwnSpec`   varchar(64)          DEFAULT NULL COMMENT '规格型号',
+    `currentCount`      decimal(10, 0)       DEFAULT NULL COMMENT '出库前的库存量',
     `unit`              varchar(64)          DEFAULT NULL COMMENT '计量单位',
     `warehouseSid`      varchar(64)          DEFAULT NULL COMMENT '仓库sid',
     `warehouseName`     varchar(64)          DEFAULT NULL COMMENT '仓库名称',
-    `warehouseArea` varchar(64)          DEFAULT NULL COMMENT '货位',
+    `warehouseRackSid`  varchar(64)          DEFAULT NULL COMMENT '库位Sid',
-    `needCount`     decimal(10,0)              DEFAULT NULL COMMENT '需求数量（维修工单中）',
+    `warehouseRackCode` varchar(64)          DEFAULT NULL COMMENT '库位编号',
-    `outboundCount` decimal(10,0)              DEFAULT NULL COMMENT '已出库数量（维修工单中，计算）',
+    `needCount`         decimal(10, 0)       DEFAULT NULL COMMENT '需求数量（维修工单中）',
-    `count`         decimal(10,0)              DEFAULT NULL COMMENT '出/退库数量',
+    `count`             decimal(10, 0)       DEFAULT NULL COMMENT '出/退库数量',
     `price`             decimal(10, 2)       DEFAULT NULL COMMENT '销售价（元）',
+    `discountAmount`    decimal(10, 2)       DEFAULT NULL COMMENT '优惠金额（=销售价*(1-折扣*0.1））',
+    `amount`            decimal(10, 2)       DEFAULT NULL COMMENT '金额（销售价-优惠金额）',
+    `discount`          int(32)              DEFAULT NULL COMMENT '折扣（0-10，0免费，10不打折）',
     `subjectSid`        varchar(64)          DEFAULT NULL COMMENT '科目sid',
     `subject`           varchar(64)          DEFAULT NULL COMMENT '科目',
     `operUserSid`       varchar(64)          DEFAULT NULL COMMENT '领料人sid',
     `operName`          varchar(64)          DEFAULT NULL COMMENT '领料人姓名',
+    `oldIsReclaim`      int(32)              DEFAULT NULL COMMENT '旧件是否收回登记（0未收回登记，1已收回登记）',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@@ -16,18 +16,34 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private static final long serialVersionUID = 7134535185685249599L;
     @ApiModelProperty("单据sid")
     private String billSid;
+    //工单服务项目记录sid
+    private String sitemSid;
     @ApiModelProperty("商品库存sid")
     private String inventorySid;
-    @ApiModelProperty("商品sid")
+    //商品ID
+    private String goodsID;
+    //商品基础信息sid
+    private String goodSpuSid;
+    //商品名称
+    private String goodsSpuName;
+    //商品Skusid
+    private String goodsSkuSid;
+    //商品Sku名称
+    private String goodsSkuTitle;
+    //商品编码（图号）
+    private String goodsSkuCode;
+    //规格型号
+    private String goodsSkuOwnSpec;
+    /* @ApiModelProperty("商品sid")
      private String goodsSid;
      @ApiModelProperty("商品名称")
-    private String goodsName;
+     private String goodsName;*/
-    @ApiModelProperty("商品编码")
+   /* @ApiModelProperty("商品编码")
     private String goodsCode;
     @ApiModelProperty("规格")
     private String specification;
     @ApiModelProperty("型号")
-    private String goodsModel;
+    private String goodsModel;*/
     @ApiModelProperty("出库前的库存量")
     private BigDecimal currentCount;
     @ApiModelProperty("计量单位")
@@ -36,16 +52,30 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
-    @ApiModelProperty("货位")
+    //库位Sid
-    private String warehouseArea;
+    private String warehouseRackSid;
-    @ApiModelProperty("需求数量")
+    //库位编号
+    private String warehouseRackCode;
+
+
+    /* @ApiModelProperty("货位")
+     private String warehouseArea;*/
+    @ApiModelProperty("需求数量（维修工单中）")
     private BigDecimal needCount;
-    @ApiModelProperty("已出库数量")
+    /* @ApiModelProperty("已出库数量")
-    private BigDecimal outboundCount;
+     private BigDecimal outboundCount;*/
     @ApiModelProperty("出/退库数量")
     private BigDecimal count;
     @ApiModelProperty("销售价（元）")
     private BigDecimal price;
+    //折扣（0-10，0免费，10不打折）
+    private Integer discount;
+    //优惠金额（=销售价*(1-折扣*0.1））
+    private BigDecimal discountAmount;
+    //金额（销售价-优惠金额）
+    private BigDecimal amount;
+
+
     @ApiModelProperty("科目sid")
     private String subjectSid;
     @ApiModelProperty("科目")
@@ -54,4 +84,7 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private String operUserSid;
     @ApiModelProperty("领料人姓名")
     private String operName;
+
+    //旧件是否收回登记（0未收回登记，1已收回登记）
+    private Integer oldIsReclaim;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,7 +16,22 @@ public class AsBusrepairInventorybillDetailDto {
 
     @ApiModelProperty("商品库存sid")
     private String inventorySid;
-    @ApiModelProperty("商品sid")
+    //商品ID
+    @JsonProperty("goodsID")
+    private String goodsID;
+    //商品基础信息sid
+    private String goodSpuSid;
+    //商品名称
+    private String goodsSpuName;
+    //商品Skusid
+    private String goodsSkuSid;
+    //商品Sku名称
+    private String goodsSkuTitle;
+    //商品编码（图号）
+    private String goodsSkuCode;
+    //规格型号
+    private String goodsSkuOwnSpec;
+    /*  @ApiModelProperty("商品sid")
       private String goodsSid;
       @ApiModelProperty("商品名称")
       private String goodsName;
@@ -24,7 +40,7 @@ public class AsBusrepairInventorybillDetailDto {
       @ApiModelProperty("规格")
       private String specification;
       @ApiModelProperty("型号")
-    private String goodsModel;
+      private String goodsModel;*/
     @ApiModelProperty("出库前的库存量")
     private BigDecimal currentCount;
     @ApiModelProperty("计量单位")
@@ -33,16 +49,26 @@ public class AsBusrepairInventorybillDetailDto {
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
-    @ApiModelProperty("货位")
+    //库位Sid
-    private String warehouseArea;
+    private String warehouseRackSid;
+    //库位编号
+    private String warehouseRackCode;
+    /*@ApiModelProperty("货位")
+    private String warehouseArea;*/
     @ApiModelProperty("需求数量")
-    private BigDecimal needCount;
+    private String needCount;
-    @ApiModelProperty("已出库数量")
+    /* @ApiModelProperty("已出库数量")
-    private BigDecimal outboundCount;
+     private BigDecimal outboundCount;*/
     @ApiModelProperty("出/退库数量")
-    private BigDecimal count;
+    private String count;
     @ApiModelProperty("销售价（元）")
-    private BigDecimal price;
+    private String price;
+    //折扣（0-10，0免费，10不打折）
+    private Integer discount;
+    //优惠金额（=销售价*(1-折扣*0.1））
+    private BigDecimal discountAmount;
+    //金额（销售价-优惠金额）
+    private BigDecimal amount;
     @ApiModelProperty("科目sid")
     private String subjectSid;
     @ApiModelProperty("科目")