Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -1408,7 +1408,7 @@ namespace Khd.Core.Wcs.Wcs
                                                     WmsBaseLocation? wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.locRow == row)
                                                     .Where(t => t.locColumn == location.locColumn)
                                                     .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
-                                                    if (!string.IsNullOrEmpty(wmsBaseLocation.containerCode) && wmsBaseLocation.locationStatus == "1")
+                                                    if (wmsBaseLocation.locationStatus == "1")
                                                     {
 
                                                         WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
@@ -1559,7 +1559,7 @@ namespace Khd.Core.Wcs.Wcs
                                                         }
                                                         else
                                                         {
-                                                            continue;
+                                                           // break;
                                                         }
                                                     }
                                                     else
@@ -2479,7 +2479,7 @@ namespace Khd.Core.Wcs.Wcs
                                                                     .Where(t => t.locRow == row)
                                                                     .Where(t => t.locColumn == location.locColumn)
                                                                     .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
-                                                                if (!string.IsNullOrEmpty(wmsBaseLocation.containerCode) && wmsBaseLocation.locationStatus == "1")
+                                                                if ( wmsBaseLocation.locationStatus == "1")
                                                                 {
                                                                     WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
                                                                     if (wmsRawStock != null)
@@ -2569,7 +2569,8 @@ namespace Khd.Core.Wcs.Wcs
                                                                     }
                                                                     else
                                                                     {
-                                                                        continue;
+                                                                        // 可以出库
+                                                                       // continue;
                                                                     }
                                                                 }
                                                                 else if (wmsBaseLocation != null && wmsBaseLocation.locationStatus != "1")
@@ -2701,12 +2702,12 @@ namespace Khd.Core.Wcs.Wcs
                                                             .Where(t => t.locColumn == location.locColumn)
                                                             .Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
 
-                                                        if (!string.IsNullOrEmpty(wmsBaseLocation.containerCode) && wmsBaseLocation.locationStatus == "1")
+                                                        if (wmsBaseLocation.locationStatus == "1")
                                                         {
                                                             // 浅库位有库存
                                                             WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
-
-
+                                                            if (wmsRawStock != null)
+                                                            {
                                                                 // 寻找移库目的库位
                                                                 WmsBaseLocation? toLocation = null;
 
@@ -2786,6 +2787,13 @@ namespace Khd.Core.Wcs.Wcs
                                                                 WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(RemoveTask);
                                                                 dbContext.Add(wcsTaskLog);
 
+                                                            }
+                                                            else
+                                                            {
+                                                                //直接出
+                                                            }
+
+
                                                         }
                                                         else if (wmsBaseLocation.locationStatus != "1")
                                                         {