From 9f298c3a9cfc9a4d7e56e4b6e89ec09cbe9bcb88 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 27 二月 2026 15:29:35 +0800
Subject: [PATCH] 获取职员列表 接口 添加车间(部门)筛选选项
---
WebAPI/Controllers/条码管理/WEBSController.cs | 261 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 240 insertions(+), 21 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index b7e29da..3b770b7 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -1454,7 +1454,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2642,7 +2642,7 @@
TopRowCount = 0,
StartRow = 0,
Limit = 0
- };;
+ }; ;
var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
var _saveObj = JArray.Parse(_result);
@@ -5295,7 +5295,7 @@
try
{
- DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where 鏍堟澘鐮�='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
+ DataSet ds = oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where 鏍堟澘鐮�='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -5540,7 +5540,7 @@
{
//鍒犻櫎鍓嶆帶鍒�=========================================
- DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString() , "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
+ DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString(), "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
if (dds == null)
{
@@ -7856,7 +7856,7 @@
#region 绯荤粺鍙傛暟鑾峰彇
//鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗
- if (HBillType == "1204"
+ if (HBillType == "1204"
&& oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N" //鍏嶆壂鐗╂枡鏉＄爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
&& oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
&& (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
@@ -8671,7 +8671,7 @@
{
try
{
- ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
+ ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -8815,7 +8815,7 @@
#endregion
#region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿瀹㈡埛绠憋紙鎵橈級鏉＄爜 -鍑礉瑁呯鍗� 20251103
-
+
[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
[HttpGet]
public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
@@ -9303,9 +9303,9 @@
#region 鏍规嵁sn鐮佸鎵惧搴旂殑涓鐮�
[Route("WEBSController/getMiddleCodeBySn")]
[HttpGet]
- public object getMiddleCodeBySn(string HBarCode,int HStockOrgID)
+ public object getMiddleCodeBySn(string HBarCode, int HStockOrgID)
{
- DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='"+ HBarCode + "'", "Gy_CaseCodeRelation");
+ DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");
if (dss.Tables[0].Rows[0]["HCaseCode"].ToString() == "" || dss == null)
{
@@ -13874,11 +13874,11 @@
/// <returns></returns>
[Route("WEBSController/BindCarAndWH")]
[HttpGet]
- public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID,int bindsignal)
+ public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString()+","+ bindsignal, "h_p_bindingCarintoWh");
+ ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -13922,7 +13922,7 @@
// 杞Щ妯″潡
[Route("WEBSController/CheckHW")]
[HttpGet]
- public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
+ public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
{
try
{
@@ -13971,7 +13971,7 @@
[HttpGet]
public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
{
-
+
try
{
WebSoBar = null;
@@ -13983,7 +13983,7 @@
List<string> HBillNoList = new List<string>();
foreach (DataRow row in ds.Tables[0].Rows)
{
- if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())){
+ if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())) {
// 2. 鍒ゆ柇鍗曟嵁瀹℃牳鐘舵�侊紝鏌ユ壘鏈瀹℃牳鐨勫崟鎹�
WebSoBar = oWebs.get_BillBarCode_BillCheck(row["HBillNo"].ToString(), HBillType, row["HMaker"].ToString(), HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
@@ -14038,7 +14038,7 @@
{
try
{
-
+
string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -14081,14 +14081,14 @@
#region 妫�楠屽崟 鎵弿婧愬崟 鏍规嵁鍗曟嵁绫诲瀷 婧愬崟绫诲瀷 婧愬崟鍙� 瑙ｆ瀽骞惰繑鍥炴楠岄」鐩�
[Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
[HttpGet]
- public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode,string user)
+ public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
{
try
{
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
// 鍗庤垷瀹㈡埛
- if(oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
HBarCode = HBarCode.Split('-')[0];
}
@@ -14126,7 +14126,7 @@
@HEntryID={HEntryID}
", "h_p_CheckBillBarCode_CheckItem");
- if(ds.Tables[0].Rows.Count == 0)
+ if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -14140,7 +14140,7 @@
if (HBillType == 7507) // 鍗曟嵁绫诲瀷鏄湯浠舵楠屽崟 鏌ユ壘鍗曟嵁鏄惁閲嶅锛屾楠屾槸鍚﹀悎鏍硷紝鍗曟嵁閲嶅闇�瑕佽繑鍥炰笉鍚岀殑鐘舵��
{
var ds2 = oCn.RunProcReturn($"select top 1 * from QC_ProcessCheckBillMain where HMainSourceBillNo = '{HBarCode}' order by HDate desc", "QC_ProcessCheckBillMain");
- if(ds2.Tables[0].Rows.Count > 0)
+ if (ds2.Tables[0].Rows.Count > 0)
{
if (ds2.Tables[0].Rows[0]["HCheckerResult"].ToString() == "true") // 妫�楠屽悎鏍兼彁绀烘槸鍚﹂渶瑕佹柊澧�
{
@@ -14220,14 +14220,14 @@
#endregion
#region 娣诲悍鏍规嵁灏忚溅鏉＄爜鎵惧嚭鐩稿簲鐗╂枡
-
+
[Route("WEBSController/GetMaterIDByCarBarCode")]
[HttpGet]
public object GetMaterIDByCarBarCode(string CarBarCode)
{
try
{
- ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and 灏忚溅='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
+ ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and 灏忚溅='" + CarBarCode.ToString() + "'", "GetMaterMesByCarBarCode");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -14304,5 +14304,224 @@
}
}
#endregion
+
+ #region 瑁呯杩芥函
+
+ #region [瑁呯杩芥函] 鎵弿SN鏉＄爜
+ [Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
+ [HttpGet]
+ public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
+ {
+ if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鎵弿绠辨潯鐮�
+ [Route("WEBSController/get_BarCode_PackUnionCarryUp")]
+ [HttpGet]
+ public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
+ {
+ var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (oBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = oBar;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鑾峰彇琛ㄤ綋鐗╂枡淇℃伅
+ [Route("WEBSController/GetBillEntry_TmpList_PackUnionCarryUp")]
+ [HttpGet]
+ public object GetBillEntry_TmpList_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, int HStockOrgID)
+ {
+ DataSet oDs = oWebs.GetBillEntry_TmpList_PackUnionCarryUp(sInterID, sBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+ if (oDs == null || oDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鍒犻櫎
+ [Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
+ [HttpGet]
+ public object set_DelPackUnionBill_Temp_Pack(int HInterID)
+ {
+ if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 涓婁紶鐢熷崟
+ [Route("WEBSController/set_SavePackUnionCarryUpBill")]
+ [HttpPost]
+ public object set_SavePackUnionCarryUpBill(string ModRightNamePackUnionCarryUp, int sInterID,
+ string HBillType, string sBillNo, string sHBarCode_Pack,
+ string sMaker, int HStockOrgID)
+ {
+ if (!oWebs.CheckModRight(ModRightNamePackUnionCarryUp, DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 閴存潈
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閴存潈澶辫触锛岃鐢ㄦ埛鏃犳潈闄愪笂浼犲崟鎹�! "; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if(oWebs.set_SavePackUnionCarryUpBill_New(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚鐢熶骇瑁呯杩芥函鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + sBillNo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 缂栬緫缂撳瓨鍒楄〃鍗曟嵁
+ [Route("WEBSController/TempList_Modify_Pack")]
+ [HttpGet]
+ public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
+ {
+ if(oWebs.TempList_Modify_Pack(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 鎴愬姛 (鏃犲凡涓婁紶璁板綍)
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ else
+ {
+ // 澶辫触
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鑾峰彇缂撳瓨鍒楄〃
+ [Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
+ [HttpGet]
+ public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
+ if(oDs == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鍒犻櫎缂撳瓨鍒楄〃鍗曟嵁
+ [Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
+ [HttpGet]
+ public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
+ {
+ if(oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 鍒犻櫎鎴愬姛
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ else
+ {
+ // 鍒犻櫎澶辫触
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
}
}
--
Gitblit v1.9.1