oms采购单调整

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl;
 import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDetailsVo;
+import com.yxt.oms.biz.func.purchasebillbatch.PurchaseBillBatchDetailsVo;
 import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo;
 import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDetailsVo;
 import io.swagger.annotations.ApiModel;
@@ -101,6 +102,8 @@ public class PurchaseBillDetailsVo implements Vo {
     private PurchaseBillExtendDetailsVo purchaseBillExtend;
     @ApiModelProperty("采购单商品明细")
     private List<PurchaseBillDetailDetailsVo> purchaseBillDetailList;
+    @ApiModelProperty("采购商品扩展")
+    private List<PurchaseBillBatchDetailsVo> purchaseBillBatchList;
     @ApiModelProperty("附件")
     private List<PurchaseAppendixUrl> purchaseAppendixList;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl;
 import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDto;
+import com.yxt.oms.biz.func.purchasebillbatch.PurchaseBillBatchDto;
 import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto;
 import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDto;
 import io.swagger.annotations.ApiModel;
@@ -103,6 +104,8 @@ public class PurchaseBillDto implements Dto {
     private PurchaseBillExtendDto purchaseBillExtend;
     @ApiModelProperty("采购单商品明细")
     private List<PurchaseBillDetailDto> purchaseBillDetailList;
+    @ApiModelProperty("采购商品扩展")
+    private List<PurchaseBillBatchDto> purchaseBillBatchList;
     @ApiModelProperty("附件")
     private List<PurchaseAppendixUrl> purchaseAppendixList;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDetailsVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillbatch;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchVo.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatchVo <br/>
+ * Description: 采购单商品-批次 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单商品-批次 视图数据详情", description = "采购单商品-批次 视图数据详情")
+public class PurchaseBillBatchDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+	@ApiModelProperty("采购单商品明细sid")
+    private String billDetailSid; // 采购单商品明细sid
+	@ApiModelProperty("序列号")
+    private String sortNo; // 序列号
+	@ApiModelProperty("批次号")
+    private String batchNumber; // 批次号
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("生产日期")
+    private Date madeDate; // 生产日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("过期日期")
+    private Date expireDate; // 过期日期
+	@ApiModelProperty("货号")
+    private String goodsNum; // 货号
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDto.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillbatch;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchDto.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatchDto <br/>
+ * Description: 采购单商品-批次 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单商品-批次 数据传输对象", description = "采购单商品-批次 数据传输对象")
+public class PurchaseBillBatchDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+	@ApiModelProperty("采购单商品明细sid")
+    private String billDetailSid; // 采购单商品明细sid
+	@ApiModelProperty("序列号")
+    private String sortNo; // 序列号
+	@ApiModelProperty("批次号")
+    private String batchNumber; // 批次号
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("生产日期")
+    private Date madeDate; // 生产日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("过期日期")
+    private Date expireDate; // 过期日期
+	@ApiModelProperty("货号")
+    private String goodsNum; // 货号
+
+}