From 0d4c1c24ecdcf17d1485274c1a1d64728c072af2 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 19 一月 2021 23:53:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Service/YqnQbService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 61b1fc7..652f4b8 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -166,7 +166,7 @@
public static DataSet GetGroupDb(string sWhere)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇鐝粍浠ｇ爜,HName 鐢熶骇鐝粍 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
return dataSet;
}
@@ -195,7 +195,7 @@
if (!dicLock.TryAdd(omodel.HBillNo, omodel.HBillNo))
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID("4788", ref DBUtility.ClsPub.sExeReturnInfo);
oCN.BeginTran();
var sql = "Insert Into Sc_StationOutBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
--
Gitblit v1.9.1