From dcbb1bd3499f2b90cc2a9457959c1f4dcab714a1 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 25 二月 2021 22:41:55 +0800
Subject: [PATCH] 进出站
---
WebAPI/Service/YqnQbService.cs | 4 ++--
WebAPI/Service/YqnDal.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Service/YqnDal.cs b/WebAPI/Service/YqnDal.cs
index 3576bf2..b5e1b93 100644
--- a/WebAPI/Service/YqnDal.cs
+++ b/WebAPI/Service/YqnDal.cs
@@ -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;
}
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index b35aa2f..1517b2f 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -98,10 +98,10 @@
{
if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
- var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
+ var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
if (stationInList.Count > 0)
{
- var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
+ var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//鑾峰彇杩涚珯鍗曟渶鏂拌繘绔欏伐搴�
if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
--
Gitblit v1.9.1