美瑞安淮安立体仓库
上一版本: 2fbbc3cc | 补丁 | 提交 | 忽略空白
wangxinhui
15 小时以前 605e01c0782d8b2ba8d7fe317eb7bb077b7d1e59 
Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
已修改3个文件
15 ■■■■■ 文件已修改
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/ProStockViewService.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue


@@ -50,7 +50,7 @@


          { title: "产品编码", field: "productCode",type: "like"},


        ],


        [


          


          { title: "批次号", field: "lotNumber",type: "like"},


          { title: "产品版本", field: "productVersion",type: "like"},


          { title: "指派版本", field: "specifyVer",type: "like"},


          { title: "所属仓库", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},




 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/ProStockViewService.cs


@@ -79,6 +79,14 @@


                                    sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.SpecifyVer.Contains(searchParameters.Value)));


                                }


                            }


                            {


                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_ProStockInfoDetail.LotNumber).FirstLetterToLower());


                                if (searchParameters != null)


                                {


                                    sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.LotNumber.Contains(searchParameters.Value)));


                                }


                            }






                        }






 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs


@@ -1015,12 +1015,13 @@


                        float OriginalQuantity = v.StockQuantity;


                        float assignQuantity = 0;//分配数量


                        float assignAmount = OrderDetail.OrderQuantity - OrderDetail.OverOutQuantity;//待出数量


                        decimal StockQuantity = Convert.ToDecimal(v.StockQuantity);


                        if (assignAmount > 0)


                        {


                            if (v.StockQuantity >= assignAmount)


                            if (StockQuantity >=(decimal) assignAmount)


                            {


                                assignQuantity = assignAmount;


                                v.StockQuantity -= assignAmount;


                                StockQuantity -=(decimal)assignAmount;


                                OrderDetail.OverOutQuantity += assignAmount;


                                OrderDetail.LockQuantity += assignAmount;


                                upstockDetails.Add(v);