From 0ff18a7500fd1ec0c2b96c371b35d944a9bb5f0b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 01 四月 2023 10:40:53 +0800
Subject: [PATCH] 扫流转卡，扫仓库码，派工单。
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 9820ef3..8181040 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -72,8 +72,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
- if (HProcNo <= 0)
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ if (HProcNo == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -95,7 +95,7 @@
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
int HBillStatus = 0;
- string HMaker = list[0].HMaker;//鍒跺崟浜�
+ string HMaker = user;//鍒跺崟浜�
int HYear = 2021;
double HPeriod = 1;
string HRemark = list[0].HRemark;//澶囨敞
@@ -1042,5 +1042,61 @@
}
}
#endregion
+
+ #region 杩斿洖鐢ㄦ埛鑾峰彇榛樿鍊煎垪琛�
+ [Route("Cj_StationInBill/GetDefValByUser")]
+ [HttpGet]
+ public object GetDefValByUser(string Czybm, string Czymc)
+ {
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (Czymc == null || Czymc.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser", "h_v_Cj_GetDefValByUser");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cj_GetDefValByUser where 1 = 1 ";
+ string sql = sql1 + " and 鐢ㄦ埛缂栫爜 ='" + Czybm + "' and 鐢ㄦ埛鍚嶇О ='" + Czymc + "'";
+ ds = oCN.RunProcReturn(sql, "h_v_Cj_GetDefValByUser");
+ }
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1