需求

src/main/java/com/zfire/mall/manager/bean/stock/KingDeePurchaseStockOutVO.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.zfire.mall.manager.annotation.ZfireField;
+import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOut;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOutItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,11 +20,9 @@ import java.util.Date;
  */
 @ApiModel
 @Data
-public class KingDeePurchaseStockOutVO {
-
+public class KingDeePurchaseStockOutVO   {
 
     @ZfireField(hide = true,tbName = "kdpso")
-    @ApiModelProperty(value = "id")
     private String id;
 
     @ZfireField(tbName = "kdpso")
@@ -30,41 +30,73 @@ public class KingDeePurchaseStockOutVO {
     private String billNo;
 
     @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "退料组织")
+    private String stockOrgId;
+
+    @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "退料日期")
     private Date fDate;
 
-    @ZfireField(tbName = "kds",colName = "name")
-    @ApiModelProperty(value = "供应商名称")
-    private String supplierName;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "采购组织")
+    private String purchaseOrgId;
 
-    @ZfireField(tbName = "kdpsoi",colName = "old_num")
-    @ApiModelProperty(value = "物料代码")
-    private String materialOldNumber;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "供应商")
+    private String supplierId;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "退料类型")
+    private String mrType;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "退料方式")
+    private String mrMode;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "状态")
+    private ExamineStatusEnum cancelStatus;
+
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "审核人")
+    private String approverId;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "审核日期")
+    private Date approveDate;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "作废人")
+    private String cancellerId;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
+
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "备注")
+    private String abcdRemarks;
 
-    @ZfireField(tbName = "kdpsoi")
-    @ApiModelProperty(value = "物料名称")
-    private String materialName;
 
     @ZfireField(tbName = "kdpsoi")
     @ApiModelProperty(value = "物料编码")
     private String materialNumber;
 
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "仓库名称")
+    private String stockName;
 
     @ZfireField(tbName = "kdpsoi")
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
+    @ApiModelProperty(value = "实退数量")
+    private BigDecimal rmRealQty;
 
-    @ZfireField(tbName = "kdm",colName = "unit")
-    @ApiModelProperty(value = "采购单位")
-    private String unit;
 
-    @ZfireField(tbName = "kdsc",colName = "name")
-    @ApiModelProperty(value = "仓库")
-    private String stockName;
 
-    @ZfireField(tbName = "kdpsoi",colName = "re_real_qty")
-    @ApiModelProperty(value = "采购数量")
-    private BigDecimal qty;
 
 
 }

src/main/resources/mapper/StockMapper.xml

@@ -745,7 +745,8 @@
     <select id="listPurchaseOrderOutV2"
             resultType="com.zfire.mall.manager.bean.stock.KingDeePurchaseStockOutVO">
         SELECT
-        kdpso.*
+        kdpso.*,
+        kdpsoi.*
         FROM
         king_dee_purchase_stock_out kdpso
         JOIN king_dee_purchase_stock_out_item kdpsoi on kdpso.id = kdpsoi.bill_no