diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs
index f96ddbe..1e4c70d 100644
--- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs
+++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Interfaces/IWaitPrintAppService.cs
@@ -13,7 +13,7 @@ namespace WY.NewJit.PrintTable
///
/// 生产线
/// 起始大众顺序号
- Task> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null);
+ //Task> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null);
}
}
diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
index 8306222..df4e10b 100644
--- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
+++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
@@ -3677,12 +3677,5 @@
R100接收时间
-
-
- 根据生产线获取正常打印单据的起始大众顺序号
-
- 生产线
- 起始大众顺序号
-
diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs
index 50ecaa8..a4ee41b 100644
--- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs
+++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs
@@ -46,7 +46,7 @@ namespace WY.NewJit.PrintTable
///
private List _zhbCacheList = new List();
- public IRepository _waitPrintRepository;
+ private IRepository _waitPrintRepository;
///
/// 日志
@@ -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 公有方法
///
/// 根据生产线获取正常打印单据的起始大众顺序号2
///
@@ -691,8 +698,8 @@ namespace WY.NewJit.PrintTable
/// 起始大众顺序号
[UnitOfWork]
[HttpGet]
- [Route("get-print-start-hostsn2")]
- public virtual async Task> GetPrintStartHostSN2(string productLine, string isZhuHuBan, string GroupName = null)
+ [Route("get-print-start-hostsn22")]
+ public virtual async Task> 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 门板打印
///
/// 打印前检查大众顺序号是否断号
///
@@ -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 柱护板打印
- ///
- /// 打印前检查大众顺序号是否断号
- ///
- ///
- /// 是否柱护板
- /// 断号时Item不为空
- [UnitOfWork(false)]
- [HttpPost]
- [Route("check-zhb-hostsn-break-num")]
- public virtual async Task> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input)
- {
- List retLst = new List();
- return new ListResultDto(retLst);
- }
-
- #endregion
}
}
diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs
index 0e07044..e3de8e6 100644
--- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs
+++ b/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")]
- public partial class WaitPrintAppService : ApplicationService, IWaitPrintAppService
+ //[Route("api/newjit/wait-print")]
+ public partial class WaitPrintAppService
{
private static Dictionary> _m100PartDicCache;
- #region 柱护板装箱单
+ #region 柱护板私有方法
//private void DelOrScrapWMSInterface(string billNum)
//{
// //重新打印时，库存系统接口如果存在已发运的正常打印单据，则不允许重新打印；如果存在未发运的正常打印单据则删除该单据
@@ -52,7 +52,6 @@ namespace WY.NewJit.PrintTable
// }
//}
-
///
/// 打印柱护板（3*8 左右合并成一个单元格）A上C上
///
@@ -586,10 +585,7 @@ namespace WY.NewJit.PrintTable
}
return null;
}
- #endregion
-
- #region 柱护板私有方法
///
/// 保存柱护板信息到中间表，中间表是位于FIS库，和WMS中间表结构相同
///
@@ -791,6 +787,21 @@ namespace WY.NewJit.PrintTable
#endregion
#region 柱护板公有方法
+ ///
+ /// 打印前检查大众顺序号是否断号
+ ///
+ ///
+ /// 是否柱护板
+ /// 断号时Item不为空
+ [UnitOfWork(false)]
+ [HttpPost]
+ [Route("check-zhb-hostsn-break-num")]
+ public virtual async Task> CheckZHBHostSNBreakNum(ZhuHuBanPrintInputDto input)
+ {
+ List retLst = new List();
+ return new ListResultDto(retLst);
+ }
+
///
/// 保存柱护板装箱单报表
///
diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml
index 8583222..5a95456 100644
--- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml
+++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml
@@ -1982,7 +1982,7 @@
-
+
根据生产线获取正常打印单据的起始大众顺序号2
@@ -2006,14 +2006,6 @@
断号时Item不为空
-
-
- 打印前检查大众顺序号是否断号
-
-
- 是否柱护板
- 断号时Item不为空
-
打印柱护板（3*8 左右合并成一个单元格）A上C上
@@ -2089,6 +2081,14 @@
+
+
+ 打印前检查大众顺序号是否断号
+
+
+ 是否柱护板
+ 断号时Item不为空
+
保存柱护板装箱单报表