备货库位物料信息

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml

@@ -114,7 +114,23 @@
         ldsa.id
     </select>
     <select id="selectStockUpAreaStockList" resultType="java.util.Map">
-
+        SELECT
+        lwusa.materiel_code,
+        lwusa.materiel_name,
+        ldsl.quantity_stock,
+        ldsl.order_code,
+        ldsl.market_name,
+        lwusa.market_id,
+        lwusa.incoming_batch,
+        sum(lwusa.num)
+        FROM
+        logpm_warehouse_updown_stockup_area AS lwusa
+        LEFT JOIN logpm_distribution_stock_list AS ldsl ON lwusa.association_value = ldsl.cargo_number
+        AND lwusa.market_id = ldsl.market_id
+        WHERE
+        lwusa.allocation_id = #{allocationId} AND lwusa.association_type in( '3','5') AND goods_type = '2'
+        GROUP BY
+        lwusa.incoming_batch
     </select>
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java

@@ -519,7 +519,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		updownStockupAreaEntity.setIncomingBatch(upShelfStockDTO.getIncomingBatch());
 		updownStockupAreaEntity.setAssociationType("3");
 		updownStockupAreaEntity.setUpdownType("物料");
-		updownStockupAreaEntity.setGoodsType("1");
+		updownStockupAreaEntity.setGoodsType("2");
 		updownStockupAreaEntity.setNum(upShelfStockDTO.getEnterNum());
 		updownStockupAreaEntity.setMarketId(upShelfStockDTO.getMarketId());
 		updownStockupAreaEntity.setMaterielCode(upShelfStockDTO.getMaterialCode());