oms采购单调整

src/main/java/com/yxt/purchase/apiadmin/PurchaseBillBatchRest.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.apiadmin;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.purchase.biz.purchasebillbatch.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchFeignFallback.java <br/>
+ * Class: com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchRest <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
+ */
+@Api(tags = "采购单商品-批次")
+@RestController
+@RequestMapping("/apiadmin/purchasebillbatch")
+public class PurchaseBillBatchRest {
+
+	@Autowired
+	private PurchaseBillBatchService purchaseBillBatchService;
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		purchaseBillBatchService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PurchaseBillBatchDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		PurchaseBillBatchDetailsVo vo = purchaseBillBatchService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.apiadmin;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.purchase.biz.purchaseflownode.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeFeignFallback.java <br/>
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeRest <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
+ */
+@Api(tags = "工单-环节")
+@RestController
+@RequestMapping("/apiadmin/purchaseflownode")
+public class PurchaseFlowNodeRest {
+
+	@Autowired
+	private PurchaseFlowNodeService purchaseFlowNodeService;
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		purchaseFlowNodeService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PurchaseFlowNodeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		PurchaseFlowNodeDetailsVo vo = purchaseFlowNodeService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml

@@ -16,19 +16,22 @@
 		pba.freight,
 		pba.otherAmount,
 		pba.prepayment,
+		SUM(pbd.taxAmount) AS taxAmount,
 		pbe.logisticsNum,
 		pbe.productProgress,
+		SUM(pbd.unTaxTotalAmount) AS unTaxTotalAmount,
 		SUM(pbd.count) AS countTotal,
+		pbe.deliveryCount,
 		pbe.deliveryStateValue,
-		pb.`remarks`
+		pb.`remarks`,
+		pb.`createByName`,
+		pb.`modifyTime`
 		FROM
 		purchase_bill pb
 		LEFT JOIN purchase_bill_detail pbd
 		ON pbd.`billSid` = pb.`sid`
 		LEFT JOIN purchase_bill_extend pbe
 		ON pbe.billSid = pb.`sid`
-		LEFT JOIN purchase_bill_detail pbd
-		ON pbd.`billSid` = pb.`sid`
 		LEFT JOIN purchase_bill_amount pba
 		ON pba.`billSid` = pb.`sid`
 		<where> ${ew.sqlSegment} </where>

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

@@ -34,26 +34,28 @@ import lombok.Data;
 @ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
 public class PurchaseBillQuery implements Query {
 
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
-    @ApiModelProperty("仓库名称")
-    private String wareHouseName;
-    @ApiModelProperty("收货状态key")
-    private String receiveStateKey;
-    @ApiModelProperty("物流单号")
-    private String logisticsNum;
-    @ApiModelProperty("发货状态key")
-    private String deliveryStateKey;
-    @ApiModelProperty("单据编号")
-    private String billNo;
-    @ApiModelProperty("采购员姓名")
-    private String purchaserName;
-    @ApiModelProperty("备注")
-    private String remarks;
     @ApiModelProperty("创建开始日期")
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
+    @ApiModelProperty("供应商名称")
+    private String supplierSid;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseSid;
+    @ApiModelProperty("收货状态key")
+    private String receiveStateKey;
+    @ApiModelProperty("物流单号")
+    private String logisticsNum;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("采购员")
+    private String purchaserSid;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey;
+    @ApiModelProperty("商品sid")
+    private String goodsSid;
 
     private String orgLevelKey;
     @ApiModelProperty("菜单路由")

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

@@ -67,11 +67,11 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
     public PagerVo<PurchaseBillVo> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
         PurchaseBillQuery query = pq.getParams();
         QueryWrapper<PurchaseBill> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getSupplierName())) {
+        if (StringUtils.isNotBlank(query.getSupplierSid())) {
-            qw.like("pb.supplierName", query.getSupplierName());
+            qw.eq("pb.supplierSid", query.getSupplierSid());
         }
-        if (StringUtils.isNotBlank(query.getWareHouseName())) {
+        if (StringUtils.isNotBlank(query.getWareHouseSid())) {
-            qw.like("pb.wareHouseName", query.getWareHouseName());
+            qw.eq("pb.wareHouseSid", query.getWareHouseSid());
         }
         if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
             qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
@@ -85,12 +85,15 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("pb.billNo", query.getBillNo());
         }
-        if (StringUtils.isNotBlank(query.getPurchaserName())) {
+        if (StringUtils.isNotBlank(query.getPurchaserSid())) {
-            qw.like("pb.purchaserName", query.getPurchaserName());
+            qw.like("pb.purchaserSid", query.getPurchaserSid());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
             qw.like("pb.remarks", query.getRemarks());
         }
+        if (StringUtils.isNotBlank(query.getGoodsSid())) {
+            qw.like("pbd.goodsSkuSid", query.getGoodsSid());
+        }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").

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

@@ -61,16 +61,29 @@ public class PurchaseBillVo implements Vo {
     private BigDecimal otherAmount;
     @ApiModelProperty("预付金额")
     private BigDecimal prepayment;
+    @ApiModelProperty("总税额")
+    private BigDecimal taxAmount;
     @ApiModelProperty("物流单号")
     private String logisticsNum;
     @ApiModelProperty("生产进度")
     private String productProgress;
+    @ApiModelProperty("未含税总价（未含税价*采购数量）")
+    private BigDecimal unTaxTotalAmount;
     @ApiModelProperty("总采购数量")
     private String countTotal;
+    @ApiModelProperty("已入库数量")
+    private BigDecimal enterWareCount;
+    @ApiModelProperty("已入库金额")
+    private BigDecimal enterWareAmount;
+    @ApiModelProperty("已发货数量")
+    private BigDecimal deliveryCount;
     @ApiModelProperty("发货状态value")
     private Integer deliveryStateValue;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("制单人姓名")
     private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("最后修改时间")
+    private Date modifyTime;
 }

src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java

@@ -63,10 +63,6 @@ public class PurchaseBillAmount extends BaseEntity {
     private String otherShareTypeKey; // 其他费用分摊方式Key
 	@ApiModelProperty("其他费用分摊方式Value")
     private String otherShareTypeValue; // 其他费用分摊方式Value
-	@ApiModelProperty("结算账户key")
-    private String settleAccountKey;
-    @ApiModelProperty("结算账户value")
-    private String settleAccountValue;
     @ApiModelProperty("币种")
     private String currencyKey;
     @ApiModelProperty("币种")
@@ -82,4 +78,13 @@ public class PurchaseBillAmount extends BaseEntity {
     private String bankAccountName; // 收款账户
 	@ApiModelProperty("收款银行账号")
     private String bankAccount; // 收款银行账号
+
+    @ApiModelProperty("付款账号（银行账号）")
+    private String payBankAccount;
+    @ApiModelProperty("结算账户key")
+    private String settleAccountKey;
+    @ApiModelProperty("结算账户value")
+    private String settleAccountValue;
+    @ApiModelProperty("本次付款")
+    private BigDecimal thisPayAmount;
 }

src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java

@@ -75,10 +75,6 @@ public class PurchaseBillAmountDetailsVo implements Vo {
     private String otherShareTypeKey; // 其他费用分摊方式Key
 	@ApiModelProperty("其他费用分摊方式Value")
     private String otherShareTypeValue; // 其他费用分摊方式Value
-    @ApiModelProperty("结算账户key")
-    private String settleAccountKey;
-    @ApiModelProperty("结算账户value")
-    private String settleAccountValue;
     @ApiModelProperty("币种")
     private String currencyKey;
     @ApiModelProperty("币种")
@@ -95,4 +91,13 @@ public class PurchaseBillAmountDetailsVo implements Vo {
     private String bankAccountName; // 收款账户
 	@ApiModelProperty("收款银行账号")
     private String bankAccount; // 收款银行账号
+
+    @ApiModelProperty("付款账号（银行账号）")
+    private String payBankAccount;
+    @ApiModelProperty("结算账户key")
+    private String settleAccountKey;
+    @ApiModelProperty("结算账户value")
+    private String settleAccountValue;
+    @ApiModelProperty("本次付款")
+    private BigDecimal thisPayAmount;
 }

src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java

@@ -75,10 +75,6 @@ public class PurchaseBillAmountDto implements Dto {
     private String otherShareTypeKey; // 其他费用分摊方式Key
 	@ApiModelProperty("其他费用分摊方式Value")
     private String otherShareTypeValue; // 其他费用分摊方式Value
-    @ApiModelProperty("结算账户key")
-    private String settleAccountKey;
-    @ApiModelProperty("结算账户value")
-    private String settleAccountValue;
     @ApiModelProperty("币种")
     private String currencyKey;
     @ApiModelProperty("币种")
@@ -95,4 +91,13 @@ public class PurchaseBillAmountDto implements Dto {
     private String bankAccountName; // 收款账户
 	@ApiModelProperty("收款银行账号")
     private String bankAccount; // 收款银行账号
+
+    @ApiModelProperty("付款账号（银行账号）")
+    private String payBankAccount;
+    @ApiModelProperty("结算账户key")
+    private String settleAccountKey;
+    @ApiModelProperty("结算账户value")
+    private String settleAccountValue;
+    @ApiModelProperty("本次付款")
+    private BigDecimal thisPayAmount;
 }

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatch.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchasebillbatch;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatch.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatch <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 = "采购单商品-批次")
+@TableName("purchase_bill_batch")
+public class PurchaseBillBatch extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("生产日期")
+    private Date madeDate; // 生产日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("过期日期")
+    private Date expireDate; // 过期日期
+	@ApiModelProperty("货号")
+    private String goodsNum; // 货号
+
+}

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchasebillbatch;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("生产日期")
+    private Date madeDateStart; // 生产日期
+    private Date madeDateEnd; // 生产日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("过期日期")
+    private Date expireDateStart; // 过期日期
+    private Date expireDateEnd; // 过期日期
+	@ApiModelProperty("货号")
+    private String goodsNum; // 货号
+
+}

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDto.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchasebillbatch;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("生产日期")
+    private Date madeDateStart; // 生产日期
+    private Date madeDateEnd; // 生产日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("过期日期")
+    private Date expireDateStart; // 过期日期
+    private Date expireDateEnd; // 过期日期
+	@ApiModelProperty("货号")
+    private String goodsNum; // 货号
+
+}

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchMapper.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchasebillbatch;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchMapper.java <br/>
+ * Class: com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchMapper <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
+ */
+@Mapper
+public interface PurchaseBillBatchMapper extends BaseMapper<PurchaseBillBatch> {
+
+}

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchQuery.java

@@ -23,47 +23,51 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.purchase.biz.purchasebillextend;
+package com.yxt.purchase.biz.purchasebillbatch;
+
+
+import com.yxt.common.core.query.Query;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.query.Query;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+/**
-
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchQuery.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatchQuery <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 = "采购单扩展 查询条件")
+@ApiModel(value = "采购单商品-批次 查询条件", description = "采购单商品-批次 查询条件")
-public class PurchaseBillExtendQuery implements Query {
+public class PurchaseBillBatchQuery implements Query {
 
-	@ApiModelProperty("制单人姓名")
-    private String createByName; // 制单人姓名
 	@ApiModelProperty("采购单sid")
-    private String purchaseBillSid; // 采购单sid
+    private String billSid; // 采购单sid
-	@ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）")
+	@ApiModelProperty("采购单商品明细sid")
-    private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率）
+    private String billDetailSid; // 采购单商品明细sid
-	@ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）")
+	@ApiModelProperty("序列号")
-    private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
+    private String sortNo; // 序列号
-	@ApiModelProperty("临时加价率")
+	@ApiModelProperty("批次号")
-    private Integer tempMarkupRate; // 临时加价率
+    private String batchNumber; // 批次号
-	@ApiModelProperty("发货人姓名")
-    private String shipperName; // 发货人姓名
-	@ApiModelProperty("发货人手机")
-    private String shipperMob; // 发货人手机
-	@ApiModelProperty("发货省市区sid")
-    private String deliveryAreaSid; // 发货省市区sid
-	@ApiModelProperty("发货详细地址")
-    private String deliveryAddress; // 发货详细地址
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("到货日期")
+	@ApiModelProperty("生产日期")
-    private Date arrivalDateStart; // 到货日期
+    private Date madeDateStart; // 生产日期
-    private Date arrivalDateEnd; // 到货日期
+    private Date madeDateEnd; // 生产日期
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("付款期限")
+	@ApiModelProperty("过期日期")
-    private Date paymentTermStart; // 付款期限
+    private Date expireDateStart; // 过期日期
-    private Date paymentTermEnd; // 付款期限
+    private Date expireDateEnd; // 过期日期
-	@ApiModelProperty("仓库sid")
+	@ApiModelProperty("货号")
-    private String wareHouseSid; // 仓库sid
+    private String goodsNum; // 货号
 
 }

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchService.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchasebillbatch;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseBillBatchService.java <br/>
+ * Class: com.yxt.purchase.biz.purchasebillbatch.PurchaseBillBatchService <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
+ */
+@Service
+public class PurchaseBillBatchService extends MybatisBaseService<PurchaseBillBatchMapper, PurchaseBillBatch> {
+	
+	public void insertByDto(PurchaseBillBatchDto dto){
+		PurchaseBillBatch entity = new PurchaseBillBatch();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public PurchaseBillBatchDetailsVo fetchDetailsVoBySid(String sid){
+		PurchaseBillBatch entity = fetchBySid(sid);
+		PurchaseBillBatchDetailsVo vo = new PurchaseBillBatchDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchVo.java

@@ -23,49 +23,53 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.purchase.biz.purchasebillextend;
+package com.yxt.purchase.biz.purchasebillbatch;
+
+
+import com.yxt.common.core.vo.Vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
+import java.util.Date;
 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 = "采购单扩展 视图数据对象")
+@ApiModel(value = "采购单商品-批次 视图数据对象", description = "采购单商品-批次 视图数据对象")
-public class PurchaseBillExtendVo implements Vo {
+public class PurchaseBillBatchVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("制单人姓名")
-    private String createByName; // 制单人姓名
 	@ApiModelProperty("采购单sid")
-    private String purchaseBillSid; // 采购单sid
+    private String billSid; // 采购单sid
-	@ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）")
+	@ApiModelProperty("采购单商品明细sid")
-    private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率）
+    private String billDetailSid; // 采购单商品明细sid
-	@ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）")
+	@ApiModelProperty("序列号")
-    private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
+    private String sortNo; // 序列号
-	@ApiModelProperty("临时加价率")
+	@ApiModelProperty("批次号")
-    private Integer tempMarkupRate; // 临时加价率
+    private String batchNumber; // 批次号
-	@ApiModelProperty("发货人姓名")
-    private String shipperName; // 发货人姓名
-	@ApiModelProperty("发货人手机")
-    private String shipperMob; // 发货人手机
-	@ApiModelProperty("发货省市区sid")
-    private String deliveryAreaSid; // 发货省市区sid
-	@ApiModelProperty("发货详细地址")
-    private String deliveryAddress; // 发货详细地址
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("到货日期")
+	@ApiModelProperty("生产日期")
-    private Date arrivalDateStart; // 到货日期
+    private Date madeDateStart; // 生产日期
-    private Date arrivalDateEnd; // 到货日期
+    private Date madeDateEnd; // 生产日期
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@ApiModelProperty("付款期限")
+	@ApiModelProperty("过期日期")
-    private Date paymentTermStart; // 付款期限
+    private Date expireDateStart; // 过期日期
-    private Date paymentTermEnd; // 付款期限
+    private Date expireDateEnd; // 过期日期
-	@ApiModelProperty("仓库sid")
+	@ApiModelProperty("货号")
-    private String wareHouseSid; // 仓库sid
+    private String goodsNum; // 货号
 
 }

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

@@ -82,8 +82,19 @@ public class PurchaseBillDetail extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预期到货日期")
     private Date deliveryDate; // 预期到货日期
-    @ApiModelProperty("税额")
+
-    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("总税额")
-    @ApiModelProperty("含税价")
+    private BigDecimal taxAmount;
-    private BigDecimal taxPrice; // 含税价
+    @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;
 }

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

@@ -81,8 +81,19 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预期到货日期")
     private Date deliveryDate; // 预期到货日期
-    @ApiModelProperty("税额")
+
-    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("总税额")
-    @ApiModelProperty("含税价")
+    private BigDecimal taxAmount;
-    private BigDecimal taxPrice; // 含税价
+    @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;
 }

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

@@ -82,8 +82,19 @@ public class PurchaseBillDetailDto implements Dto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预期到货日期")
     private Date deliveryDate; // 预期到货日期
-    @ApiModelProperty("税额")
+
-    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("总税额")
-    @ApiModelProperty("含税价")
+    private BigDecimal taxAmount;
-    private BigDecimal taxPrice; // 含税价
+    @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;
 }

src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml

@@ -11,7 +11,6 @@
 				pdd.cost * pdd.count AS costCount,
 				pdd.taxAmount,
 				pdd.taxAmount * pdd.count AS taxAmountCount,
-				pdd.taxPrice,
 				pdd.count,
 				IFNULL(ppd.backCount,0) AS retreatCount,
 				pdd.amount,

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

@@ -1,79 +0,0 @@
-/*********************************************************
- *********************************************************
- ********************                  *******************
- *************                                ************
- *******                  _oo0oo_                  *******
- ***                     o8888888o                     ***
- *                       88" . "88                       *
- *                       (| -_- |)                       *
- *                       0\  =  /0                       *
- *                     ___/`---'\___                     *
- *                   .' \\|     |// '.                   *
- *                  / \\|||  :  |||// \                  *
- *                 / _||||| -:- |||||- \                 *
- *                |   | \\\  -  /// |   |                *
- *                | \_|  ''\---/''  |_/ |                *
- *                \  .-\__  '-'  ___/-. /                *
- *              ___'. .'  /--.--\  `. .'___              *
- *           ."" '<  `.___\_<|>_/___.' >' "".            *
- *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
- *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
- *      =====`-.____`.___ \_____/___.-`___.-'=====       *
- *                        `=---='                        *
- *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.purchase.biz.purchasebilldetail;
-
-import com.yxt.common.core.query.Query;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel(value = "采购单据明细 查询条件", description = "采购单据明细 查询条件")
-public class PurchaseBillDetailQuery implements Query {
-
-	@ApiModelProperty("制单人姓名")
-    private String createByName; // 制单人姓名
-	@ApiModelProperty("单据sid")
-    private String billSid; // 单据sid
-	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
-	@ApiModelProperty("商品名称")
-    private String goodsSpuName; // 商品名称
-	@ApiModelProperty("商品Skusid")
-    private String goodsSkuSid; // 商品Skusid
-	@ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle; // 商品Sku名称
-	@ApiModelProperty("商品编码（图号）")
-    private String goodsSkuCode; // 商品编码（图号）
-	@ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec; // 规格型号
-	@ApiModelProperty("采购前库存数量")
-    private BigDecimal currentCount; // 采购前库存数量
-	@ApiModelProperty("仓库sid")
-    private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
-    private String warehouseName; // 仓库名称
-	@ApiModelProperty("库区/货位sid")
-    private String warehouseAreaSid; // 库区/货位sid
-	@ApiModelProperty("库区名称")
-    private String warehouseAreaName; // 库区名称
-	@ApiModelProperty("货架sid")
-    private String warehouseRackSid; // 货架sid
-	@ApiModelProperty("货架名称")
-    private String warehouseRackName; // 货架名称
-	@ApiModelProperty("单位成本（进货价）")
-    private BigDecimal cost; // 单位成本（进货价）
-	@ApiModelProperty("采购数量")
-    private BigDecimal count; // 采购数量
-	@ApiModelProperty("税额")
-    private BigDecimal taxAmount; // 税额
-	@ApiModelProperty("含税价")
-    private BigDecimal taxPrice; // 含税价
-	@ApiModelProperty("采购金额")
-    private BigDecimal amount; // 采购金额
-}

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

@@ -1,82 +0,0 @@
-/*********************************************************
- *********************************************************
- ********************                  *******************
- *************                                ************
- *******                  _oo0oo_                  *******
- ***                     o8888888o                     ***
- *                       88" . "88                       *
- *                       (| -_- |)                       *
- *                       0\  =  /0                       *
- *                     ___/`---'\___                     *
- *                   .' \\|     |// '.                   *
- *                  / \\|||  :  |||// \                  *
- *                 / _||||| -:- |||||- \                 *
- *                |   | \\\  -  /// |   |                *
- *                | \_|  ''\---/''  |_/ |                *
- *                \  .-\__  '-'  ___/-. /                *
- *              ___'. .'  /--.--\  `. .'___              *
- *           ."" '<  `.___\_<|>_/___.' >' "".            *
- *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
- *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
- *      =====`-.____`.___ \_____/___.-`___.-'=====       *
- *                        `=---='                        *
- *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.purchase.biz.purchasebilldetail;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
-public class PurchaseBillDetailVo implements Vo {
-
-    private String sid; // sid
-
-	@ApiModelProperty("制单人姓名")
-    private String createByName; // 制单人姓名
-	@ApiModelProperty("单据sid")
-    private String billSid; // 单据sid
-	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
-	@ApiModelProperty("商品名称")
-    private String goodsSpuName; // 商品名称
-	@ApiModelProperty("商品Skusid")
-    private String goodsSkuSid; // 商品Skusid
-	@ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle; // 商品Sku名称
-	@ApiModelProperty("商品编码（图号）")
-    private String goodsSkuCode; // 商品编码（图号）
-	@ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec; // 规格型号
-	@ApiModelProperty("采购前库存数量")
-    private BigDecimal currentCount; // 采购前库存数量
-	@ApiModelProperty("仓库sid")
-    private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
-    private String warehouseName; // 仓库名称
-	@ApiModelProperty("库区/货位sid")
-    private String warehouseAreaSid; // 库区/货位sid
-	@ApiModelProperty("库区名称")
-    private String warehouseAreaName; // 库区名称
-	@ApiModelProperty("货架sid")
-    private String warehouseRackSid; // 货架sid
-	@ApiModelProperty("货架名称")
-    private String warehouseRackName; // 货架名称
-	@ApiModelProperty("单位成本（进货价）")
-    private BigDecimal cost; // 单位成本（进货价）
-	@ApiModelProperty("采购数量")
-    private BigDecimal count; // 采购数量
-	@ApiModelProperty("税额")
-    private BigDecimal taxAmount; // 税额
-	@ApiModelProperty("含税价")
-    private BigDecimal taxPrice; // 含税价
-	@ApiModelProperty("采购金额")
-    private BigDecimal amount; // 采购金额
-
-}

src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 @ApiModel(value = "采购单扩展", description = "采购单扩展")
 @TableName("purchase_bill_extend")
@@ -53,4 +55,6 @@ public class PurchaseBillExtend extends BaseEntity {
     private String deliveryStateKey; // 发货状态
     @ApiModelProperty("发货状态value")
     private String deliveryStateValue;
+    @ApiModelProperty("已发货数量")
+    private BigDecimal deliveryCount;
 }

src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java

@@ -30,6 +30,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 @ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情")
 public class PurchaseBillExtendDetailsVo implements Vo {
@@ -50,4 +52,7 @@ public class PurchaseBillExtendDetailsVo implements Vo {
     private String deliveryStateKey; // 发货状态
     @ApiModelProperty("发货状态value")
     private String deliveryStateValue;
+
+    @ApiModelProperty("已发货数量")
+    private BigDecimal deliveryCount;
 }

src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 @ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象")
 public class PurchaseBillExtendDto implements Dto {
@@ -51,4 +53,7 @@ public class PurchaseBillExtendDto implements Dto {
     private String deliveryStateKey; // 发货状态
     @ApiModelProperty("发货状态value")
     private String deliveryStateValue;
+
+    @ApiModelProperty("已发货数量")
+    private BigDecimal deliveryCount;
 }

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNode.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNode.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNode <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 = "工单-环节")
+@TableName("purchase_flow_node")
+public class PurchaseFlowNode extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("busSid")
+    private String billSid; // busSid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+	@ApiModelProperty("结果（通过/不通过）")
+    private String result; // 结果（通过/不通过）
+
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeVo.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeVo <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 PurchaseFlowNodeDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("busSid")
+    private String billSid; // busSid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+	@ApiModelProperty("结果（通过/不通过）")
+    private String result; // 结果（通过/不通过）
+
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeDto.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeDto <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 PurchaseFlowNodeDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("busSid")
+    private String billSid; // busSid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+	@ApiModelProperty("结果（通过/不通过）")
+    private String result; // 结果（通过/不通过）
+
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeMapper.java <br/>
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeMapper <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
+ */
+@Mapper
+public interface PurchaseFlowNodeMapper extends BaseMapper<PurchaseFlowNode> {
+
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeQuery.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeQuery <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 PurchaseFlowNodeQuery implements Query {
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("busSid")
+    private String billSid; // busSid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+	@ApiModelProperty("结果（通过/不通过）")
+    private String result; // 结果（通过/不通过）
+
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeService.java <br/>
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeService <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
+ */
+@Service
+public class PurchaseFlowNodeService extends MybatisBaseService<PurchaseFlowNodeMapper, PurchaseFlowNode> {
+	
+	public void insertByDto(PurchaseFlowNodeDto dto){
+		PurchaseFlowNode entity = new PurchaseFlowNode();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public PurchaseFlowNodeDetailsVo fetchDetailsVoBySid(String sid){
+		PurchaseFlowNode entity = fetchBySid(sid);
+		PurchaseFlowNodeDetailsVo vo = new PurchaseFlowNodeDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.purchase.biz.purchaseflownode;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-purchase(采购单) <br/>
+ * File: PurchaseFlowNodeVo.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeVo <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 PurchaseFlowNodeVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("操作人姓名")
+    private String createByName; // 操作人姓名
+	@ApiModelProperty("busSid")
+    private String billSid; // busSid
+	@ApiModelProperty("环节编码")
+    private String nodeCode; // 环节编码
+	@ApiModelProperty("环节名称")
+    private String nodeName; // 环节名称
+	@ApiModelProperty("结果（通过/不通过）")
+    private String result; // 结果（通过/不通过）
+
+}