maqiao
/
XiangTan_JiaoJie_Bak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

入库后报表的批次库存数（实物）与上一次出库后的批次库存数差别大，修改可能存在的问题

This commit is contained in:
马巧 2025-08-21 14:59:37 +08:00
parent bb0710b8bb
commit 500974a947
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -42,7 +42,7 @@
<!-- 无操作退出录像时间，单位秒，为0时不退出录像 --> <!-- 无操作退出录像时间，单位秒，为0时不退出录像 -->
<add key="stopRecord" value="180"/> <add key="stopRecord" value="180"/>
<add key="gridConnectionString" value="MYSQL; Database=xiangtanTest; Password=root; Port=3306; Server=192.168.50.84; User=root;"/> <add key="gridConnectionString" value="MYSQL; Database=xtTest; Password=qq1223; Port=3306; Server=127.0.0.1; User=root;"/>
<!-- 查询处方是orderNo还是orderGroupNo --> <!-- 查询处方是orderNo还是orderGroupNo -->
<add key="OrderNoName" value="orderNo" /> <add key="OrderNoName" value="orderNo" />
<!-- 后门耗材板地址 没有则填写0--> <!-- 后门耗材板地址 没有则填写0-->

4
DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
View File

@ -452,7 +452,7 @@ namespace DM_Weight.ViewModels
int baseQty = 0; int baseQty = 0;
if (int.TryParse(BaseQuantity, out baseQty)) if (int.TryParse(BaseQuantity, out baseQty))
{ {
logger.Info($"修改药品基数{_ChannelList.BaseQuantity}改为{baseQty}"); logger.Info($"修改药品{DrugInfo.DrugName}基数{_ChannelList.BaseQuantity}改为{baseQty}");
if (baseQty > _ChannelList.BaseQuantity) if (baseQty > _ChannelList.BaseQuantity)
{ {
//基数变大，需要补药 //基数变大，需要补药
@ -490,7 +490,7 @@ namespace DM_Weight.ViewModels
OperationTime = DateTime.Now, OperationTime = DateTime.Now,
Quantity = _ChannelList.channelStocks[0].NeedNum, Quantity = _ChannelList.channelStocks[0].NeedNum,
Type = 55, Type = 55,
InvoiceId = $"修改药品基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量", InvoiceId = $"修改药品{DrugInfo.DrugName}基数{oldBaseQty}改为{baseQty},Quantity值为需要加药数量",
}).ExecuteCommand(); }).ExecuteCommand();
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676")); SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
SnackbarMessageQueue.Enqueue("保存修改完成！"); SnackbarMessageQueue.Enqueue("保存修改完成！");

2
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -518,7 +518,7 @@ namespace DM_Weight.ViewModels
// 获取更新完库存后的药品库存 // 获取更新完库存后的药品库存
List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>() List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
.Where(it => it.MachineId.Equals(cs.MachineId) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"])) .Where(it => it.MachineId.Equals(ConfigurationManager.AppSettings["machineId"]) || it.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"]))
.Where(it => it.DrugId.Equals(cs.DrugId)) .Where(it => it.DrugId.Equals(cs.DrugId))
.Where(it => it.ManuNo.Equals(cs.ManuNo)) .Where(it => it.ManuNo.Equals(cs.ManuNo))
.Where(it => it.DrawerType == 1) .Where(it => it.DrawerType == 1)

2
DM_Weight/Views/BindBoxPackageWindow.xaml
View File

@ -142,7 +142,7 @@
<Grid Grid.Column="1" Margin="6"> <Grid Grid.Column="1" Margin="6">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="550" /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2"> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
<ComboBox <ComboBox

2
DM_Weight/Views/ExchangeWindow.xaml
View File

@ -100,7 +100,7 @@
<Grid Grid.Column="1" Margin="6"> <Grid Grid.Column="1" Margin="6">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="550" /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2"> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
<Button Margin="6 0 6 6" <Button Margin="6 0 6 6"

6
DM_Weight/Views/MachineRecordWindow.xaml
View File

@ -28,7 +28,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="550" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Margin="0 6 0 6" Grid.Row="0"> <Grid Margin="0 6 0 6" Grid.Row="0">
@ -93,11 +93,13 @@
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>
<pagination:Pagination Grid.Row="2" <DockPanel Grid.Row="2">
<pagination:Pagination
CurrentPage="{Binding PageNum}" CurrentPage="{Binding PageNum}"
PageSize="{Binding PageSize}" PageSize="{Binding PageSize}"
TotalPages="{Binding TotalCount}" TotalPages="{Binding TotalCount}"
InfoTextIsEnabel="True" InfoTextIsEnabel="True"
/> />
</DockPanel>
</Grid> </Grid>
</UserControl> </UserControl>

2
DM_Weight/Views/WSDRecordWindow.xaml
View File

@ -28,7 +28,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="550"/> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Margin="0 6 0 6" Grid.Row="0"> <Grid Margin="0 6 0 6" Grid.Row="0">