From bd76b282500a2f36d1809f91c4407873c758b0f9 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 28 十二月 2021 23:23:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Service/YqnDal.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Service/YqnDal.cs b/WebAPI/Service/YqnDal.cs
index 3576bf2..06fe816 100644
--- a/WebAPI/Service/YqnDal.cs
+++ b/WebAPI/Service/YqnDal.cs
@@ -19,7 +19,7 @@
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' ");
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
sqlBuilder.Append(" and HProcID=@hProcID");
var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo,hProcID });
return model;
@@ -34,7 +34,7 @@
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') ");
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
sqlBuilder.Append(" and HProcID=@hProcID");
var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo, hProcID });
return model;
@@ -47,7 +47,7 @@
public static List<Models.M_StationBillMail> GetStationInBillMailList(string icBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
- sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HICMOBillNo=@icBillNo");
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HProcExchBillNo=@icBillNo");
var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
return list;
}
@@ -59,7 +59,7 @@
public static List<Models.M_StationBillMail> GetStationOutBillMailList(string icBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
- sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HICMOBillNo=@icBillNo");
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HProcExchBillNo=@icBillNo");
var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
return list;
}
--
Gitblit v1.9.1