路由冲突

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs

@@ -13,7 +13,7 @@ namespace WY.NewJit.PrintTable
         /// </summary>
         /// <param name="productLine">生产线</param>
         /// <returns>起始大众顺序号</returns>
-        Task<ObjectResultDto<int?>> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null);
+        //Task<ObjectResultDto<int?>> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null);
 
     }
 }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml

@@ -3677,12 +3677,5 @@
             R100接收时间
             </summary>
         </member>
-        <member name="M:WY.NewJit.PrintTable.IWaitPrintAppService.GetPrintStartHostSN2(System.String,System.String,System.String)">
-            <summary>
-            根据生产线获取正常打印单据的起始大众顺序号
-            </summary>
-            <param name="productLine">生产线</param>
-            <returns>起始大众顺序号</returns>
-        </member>
     </members>
 </doc>

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs

@@ -46,7 +46,7 @@ namespace WY.NewJit.PrintTable
         /// </summary>
         private List<MaterialExt> _zhbCacheList = new List<MaterialExt>();
 
-        public IRepository<WaitPrint, Guid> _waitPrintRepository;
+        private IRepository<WaitPrint, Guid> _waitPrintRepository;
 
         /// <summary>
         /// 日志
@@ -185,7 +185,22 @@ namespace WY.NewJit.PrintTable
 
         private static string GetWhere(QueryWaitPrintDto input)
         {
+            //select * from FisWaitPrint
+            //where 1=1 and BusinessType = 1 and ProductLine = '01' and PrintType = 1  and HostSN >= 10377  and HostSN <= 10388 
+            //order by HostSN2
             string where = "";
+            if (input.BusinessType != null)
+            {
+                where += string.Format("  and BusinessType = {0}", ((int)input.BusinessType).ToString());
+            }
+            if (input.ProductLine != null)
+            {
+                where += string.Format("  and ProductLine = '{0}'", input.ProductLine);
+            }
+            if (input.PrintType != null)
+            {
+                where += string.Format("  and PrintType = {0}", ((int)input.PrintType).ToString());
+            }
             if (input.HostSNBegin != null)
             {
                 where += string.Format("  and HostSN >= {0}", input.HostSNBegin);
@@ -226,10 +241,6 @@ namespace WY.NewJit.PrintTable
             {
                 where += string.Format("  and VehicleModelCode like '%{0}%'", input.VehicleModelCode);
             }
-            if (input.ProductLine != null)
-            {
-                where += string.Format("  and ProductLine = '{0}'", input.ProductLine);
-            }
             if (input.ReceiveTimeBegin != null)
             {
                 where += string.Format("  and ReceiveTime >= '{0}'", ((DateTime)input.ReceiveTimeBegin).ToString("yyyy-MM-dd HH:mm:ss"));
@@ -242,14 +253,6 @@ namespace WY.NewJit.PrintTable
             {
                 where += string.Format("  and BillStatus = {0}", ((int)input.BillStatus).ToString());
             }
-            if (input.BusinessType != null)
-            {
-                where += string.Format("  and BusinessType = {0}", ((int)input.BusinessType).ToString());
-            }
-            if (input.PrintType != null)
-            {
-                where += string.Format("  and PrintType = {0}", ((int)input.PrintType).ToString());
-            }
             return where;
         }
 
@@ -296,6 +299,10 @@ namespace WY.NewJit.PrintTable
             return ret;
         }
 
+        private static string GetTrueString(string str)
+        {
+            return str == null ? " " : str.Trim(); ;
+        }
         #endregion
 
         #region 门板私有方法
@@ -681,7 +688,7 @@ namespace WY.NewJit.PrintTable
         }
         #endregion
 
-
+        #region 公有方法
         /// <summary>
         /// 根据生产线获取正常打印单据的起始大众顺序号2
         /// </summary>
@@ -691,8 +698,8 @@ namespace WY.NewJit.PrintTable
         /// <returns>起始大众顺序号</returns>
         [UnitOfWork]
         [HttpGet]
-        [Route("get-print-start-hostsn2")]
+        [Route("get-print-start-hostsn22")]
-        public virtual async Task<ObjectResultDto<int?>> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null)
+        public virtual async Task<ObjectResultDto<int?>> GetPrintStartHostSN22(string productLine, string isZhuHuBan, string groupName = null)
         {
 
             int? beginHostSN = null;
@@ -701,7 +708,7 @@ namespace WY.NewJit.PrintTable
                 if (isZhuHuBan == "1") //是柱护板, 根据PrintBillNum非空判断是柱护板
                 {
                     var qry = _waitPrintRepository.Where(itm =>
-                        itm.BusinessType == (BusinessTypeEnum)(GroupName.TryToIntZero())
+                        itm.BusinessType == (BusinessTypeEnum)(groupName.TryToIntZero())
                         && itm.ProductLine == productLine
                         && itm.PrintType == PrintTypeEnum.OrderPrint);
                         
@@ -775,7 +782,6 @@ namespace WY.NewJit.PrintTable
             }
         }
 
-        #region 门板打印
         /// <summary>
         /// 打印前检查大众顺序号是否断号
         /// </summary>
@@ -930,7 +936,8 @@ namespace WY.NewJit.PrintTable
                             reportMainLst.AddRange(rightLst);
                             reportMainLst.AddRange(leftLst);
                         }
-                        //校验底盘号、零件是否重复打印
+
+                        #region //校验底盘号、零件是否重复打印
                         //string checkVinPartRepeatSql = @"
                         //select top 1 a.BillNum from FisMenBanPackingList a join FisMenBanPackingRec b 
                         //    on a.Id = b.MenBanPackingListId 
@@ -956,6 +963,7 @@ namespace WY.NewJit.PrintTable
                         //        }
                         //    }
                         //}
+                        #endregion
 
                         //1.调用派格版库存接口
                         await SaveMiddleTable_MB(reportMainLst);
@@ -1034,30 +1042,8 @@ namespace WY.NewJit.PrintTable
             } //事务
         }
 
-        private static string GetTrueString(string str)
-        {
-            return str == null ? " " : str.Trim(); ;
-        }
-
         #endregion
 
-        #region 柱护板打印
-        /// <summary>
-        /// 打印前检查大众顺序号是否断号
-        /// </summary>
-        /// <param name="input"></param>
-        /// <param name="isZhuHuBan">是否柱护板</param>
-        /// <returns>断号时Item不为空</returns>
-        [UnitOfWork(false)]
-        [HttpPost]
-        [Route("check-zhb-hostsn-break-num")]
-        public virtual async Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input)
-        {
-            List<string> retLst = new List<string>();
-            return new ListResultDto<string>(retLst);
-        }
-
-        #endregion
 
     }
 }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs

@@ -24,12 +24,12 @@ using WY.NewJit.PrintTable.Dtos;
 
 namespace WY.NewJit.PrintTable
 {
-    [Route("api/newjit/wait-print")]
+    //[Route("api/newjit/wait-print")]
-    public partial class WaitPrintAppService : ApplicationService, IWaitPrintAppService
+    public partial class WaitPrintAppService
     {
         private static Dictionary<Guid, List<BillM100Part>> _m100PartDicCache;
 
-        #region 柱护板装箱单
+        #region 柱护板私有方法
         //private void DelOrScrapWMSInterface(string billNum)
         //{
         //    //重新打印时，库存系统接口如果存在已发运的正常打印单据，则不允许重新打印；如果存在未发运的正常打印单据则删除该单据
@@ -52,7 +52,6 @@ namespace WY.NewJit.PrintTable
         //    }
         //}
 
-
         /// <summary>
         /// 打印柱护板（3*8 左右合并成一个单元格）A上C上
         /// </summary>
@@ -586,10 +585,7 @@ namespace WY.NewJit.PrintTable
             }
             return null;
         }
-        #endregion
 
-
-        #region 柱护板私有方法
         /// <summary>
         /// 保存柱护板信息到中间表，中间表是位于FIS库，和WMS中间表结构相同
         /// </summary>
@@ -791,6 +787,21 @@ namespace WY.NewJit.PrintTable
         #endregion
 
         #region 柱护板公有方法
+        /// <summary>
+        /// 打印前检查大众顺序号是否断号
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="isZhuHuBan">是否柱护板</param>
+        /// <returns>断号时Item不为空</returns>
+        [UnitOfWork(false)]
+        [HttpPost]
+        [Route("check-zhb-hostsn-break-num")]
+        public virtual async Task<ListResultDto<string>> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input)
+        {
+            List<string> retLst = new List<string>();
+            return new ListResultDto<string>(retLst);
+        }
+
         /// <summary>
         /// 保存柱护板装箱单报表
         /// </summary>

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml

@@ -1982,7 +1982,7 @@
             </summary>
             <param name="input"></param>
         </member>
-        <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.GetPrintStartHostSN2(System.String,System.String,System.String)">
+        <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.GetPrintStartHostSN22(System.String,System.String,System.String)">
             <summary>
             根据生产线获取正常打印单据的起始大众顺序号2
             </summary>
@@ -2006,14 +2006,6 @@
             <param name="input"></param>
             <returns>断号时Item不为空</returns>
         </member>
-        <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.CheckZHBHostSNBreakNum(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
-            <summary>
-            打印前检查大众顺序号是否断号
-            </summary>
-            <param name="input"></param>
-            <param name="isZhuHuBan">是否柱护板</param>
-            <returns>断号时Item不为空</returns>
-        </member>
         <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.DoZHBPrint_3x8_LRMerge(System.String,WY.NewJit.Extends.ZhuHuBanPrintInputDto,System.Int64,System.Double,System.DateTime,System.Collections.Generic.List{WY.NewJit.PrintTable.WaitPrint},System.String)">
             <summary>
             打印柱护板（3*8 左右合并成一个单元格）A上C上
@@ -2089,6 +2081,14 @@
             <param name="isFillBreakNum"></param>
             <returns></returns>
         </member>
+        <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.CheckZHBHostSNBreakNum(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
+            <summary>
+            打印前检查大众顺序号是否断号
+            </summary>
+            <param name="input"></param>
+            <param name="isZhuHuBan">是否柱护板</param>
+            <returns>断号时Item不为空</returns>
+        </member>
         <member name="M:WY.NewJit.PrintTable.WaitPrintAppService.SaveGroupZhuHuBanReport(WY.NewJit.Extends.ZhuHuBanPrintInputDto)">
             <summary>
             保存柱护板装箱单报表