需求

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

@@ -1,8 +1,13 @@
 package com.zfire.mall.manager.bean.stock;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+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.enums.K3CommonStatusEnum;
 import com.zfire.mall.manager.enums.OtherOrderTypeEnum;
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockIn;
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockInItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,64 +22,93 @@ import java.util.Date;
 @Data
 public class KingDeeOtherStockInVO  {
 
-    @ZfireField(hide = true,tbName = "kdpso")
-    @ApiModelProperty(value = "id")
+    @ZfireField(tbName = "kdpso",hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
 
+    @ZfireField(tbName = "kdpso",hide = true)
+    @ApiModelProperty(value = "供应链组织id")
+    private String supplyOrgId;
+
+    @ZfireField(tbName = "kdpso",hide = true)
+    @ApiModelProperty(value = "实体主键")
+    private String fId;
+
     @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "单据编号")
     private String billNo;
 
+    @ZfireField(tbName = "kdpso",hide = true)
+    @ApiModelProperty(value = "库存组织")
+    private String stockOrgId;
+
     @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "入库日期")
+    @ApiModelProperty(value = "日期")
     private Date fDate;
 
-    @ZfireField(tbName = "kdpso",type = "select")
-    @ApiModelProperty(value = "方向")
-    private OtherOrderTypeEnum stockDirect;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "货主类型")
+    private String ownerTypeIdHead;
 
+    @ZfireField(tbName = "kdpso",hide = true)
+    @ApiModelProperty(value = "供应商")
+    private String supplierId;
 
-    @ZfireField(tbName = "kdpso",type = "select")
-    @ApiModelProperty(value = "订单状态")
-    private K3CommonStatusEnum cancelStatus;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "状态")
+    private ExamineStatusEnum cancelStatus;
 
-    @ZfireField(tbName = "kdm",colName = "old_num")
-    @ApiModelProperty(value = "物料代码")
-    private String materialOldNumber;
+    @ZfireField(tbName = "kdpso",hide = true)
+    @ApiModelProperty(value = "仓库")
+    private String abcdBase;
 
-    @ZfireField(tbName = "kdm",hide = true)
-    @ApiModelProperty(value = "物料id")
-    private String materialId;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "审核人")
+    private String approverId;
 
-    @ZfireField(tbName = "kdm")
-    @ApiModelProperty(value = "物料名称")
-    private String materialName;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "审核日期")
+    private Date approveDate;
 
-    @ZfireField(tbName = "kdm")
-    @ApiModelProperty(value = "物料编码")
-    private String materialNumber;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "作废人")
+    private String cancellerId;
 
-    @ZfireField(tbName = "kdm",colName = "base_unit_id")
-    @ApiModelProperty(value = "采购单位")
-    private String unit;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
 
-    @ZfireField(tbName = "kdsc",colName = "name")
-    @ApiModelProperty(value = "仓库")
-    private String stockName;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "备注")
+    private String note;
 
-    @ZfireField(tbName = "kdsc")
-    @ApiModelProperty(value = "采购数量")
-    private BigDecimal qty;
+    @ZfireField(tbName = "kdpso")
+    @ApiModelProperty(value = "订单状态")
+    private String fdDocumentStatus;
 
 
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "物料编码")
+    private String materialNumber;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "供应链组织id")
-    private String supplyOrgId;
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "实体主键")
-    private String fId;
+    @ZfireField(tbName = "kdpsoi",hide = true)
+    @ApiModelProperty(value = "收货仓库")
+    private String stockId;
 
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "备注")
+    private String entryNote;
+
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "实收数量")
+    private BigDecimal qty;
+
+    @ZfireField(tbName = "kdpsoi")
+    @ApiModelProperty(value = "仓库名称")
+    private String stockName;
 
 }

src/main/resources/mapper/StockMapper.xml

@@ -788,26 +788,11 @@
     </select>
     <select id="listOtherStockInV2" resultType="com.zfire.mall.manager.bean.stock.KingDeeOtherStockInVO">
         SELECT
-        kdpso.id,
-        kdpso.bill_no,
-        kdpso.f_date,
-        kdpso.stock_direct,
-        kdpso.cancel_status,
-        kdpso.fd_document_status,
-        kdpsoi.material_name,
-        kdpsoi.material_number,
-        kdm.old_number as materialOldNumber,
-        kdm.specification,
-        kdm.base_unit_id as unit,
-        kdpsoi.qty,
-        kdsc.`name` as  stockName
-
+        kdpso.*,
+        kdpsoi.*
         FROM
         king_dee_other_stock_in kdpso
         JOIN king_dee_other_stock_in_item kdpsoi on kdpso.id = kdpsoi.bill_no
-        JOIN king_dee_material kdm on kdpsoi.material_id = kdm.id
-        join king_dee_stock kdsc on kdsc.id = kdpsoi.stock_id
-        join stock_correspond_position scp on kdsc.id = scp.stock_id
         ${ex.query}
 
         <if test="ex.orderBy == null or ex.orderBy ==''">