采购单选择商品、新增商品明细调整

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java

@@ -54,6 +54,9 @@ public class PurchaseBillDetailsVo implements Vo {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
     @ApiModelProperty("制单人sid")
     private String createBySid;
     @ApiModelProperty("制单人姓名")
@@ -107,8 +110,6 @@ public class PurchaseBillDetailsVo implements Vo {
     private PurchaseBillExtendDetailsVo purchaseBillExtend;
     @ApiModelProperty("采购单商品明细")
     private List<PurchaseBillDetailDetailsVo> purchaseBillDetailList;
-    @ApiModelProperty("采购商品扩展")
-    private List<PurchaseBillBatchDetailsVo> purchaseBillBatchList;
     @ApiModelProperty("附件")
     private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
 }

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java

@@ -103,8 +103,6 @@ public class PurchaseBillDto implements Dto {
     private PurchaseBillExtendDto purchaseBillExtend;
     @ApiModelProperty("采购单商品明细")
     private List<PurchaseBillDetailDto> purchaseBillDetailList;
-    @ApiModelProperty("采购商品扩展")
-    private List<PurchaseBillBatchDto> purchaseBillBatchList;
     @ApiModelProperty("附件")
     private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
 }

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java

@@ -283,14 +283,18 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         PurchaseBillExtendDetailsVo purchaseBillExtendDetailsVo = purchaseBillExtendService.selByMainSid(sid);
         vo.setPurchaseBillExtend(purchaseBillExtendDetailsVo);
         List<PurchaseBillDetailDetailsVo> purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid);
+        List<PurchaseBillBatchDetailsVo> purchaseBillBatchDetailsVos = purchaseBillBatchService.selByMainSid(sid);
         for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) {
             String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl();
             goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl;
             purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl);
+            for (PurchaseBillBatchDetailsVo purchaseBillBatchDetailsVo : purchaseBillBatchDetailsVos) {
+                purchaseBillDetailDetailsVo.setBatchNumber(purchaseBillBatchDetailsVo.getBatchNumber());
+                purchaseBillDetailDetailsVo.setExpireDate(purchaseBillBatchDetailsVo.getExpireDate());
+                purchaseBillDetailDetailsVo.setMadeDate(purchaseBillBatchDetailsVo.getMadeDate());
+            }
         }
         vo.setPurchaseBillDetailList(purchaseBillDetailDetailsVos);
-        List<PurchaseBillBatchDetailsVo> purchaseBillBatchDetailsVos = purchaseBillBatchService.selByMainSid(sid);
-        vo.setPurchaseBillBatchList(purchaseBillBatchDetailsVos);
         List<PurchaseAppendixDetailsVo> purchaseAppendixDetailsVos = purchaseAppendixService.selByLinkSid(sid);
         List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>();
         for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) {
@@ -309,6 +313,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         for (String sid : sids) {
             purchaseBillAmountService.delByMainSid(sid);
             purchaseBillExtendService.delByMainSid(sid);
+            purchaseBillBatchService.delByMainSid(sid);
             purchaseBillDetailService.delByMainSid(sid);
         }
         return rb.success();

src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@@ -60,56 +60,44 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     private String goodsNum; // 货号
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("商品图片")
+    private String goodsImgUrl;
     @ApiModelProperty("计量单位")
     private String unit; // 计量单位
     @ApiModelProperty("单价")
     private BigDecimal cost; // 单价
     @ApiModelProperty("数量")
     private BigDecimal count;
-    @ApiModelProperty("数量1")
+    @ApiModelProperty("数量(pcs)")
-    private BigDecimal count1;
+    private BigDecimal pcsCount;
-    @ApiModelProperty("已入库数量")
+    @ApiModelProperty("吊牌价")
-    private BigDecimal inCount;
+    private BigDecimal tagPrice;
-    @ApiModelProperty("已发货数量")
-    private BigDecimal outCount;
-    @ApiModelProperty("已入库数量1")
-    private BigDecimal inCount1;
-    @ApiModelProperty("待入库数量")
-    private BigDecimal notInCount;
-    @ApiModelProperty("待入库数量1")
-    private BigDecimal notInCount1;
     @ApiModelProperty("折扣率")
     private BigDecimal discountRate; // 折扣率
     @ApiModelProperty("折后单价")
     private BigDecimal discountPrice; // 折后单价
     @ApiModelProperty("分摊金额")
     private BigDecimal shareAmount; // 分摊金额
-    @ApiModelProperty("总价")
-    private BigDecimal costTotal;
     @ApiModelProperty("分配比例")
-    private BigDecimal shareRate; // 分配比例
+    private BigDecimal shareRate;
     @ApiModelProperty("采购金额")
-    private BigDecimal amount; // 采购金额
+    private BigDecimal amount;
-    @ApiModelProperty("采购周期")
-    private Integer cycle; // 采购周期
-    @ApiModelProperty("预期到货日期")
-    private String deliveryDate;
-
-    @ApiModelProperty("总税额")
-    private BigDecimal taxAmount;
-    @ApiModelProperty("商品图片")
-    private String goodsImgUrl;
-    @ApiModelProperty("数量(pcs)")
-    private BigDecimal pcsCount;
-    @ApiModelProperty("吊牌价")
-    private BigDecimal tagPrice;
     @ApiModelProperty("税率")
     private BigDecimal taxRate;
     @ApiModelProperty("未含税价")
     private BigDecimal unTaxPrice;
     @ApiModelProperty("未含税总价（未含税价*采购数量）")
     private BigDecimal unTaxTotalAmount;
+    @ApiModelProperty("采购周期")
+    private Integer cycle;
+    @ApiModelProperty("预期到货日期")
+    private String deliveryDate;
+    @ApiModelProperty("总税额")
+    private BigDecimal taxAmount;
 
+    /*
+    * 商品扩展字段
+    * */
     @ApiModelProperty("批次号")
     private String batchNumber; // 批次号
     @ApiModelProperty("生产日期")

src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java

@@ -39,82 +39,70 @@ import java.util.Date;
 @ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
 public class PurchaseBillDetailDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("单据sid")
-    private String billSid; // 单据sid
+    private String billSid;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodsSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
-    private String goodsSpuName; // 商品名称
+    private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid; // 商品Skusid
+    private String goodsSkuSid;
     @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle; // 商品Sku名称
+    private String goodsSkuTitle;
     @ApiModelProperty("商品编码")
-    private String goodsSkuCode; // 商品编码
+    private String goodsSkuCode;
     @ApiModelProperty("商品条码")
-    private String goodsSN; // 商品条码
+    private String goodsSN;
     @ApiModelProperty("货号")
-    private String goodsNum; // 货号
+    private String goodsNum;
     @ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec; // 规格型号
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("商品图片")
+    private String goodsImgUrl;
     @ApiModelProperty("计量单位")
-    private String unit; // 计量单位
+    private String unit;
     @ApiModelProperty("单价")
-    private BigDecimal cost; // 单价
+    private BigDecimal cost;
     @ApiModelProperty("数量")
     private BigDecimal count;
-    @ApiModelProperty("数量1")
+    @ApiModelProperty("数量(pcs)")
-    private BigDecimal count1;
+    private BigDecimal pcsCount;
-    @ApiModelProperty("已入库数量")
+    @ApiModelProperty("吊牌价")
-    private BigDecimal inCount;
+    private BigDecimal tagPrice;
-    @ApiModelProperty("已发货数量")
-    private BigDecimal outCount;
-    @ApiModelProperty("已入库数量1")
-    private BigDecimal inCount1;
-    @ApiModelProperty("待入库数量")
-    private BigDecimal notInCount;
-    @ApiModelProperty("待入库数量1")
-    private BigDecimal notInCount1;
     @ApiModelProperty("折扣率")
-    private BigDecimal discountRate; // 折扣率
+    private BigDecimal discountRate;
     @ApiModelProperty("折后单价")
-    private BigDecimal discountPrice; // 折后单价
+    private BigDecimal discountPrice;
     @ApiModelProperty("分摊金额")
-    private BigDecimal shareAmount; // 分摊金额
+    private BigDecimal shareAmount;
-    @ApiModelProperty("总价")
-    private BigDecimal costTotal;
     @ApiModelProperty("分配比例")
-    private BigDecimal shareRate; // 分配比例
+    private BigDecimal shareRate;
     @ApiModelProperty("采购金额")
-    private BigDecimal amount; // 采购金额
+    private BigDecimal amount;
-    @ApiModelProperty("采购周期")
-    private Integer cycle; // 采购周期
-    @ApiModelProperty("预期到货日期")
-    private String deliveryDate;
-
-    @ApiModelProperty("总税额")
-    private BigDecimal taxAmount;
-    @ApiModelProperty("商品图片")
-    private String goodsImgUrl;
-    @ApiModelProperty("数量(pcs)")
-    private BigDecimal pcsCount;
-    @ApiModelProperty("吊牌价")
-    private BigDecimal tagPrice;
     @ApiModelProperty("税率")
     private BigDecimal taxRate;
     @ApiModelProperty("未含税价")
     private BigDecimal unTaxPrice;
     @ApiModelProperty("未含税总价（未含税价*采购数量）")
     private BigDecimal unTaxTotalAmount;
+    @ApiModelProperty("采购周期")
+    private Integer cycle;
+    @ApiModelProperty("预期到货日期")
+    private String deliveryDate;
+    @ApiModelProperty("总税额")
+    private BigDecimal taxAmount;
 
+    /*
+     * 商品扩展字段
+     * */
     @ApiModelProperty("批次号")
-    private String batchNumber; // 批次号
+    private String batchNumber;
     @ApiModelProperty("生产日期")
-    private String madeDate; // 生产日期
+    private String madeDate;
     @ApiModelProperty("过期日期")
-    private String expireDate; // 过期日期
+    private String expireDate;
 }