‘linchangsheng’ vor 7 Monaten
Ursprung
Commit
7088078715

+ 1 - 1
src/main/java/com/zfire/mall/manager/bean/k3/v2/KingDeePurchaseStockInVO.java

@@ -55,7 +55,7 @@ public class KingDeePurchaseStockInVO {
     private String stockDeptId;
 
     @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废状态")
+    @ApiModelProperty(value = "状态")
     private ExamineStatusEnum cancelStatus;
 
     @ZfireField(tbName = "a")

+ 3 - 4
src/main/resources/mapper/StockMapper.xml

@@ -684,15 +684,14 @@
         kdm.cost_price,
         s.stock_qty as balanceNumber,
         s.stock_id,
-        scp.correspond_id,
+        sc.id as correspondId,
         sc.name as correspondName,
         kdm.category_name
         FROM
         stock s
-        JOIN stock_correspond_position scp on scp.stock_id = s.stock_id
         JOIN king_dee_material kdm ON s.material_id = kdm.id
-        JOIN stock_correspond sc on scp.correspond_id = sc.id
-        left join admin_user_stock aus on scp.correspond_id = aus.correspond_id
+        JOIN stock_correspond sc on s.stock_id = sc.id
+        left join admin_user_stock aus on sc.id = aus.correspond_id
         ${ex.query}
         and scp.stock_id = s.stock_id
         <if test="adminUserId != null and adminUserId!=''">