change-5F原材料入库，优先把相同销售订单的放一起改为把优先把相同采购订单及批次号的放一块

src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs

@@ -131,12 +131,24 @@ namespace Khd.Core.Wcs.Wcs
                                                             .Where(t => t.locDeep == 1)
                                                             .Select(t => t.containerCode).ToList();//深库位的托盘
                                                         containerCodes.RemoveAll(t => string.IsNullOrEmpty(t));
-                                                        List<WmsRawStock> wmsRawStocks = dbContext.WmsRawStock
-                                                                .Where(t => t.materialId == mesBaseBarcodeInfo.materialId)
-                                                                .Where(t => t.saleOrderId == mesBaseBarcodeInfo.saleOrderId)
-                                                                .Where(t => t.palletInfoCode != null)
-                                                                .Where(t => t.warehouseId == 511)
-                                                                .Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();
+
+
+                                                        //List<WmsRawStock> wmsRawStocks = dbContext.WmsRawStock
+                                                        //        .Where(t => t.materialId == mesBaseBarcodeInfo.materialId)
+                                                        //        .Where(t => t.saleOrderId == mesBaseBarcodeInfo.saleOrderId)
+                                                        //        .Where(t => t.palletInfoCode != null)
+                                                        //        .Where(t => t.warehouseId == 511)
+                                                        //        .Where(t => containerCodes.Contains(t.palletInfoCode)).ToList();
+
+                                                        //优先把相同采购订单及批次号的放一块 ==》改为找相同型号及采购订单及批次号的深库位库存
+                                                        List<WmsRawStock> wmsRawStocks = (from stock in dbContext.WmsRawStock
+                                                                                          join codeInfo in dbContext.MesBaseBarcodeInfo
+                                                                                          on stock.instockBatch equals codeInfo.barcodeInfo
+                                                                                          where codeInfo.batchCode == mesBaseBarcodeInfo.batchCode
+                                                                                          && codeInfo.poNo == mesBaseBarcodeInfo.poNo && stock.materialId == mesBaseBarcodeInfo.materialId && stock.warehouseId == 511
+                                                                                          select stock).ToList();
+
+
 
                                                         var bill = from a in wmsRawStocks
                                                                    join b in wmsBaseLocations