Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -83,6 +83,18 @@ namespace Tnb.WarehouseMgr
                     isOk = (row > 0);
                     if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
 
+                }
+                else
+                {
+                    if (carry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的主载具", 500);
+                    }
+                    if (subCarry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的子载具", 500);
+                    }
+
                 }
                 /*   //更新主载具明细表，增加新的数据
                    var row = await _db.Insertable<WmsCarryD>(new WmsCarryD  {

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs

@@ -75,7 +75,17 @@ namespace Tnb.WarehouseMgr
                     row = await _db.Updateable(subCarry).ExecuteCommandAsync();
                     isOk = (row > 0);
                     if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
-
+                }
+                else
+                {
+                    if (carry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的主载具", 500);
+                    }
+                    if (subCarry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的子载具", 500);
+                    }
                 }
 
                 await _db.Ado.CommitTranAsync();

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs

@@ -78,7 +78,7 @@ namespace Tnb.WarehouseMgr
                 var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
 
                 //出库取起点，获取所有符合输入的载具规格的载具
-                var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)]);
+                var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
                 var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
                         .Select((a,b) => new
                         {