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

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs

@@ -4,6 +4,5 @@ namespace Tnb.ProductionMgr.Entities.Dto
     {
         public string equip_code { get; set; }
         public string label_code { get; set; }
-        public string as_location_code { get; set; }
     }
 }

ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs

@@ -43,5 +43,12 @@ namespace Tnb.ProductionMgr.Interfaces
         /// <param name="input"></param>
         /// <returns></returns>
         public Task<string> InstockTubeThree(PrdReport prdReport);
+        
+        /// <summary>
+        /// 外包装入库申请
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public Task<string> InstockOutPack(InstockInput inut);
     }
 }

ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs

@@ -263,7 +263,6 @@ namespace Tnb.ProductionMgr
         {
             string equip_code = inut.equip_code;
             string label_code = inut.label_code;
-            string as_location_code = inut.as_location_code;
             string warehouse_id = "2";
             if (!string.IsNullOrEmpty(equip_code))
             {
@@ -621,5 +620,15 @@ namespace Tnb.ProductionMgr
 
             return result2.IsSuccess ? "true" : "false";
         }
+
+        /// <summary>
+        /// 外包装入库申请
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public Task<string> InstockOutPack(InstockInput inut)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs

@@ -18,6 +18,6 @@ namespace Tnb.WarehouseMgr.Entities.Entity.Constraints
         /// <summary>
         /// 是否检验
         /// </summary>
-        public int? is_check { get;}
+        public int? is_check { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs

@@ -208,6 +208,9 @@ namespace Tnb.WarehouseMgr
                         }
                     }
                 }
+                else {
+                    throw new AppFriendlyException("没有匹配的空载具可以出库", 500);
+                }
 
                 await _db.Ado.CommitTranAsync();
             }

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs

@@ -122,7 +122,21 @@ namespace Tnb.WarehouseMgr
 
         protected async Task<bool> UpdateChackStatus<TEntity>(MesCheckdCallbackUpinput input) where TEntity : BaseEntity<string>, InOutCheckStatusUpdateEntity, new()
         {
-            var isOk = await _db.Updateable<TEntity>().SetColumns(it => it.check_conclusion == input.check_conclusion).Where(it => it.id == input.maintableid).ExecuteCommandHasChangeAsync();
+            var stock = await _db.Queryable<TEntity>().SingleAsync(it => it.id == input.maintableid);
+            stock.check_conclusion = input.check_conclusion;
+            stock.is_check = 1;
+            var isOk = await _db.Updateable(stock).UpdateColumns(it => new { it.check_conclusion, it.is_check }).ExecuteCommandHasChangeAsync();
+            var preTask = await _db.Queryable<WmsPretaskH>().FirstAsync(it => it.require_id == input.maintableid);
+            if (preTask != null)
+            {
+                var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == preTask.carry_id);
+                if (carry != null)
+                {
+                    carry.check_conclusion = input.check_conclusion;
+                    carry.is_check = 1;
+                    isOk = await _db.Updateable(carry).UpdateColumns(it => new { it.check_conclusion, it.is_check }).ExecuteCommandHasChangeAsync();
+                }
+            }
             return isOk;
         }