Merge remote-tracking branch 'origin/dev' into dev

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -67,15 +67,13 @@ namespace Tnb.WarehouseMgr
                 var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
                 var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
                 var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
-               
-                //WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
                 if (carry != null && subCarry != null)
                 {
-                    
                     carry.carry_status = "1";
                     var row = await _db.Updateable(carry).ExecuteCommandAsync();
                     subCarry.carry_status = "1";
                     row = await _db.Updateable(subCarry).ExecuteCommandAsync();
+                    //更新载具明细表
                     WmsCarryD wmsCarryD = new()
                     {
                         id = SnowflakeIdHelper.NextId(),
@@ -89,6 +87,7 @@ namespace Tnb.WarehouseMgr
                     };
                     row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
                     var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
+                    //更新载具绑定条码表
                     for (int i = 0; i < items.Count; i++)
                     {
                         WmsCarrybindCode wmsCarrybindCode = new();

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs

@@ -98,12 +98,14 @@ namespace Tnb.WarehouseMgr
                     var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
                     WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
                     wmsCarryReplaceH.id = SnowflakeIdHelper.NextId();
-                    wmsCarryReplaceH.org_id = oldCarry.org_id;
+                    wmsCarryReplaceH.org_id = _userManager.User.OrganizeId;
                     wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE);
                     wmsCarryReplaceH.carry_id = oldCarry.id;
                     wmsCarryReplaceH.carry_code = oldCarry.carry_code;
                     wmsCarryReplaceH.newcarry_id = newCarry.id;
                     wmsCarryReplaceH.newcarry_code = newCarry.carry_code;
+                    wmsCarryReplaceH.create_id = _userManager.UserId;
+                    wmsCarryReplaceH.create_time = DateTime.Now;
                     wmsCarryReplaceH.modify_id = null;
                     wmsCarryReplaceH.modify_time = null;
                     row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs

@@ -71,6 +71,7 @@ namespace Tnb.WarehouseMgr
                 {
                     var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
                     var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
+                    //更新载具解绑记录条码表
                     WmsCarryunbindCode wmsCarryUnbindCode = new();
                     for (int i = 0; i < items.Count; i++)
                     {

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs

@@ -51,7 +51,7 @@ namespace Tnb.WarehouseMgr
             _billRullService = billRullService;
             OverideFuncs.CreateAsync = PDACarryBind;
         }
-        
+
         private async Task<dynamic> PDACarryBind(VisualDevModelDataCrInput input)
         {
             var isOk = false;
@@ -67,27 +67,28 @@ namespace Tnb.WarehouseMgr
                 var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
                 var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
                 var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
-                WmsCarryD wmsCarryD = new()
-                {
-                    id = SnowflakeIdHelper.NextId(),
-                    carry_id = carry.id,
-                    org_id = carry?.org_id!,
-                    membercarry_id = subCarry.id,
-                    membercarry_code = subCarry.carry_code,
 
-                    loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1),
-                    create_id = _userManager.UserId,
-                    create_time = DateTime.Now
-                };
-                //WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
                 if (carry != null && subCarry != null)
                 {
+                    //更新载具明细
+                    WmsCarryD wmsCarryD = new()
+                    {
+                        id = SnowflakeIdHelper.NextId(),
+                        carry_id = carry.id,
+                        org_id = carry?.org_id!,
+                        membercarry_id = subCarry.id,
+                        membercarry_code = subCarry.carry_code,
+                        loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1),
+                        create_id = _userManager.UserId,
+                        create_time = DateTime.Now
+                    };
                     var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
                     carry.carry_status = "1";
                     row = await _db.Updateable(carry).ExecuteCommandAsync();
                     subCarry.carry_status = "1";
                     row = await _db.Updateable(subCarry).ExecuteCommandAsync();
                     var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
+                    //更新载具绑定条码表
                     for (int i = 0; i < items.Count; i++)
                     {
                         WmsCarrybindCode wmsCarrybindCode = new();

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs

@@ -65,8 +65,7 @@ namespace Tnb.WarehouseMgr
 
                 VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true);
                 await _runService.Create(templateEntity, input);
-                //入库取终点
+                //出库取起点
-                //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
                 var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
                 WmsPointH sPoint = null;
                 WmsPointH ePoint = null;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs

@@ -66,11 +66,11 @@ namespace Tnb.WarehouseMgr
                 var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
                 var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
                 var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == subCarryId);
-                //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
                 if (carry != null && subCarry != null)
                 {
                     var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
                     var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
+                    //更新载具解绑记录
                     WmsCarryunbindCode wmsCarryUnbindCode = new();
                     for (int i = 0; i < items.Count; i++)
                     {

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs

@@ -68,9 +68,6 @@ namespace Tnb.WarehouseMgr
                 VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true);
                 await _runService.Create(templateEntity, input);
 
-                /*//入库取终点
-                var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
-                var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
                 //判断目标库位是否自动签收                
                 var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
                

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs

@@ -75,12 +75,13 @@ namespace Tnb.WarehouseMgr
 
                 var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
                 var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : "";
-                var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
+                var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
-                var feedBox = await _db.Queryable<WmsFeedbox>().FirstAsync(it => it.id == feedBoxCode);
+                var feedBox = await _db.Queryable<WmsFeedbox>().SingleAsync(it => it.feedbox_code == feedBoxCode);
                 var carryMaterial = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
-                var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it=>it.carry_id == carryId).ToListAsync();
+                var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
                 if (carry != null && feedBox != null)
                 {
+                    //更新投料箱
                     feedBox.material_id = carryMaterial.material_id;
                     feedBox.material_code = carryMaterial.material_code;
                     feedBox.qty = carryMaterial.qty;
@@ -89,7 +90,8 @@ namespace Tnb.WarehouseMgr
                     feedBox.create_id = _userManager.UserId;
                     feedBox.create_time = DateTime.Now;
                     var row = await _db.Updateable(feedBox).ExecuteCommandAsync();
-                    foreach(var carryCode in carryCodes)
+                    //更新投料记录条码表
+                    foreach (var carryCode in carryCodes)
                     {
                         WmsFeedingrecordCode wmsFeedingrecordCode = new();
                         wmsFeedingrecordCode.id = SnowflakeIdHelper.NextId();
@@ -97,7 +99,7 @@ namespace Tnb.WarehouseMgr
                         wmsFeedingrecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!;
                         wmsFeedingrecordCode.material_id = carryCode.material_id;
                         wmsFeedingrecordCode.material_code = carryCode.material_code;
-                        wmsFeedingrecordCode.barcode = carryCode.barcode; 
+                        wmsFeedingrecordCode.barcode = carryCode.barcode;
                         wmsFeedingrecordCode.code_batch = carryCode.code_batch;
                         wmsFeedingrecordCode.codeqty = carryCode.codeqty;
                         wmsFeedingrecordCode.unit_id = carryCode.unit_id;
@@ -106,6 +108,7 @@ namespace Tnb.WarehouseMgr
                         wmsFeedingrecordCode.create_time = DateTime.Now;
                         row = await _db.Insertable(wmsFeedingrecordCode).ExecuteCommandAsync();
                     }
+                    //更新载具
                     row = await UpdateNullCarry(carry);
                     isOk = (row > 0);
                     if (!isOk) throw Oops.Oh(ErrorCode.COM1001);