diff --git a/DM_Weight/Models/CollectDrug.cs b/DM_Weight/Models/CollectDrug.cs
index 7954c88..021b417 100644
--- a/DM_Weight/Models/CollectDrug.cs
+++ b/DM_Weight/Models/CollectDrug.cs
@@ -114,5 +114,9 @@ namespace DM_Weight.Models
         /// </summary>
         [Navigate(NavigateType.ManyToOne, nameof(DrugPleaseClaimId))]
         public DrugPleaseClaim drugPleaseClaim { get; set; }
+
+
+        [SugarColumn(IsIgnore = true)]
+        public List<DrugPleaseManuNo> ManuNoList { get; set; }
     }
 }
diff --git a/DM_Weight/Models/DrugPleaseClaim.cs b/DM_Weight/Models/DrugPleaseClaim.cs
index 22f42e7..8bd248a 100644
--- a/DM_Weight/Models/DrugPleaseClaim.cs
+++ b/DM_Weight/Models/DrugPleaseClaim.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using SqlSugar;
 
 namespace DM_Weight.Models
@@ -54,7 +55,8 @@ namespace DM_Weight.Models
         /// 批次（多条）
         /// </summary>
         [SugarColumn(ColumnName = "drug_manu_no")]
-        public string DrugManuNo { get; set; }
+        [JsonProperty("drug_manu_no")]
+        public string _DrugManuNos { get; set; }
 
         /// <summary>
         /// 备注1
diff --git a/DM_Weight/Models/OrderInfo.cs b/DM_Weight/Models/OrderInfo.cs
index c073e2e..e7769f1 100644
--- a/DM_Weight/Models/OrderInfo.cs
+++ b/DM_Weight/Models/OrderInfo.cs
@@ -204,6 +204,8 @@ namespace DM_Weight.Models
         //[SugarColumn(ColumnName = "identity")]
         //public string Identity { get; set; }
 
-
+        
+        [SugarColumn(ColumnName = "machine_id")]
+        public string MachineId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs b/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
index 65e6475..a2d8969 100644
--- a/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
@@ -330,7 +330,7 @@ namespace DM_Weight.ViewModels
             {
                 if (SelectDrugPleaseClaim.GetQuantity == 1)
                 {
-                    if (SelectDrugPleaseClaim.DrugManuNo is null)
+                    if (SelectDrugPleaseClaim._DrugManuNos is null)
                     {
                         AlertMsg alertMsg = new AlertMsg
                         {
@@ -341,7 +341,7 @@ namespace DM_Weight.ViewModels
                         return;
                     }
                     //请领单里只有一种药
-                    List<DrugPleaseManuNo> drugManuInfoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(SelectDrugPleaseClaim.DrugManuNo);
+                    List<DrugPleaseManuNo> drugManuInfoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(SelectDrugPleaseClaim._DrugManuNos);
                     drugManuInfoList.ForEach(dm => dm.DrugId = SelectDrugPleaseClaim.DrugId);
                     for (int i = 0; i < drugManuInfoList.Count; i++)
                     {
@@ -383,7 +383,7 @@ namespace DM_Weight.ViewModels
                     {
                         foreach (DrugPleaseClaim item in pleaseClaimList)
                         {
-                            List<DrugPleaseManuNo> drugManuInfoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(item.DrugManuNo);
+                            List<DrugPleaseManuNo> drugManuInfoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(item._DrugManuNos);
                             drugManuInfoList.ForEach(dm => dm.DrugId = item.DrugId);
                             for (int i = 0; i < drugManuInfoList.Count; i++)
                             {
diff --git a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
index 0469b63..369f0d6 100644
--- a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
@@ -1,6 +1,7 @@
 using DM_Weight.Models;
 using DM_Weight.select;
 using DM_Weight.util;
+using Newtonsoft.Json;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -150,11 +151,27 @@ namespace DM_Weight.ViewModels
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (cd) => cd.drugInfo.PyCode.Contains(SearchValue))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (cd) => cd.drugInfo.DrugBarcode.Contains(SearchValue))
                            .WhereIF((_DrugPleaseState!=null&& _DrugPleaseState.StateValue>=0),(cd,dp)=>dp.State==_DrugPleaseState.StateValue)
-                           .GroupBy(cd=>cd.Applyid)
+                           .GroupBy(cd=>cd.DrugPleaseClaimId)
+                           .GroupBy(cd => cd.DrugId)
                            .OrderByDescending(cd => cd.Createdate)
                            .OrderByDescending(cd => cd.DrugId)
                            .ToList();
+            if (CollectDrugLst != null && CollectDrugLst.Count > 0)
+            {
 
+                for (int i = 0; i < CollectDrugLst.Count; i++)
+                {
+                    CollectDrugLst[i].ManuNoList = new List<DrugPleaseManuNo>();
+                    DrugPleaseClaim drugManuNoStr = SqlSugarHelper.Db.Queryable<DrugPleaseClaim>().Where(dp => dp.PleaseNo == CollectDrugLst[i].DrugPleaseClaimId && dp.DrugId == CollectDrugLst[i].DrugId).First();
+
+                    CollectDrugLst[i].Quantity = drugManuNoStr.GetQuantity;
+                    if (!string.IsNullOrEmpty(drugManuNoStr._DrugManuNos))
+                    {
+                        CollectDrugLst[i].ManuNoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(drugManuNoStr._DrugManuNos);
+
+                    }
+                }
+            }
         }
         /// <summary>
         /// 刷新
diff --git a/DM_Weight/ViewModels/CollectDrugDialogViewModel.cs b/DM_Weight/ViewModels/CollectDrugDialogViewModel.cs
index f2b6ea8..09b8688 100644
--- a/DM_Weight/ViewModels/CollectDrugDialogViewModel.cs
+++ b/DM_Weight/ViewModels/CollectDrugDialogViewModel.cs
@@ -175,7 +175,8 @@ namespace DM_Weight.ViewModels
                     SqlSugarHelper.Db.Updateable(new OrderInfo()
                     {
                         ApplyStatus = 1,
-                        OrderNo = collectDrug.OrderNo
+                        OrderNo = collectDrug.OrderNo,
+                        MachineId = ConfigurationManager.AppSettings["machineId"].ToString()
                     }).UpdateColumns(it => new { it.ApplyStatus }).Where(it => it.OrderNo == collectDrug.OrderNo).ExecuteCommand();
 
                     //保存处方、请领申请中间表
diff --git a/DM_Weight/Views/ApplyInStockWindow.xaml b/DM_Weight/Views/ApplyInStockWindow.xaml
index cede7ab..0295020 100644
--- a/DM_Weight/Views/ApplyInStockWindow.xaml
+++ b/DM_Weight/Views/ApplyInStockWindow.xaml
@@ -190,9 +190,9 @@
                     </Style>
                 </DataGrid.Resources>
                 <!--GroupStyle to group data-->
-                <DataGrid.GroupStyle>
+                <!--<DataGrid.GroupStyle>
                     <GroupStyle>
-                        <!--Group DataItems into DataGroup-->
+                        --><!--Group DataItems into DataGroup--><!--
                         <GroupStyle.ContainerStyle>
                             <Style TargetType="{x:Type GroupItem}">
                                 <Setter Property="Template">
@@ -207,7 +207,7 @@
                                                         <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DrugInfo.Manufactory,StringFormat=厂家：{0}，}" />
                                                         <TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />
 
-                                                        <!--<TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />-->
+                                                        --><!--<TextBlock FontWeight="Bold" Text="{Binding Path=Items,Converter={StaticResource GroupSumConverter}}" />--><!--
 
                                                     </StackPanel>
                                                 </Expander.Header>
@@ -220,19 +220,31 @@
                         </GroupStyle.ContainerStyle>
 
                     </GroupStyle>
-                </DataGrid.GroupStyle>
+                </DataGrid.GroupStyle>-->
                 <DataGrid.Columns>
-                    <DataGridTextColumn Width="100"
+                    <DataGridTextColumn Width="100" Header="药品" 
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}" Binding="{Binding DrugInfo.DrugName}">
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Width="100" Header="规格" 
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}" Binding="{Binding DrugInfo.DrugSpec}">
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Width="180" Header="厂家" 
+                        IsReadOnly="True"
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}" Binding="{Binding DrugInfo.Manufactory}">
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Width="60"
                         Binding="{Binding Location}"
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTextColumn  Width="147"
+                    <DataGridTextColumn  Width="80"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTextColumn  Width="147"
+                    <DataGridTextColumn  Width="100"
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
@@ -242,7 +254,7 @@
                         Header="库存"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTemplateColumn Width="100"
+                    <DataGridTemplateColumn Width="80"
                         Header="添加数量">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
diff --git a/DM_Weight/Views/ApplyListWindow.xaml b/DM_Weight/Views/ApplyListWindow.xaml
index c3687f2..41e95e2 100644
--- a/DM_Weight/Views/ApplyListWindow.xaml
+++ b/DM_Weight/Views/ApplyListWindow.xaml
@@ -145,11 +145,11 @@
                 </GroupStyle>
             </DataGrid.GroupStyle>
             <DataGrid.Columns>
-                <DataGridTextColumn Width="180"
+                <!--<DataGridTextColumn Width="180"
                         Binding="{Binding OrderNo}"
                         Header="处方号"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
                 <DataGridTextColumn Width="180"
                         Binding="{Binding drugInfo.DrugName}"
                         Header="药品名称"
@@ -180,7 +180,29 @@
                         Header="状态"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                <DataGridTemplateColumn Header="批次" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ListBox ItemsSource="{Binding ManuNoList}" DisplayMemberPath="ManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
 
+                <DataGridTemplateColumn Header="效期" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ListBox ItemsSource="{Binding ManuNoList}" DisplayMemberPath="EffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+
+                <DataGridTemplateColumn Header="入库数" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ListBox ItemsSource="{Binding ManuNoList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
         <!--<Grid.RowDefinitions>