‘linchangsheng’ 7 mesiacov pred
rodič
commit
56efc5a90f

+ 9 - 0
src/main/java/com/zfire/mall/manager/logic/k3/K3StockLogic.java

@@ -158,8 +158,17 @@ public class K3StockLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         stockPosition.insert();
 
+        KingDeeStock kingDeeStock = new KingDeeStock();
+        kingDeeStock.setId(stockPosition.getId());
+        kingDeeStock.setName(stockPosition.getId());
+
+        kingDeeStock.insert();
+        StockCorrespondPosition stockCorrespondPosition = new StockCorrespondPosition();
 
+        stockCorrespondPosition.setCorrespondId(stockPosition.getId());
+        stockCorrespondPosition.setStockId(stockPosition.getId());
 
+        stockCorrespondPosition.insert();
 
         this.addCategorys(stockPosition);
     }

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

@@ -864,6 +864,8 @@
         group by kdm.id
     </select>
     <select id="listStockToCostPriceV2" resultType="com.zfire.mall.manager.bean.stock.StockBeanToCostPrice">
+
+
             SELECT
             kdm.`name` as materialName,
             kdm.old_number as materialOldNumber,
@@ -873,16 +875,17 @@
             kdm.cost_price,
             s.stock_qty as balanceNumber,
             s.stock_id,
-            sc.id as correspond_id,
+            scp.correspond_id,
             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 s.stock_id = sc.id
-            left join admin_user_stock aus on sc.id = aus.correspond_id
+            JOIN stock_correspond sc on scp.correspond_id = sc.id
+            left join admin_user_stock aus on scp.correspond_id = aus.correspond_id
             ${ex.query}
-            and sc.id = s.stock_id
+            and scp.stock_id = s.stock_id
             <if test="adminUserId != null and adminUserId!=''">
                 and aus.admin_user_id = #{adminUserId}
             </if>