From 3507c8fbd29dc688b55a10ff360c5ccd74a9df24 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 12 九月 2025 08:21:19 +0800
Subject: [PATCH] 凯贝顺达客户条码生成方式修改，PDA相关仓库扫码、仓库列表数据返回调用方法新增修改
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 24 ++----------
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 50 ++++++++++++++++++------
WebAPI/Controllers/条码管理/WEBSController.cs | 40 +++++++++++++++++++
WarM/条码打印/Gy_CusBarCodeBillList.cs | 2
4 files changed, 81 insertions(+), 35 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBillList.cs"
index 02ea1ae..568319f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBillList.cs"
@@ -291,7 +291,7 @@
if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
{
Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
+ Report.Print(true); //閫掑叆false鏃朵笉寮瑰嚭鎵撳嵃鏈鸿缃锛宼rue鏃跺脊鍑烘墦鍗版満璁剧疆妗�
Thread.Sleep(1000);
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index 10a9269..7feb8f3 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -281,11 +281,7 @@
cmbHCusName.DisplayMember = "HName";
cmbHCusName.ValueMember = "HItemID";
- if (cmbHCusName.Text.Contains("椤鸿揪"))
- {
- HBarCodeType = "椤鸿揪鏍囩";
- }
- else if (cmbHCusName.Text.Contains("閿愭嵎"))
+ if (cmbHCusName.Text.Contains("閿愭嵎"))
{
HBarCodeType = "閿愭嵎鏍囩";
}
@@ -676,15 +672,7 @@
HMaterNumber = HMaterNumber.Substring(HMaterNumber.Length - 3, 3); //鍙栫墿鏂欎唬鐮佸悗涓変綅
string sHCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); //瀹㈡埛浠ｇ爜锛堝彇閲戣澏瀹㈡埛鐗╂枡瀵瑰簲琛ㄥ鎴风墿鏂欑紪鐮侊級
- if (HBarCodeType == "椤鸿揪鏍囩")
- {
- LSHlen = 6;
- //鏉＄爜鍓嶇紑 = 'B103288'+骞村懆
- sTMNumber = "B103288" + sYearWeek;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
- }
- else if (HBarCodeType == "閿愭嵎鏍囩")
+ if (HBarCodeType == "閿愭嵎鏍囩")
{
LSHlen = 5;
//鏉＄爜鍓嶇紑 = 瀹㈡埛鏂欏彿+渚涘簲鍟嗕唬鐮侊紙鍥哄畾'264'锛�+骞存湀鏃ワ紙20250705锛�
@@ -764,7 +752,7 @@
LSH2 = "0" + LSH2;
}
- if (HBarCodeType == "椤鸿揪鏍囩" || HBarCodeType == "閿愭嵎鏍囩" || HBarCodeType == "鍗庡嫟鏍囩" || HBarCodeType == "鑻变笟杈炬爣绛�")
+ if (HBarCodeType == "閿愭嵎鏍囩" || HBarCodeType == "鍗庡嫟鏍囩" || HBarCodeType == "鑻变笟杈炬爣绛�")
{
TM = sTMNumber + LSH2;
}
@@ -1682,11 +1670,7 @@
#region 閫夋嫨瀹㈡埛
private void cmbHCusName_TextChanged(object sender, EventArgs e)
{
- if (cmbHCusName.Text.Contains("椤鸿揪"))
- {
- HBarCodeType = "椤鸿揪鏍囩";
- }
- else if (cmbHCusName.Text.Contains("閿愭嵎"))
+ if (cmbHCusName.Text.Contains("閿愭嵎"))
{
HBarCodeType = "閿愭嵎鏍囩";
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index a4189fb..9d21881 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -65,9 +65,10 @@
public const Int16 HEXPPERIODCol = 43;
public const Int16 HLSHCol = 44;
public const Int16 HBaNoCol = 45;
+ public const Int16 HCusModelCol = 46;
//
public string ModName = "85";
- public string ModCaption = "娴疆銆佸厓鑴戝鎴锋爣绛剧敓鎴�";
+ public string ModCaption = "娴疆銆佸厓鑴戙�侀『杈惧鎴锋爣绛剧敓鎴�";
public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_LangChao";
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -79,7 +80,7 @@
public int selectRow = 0;
public Int64 HInterID = 0; //鍐呯爜
public Int64 HOrgID = ClsPub.HOrgID;
- public string HCusModel = "Z"; //鍘傚晢浠ｇ爜
+ public string HCS = "Z"; //鍘傚晢浠ｇ爜
public string sDate = ""; //鏃ユ湡
public string sYear = ""; //骞达紙2浣嶏級
public string sYear4 = ""; //骞达紙4浣嶏級
@@ -580,7 +581,7 @@
string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
HCode2 = HCode2.ToUpper();
string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // 鐗堟湰鍙�
- string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCS; // 鎵规鐢熸垚鍓嶇紑
HBatchNoNumber = HBatchNoNumber.ToUpper();
string HBarCodeType = cmbHCusName.Text; // 鏉＄爜绫诲瀷
string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // 瀹㈡埛璁㈠崟鍙�
@@ -663,6 +664,7 @@
{
string TM = ""; //鏉＄爜
int LSHlen = 4; //娴佹按鍙烽暱搴�
+ int LWSHlen = 5; //澶栫娴佹按鍙烽暱搴�
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鍐呯鏈�灏忓寘瑁呮暟
int HBQty = 0; //鍐呯鏁�
@@ -687,6 +689,7 @@
double HQty = 0; //鏁伴噺
Int64 HCusID = 0; //瀹㈡埛ID
string HCusModelName = ""; //瀹㈡埛鏂欏彿
+ string HCusModel = ""; //瀹㈡埛鐗╂枡鍚嶇О
bool HGiveAwayFlag = false; //璧犲搧鏍囪
string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
@@ -730,7 +733,7 @@
string sHCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
string sHCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
sHCode2 = sHCode2.ToUpper();
- string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCS; // 鎵规鐢熸垚鍓嶇紑
HBatchNoNumber = HBatchNoNumber.ToUpper();
DataSet oDsBatchNo = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo '" + sHSourceBillNo + "'," + sHMaterID.ToString() + ",'" + sHMaterNumber + "','" + sHCusModelName + "','" + sHCode2 + "','" + HBatchNoNumber + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo");
@@ -797,6 +800,10 @@
{
HBarCodeType = "鍏冭剳鍐呯鐮�";
}
+ else if (cmbHCusName.Text.Contains("椤鸿揪"))
+ {
+ HBarCodeType = "椤鸿揪鍐呯鐮�";
+ }
else
{
HBarCodeType = "鍐呯鐮�";
@@ -807,6 +814,7 @@
HQty = HMinQty;
HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
@@ -824,11 +832,11 @@
HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = LSH;
- HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
HBoxNo = HBoxNo.ToUpper();
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸鎴风墿鏂欏悕绉癏CusModel
//鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo銆佸勾鍛℉WorkLineName
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
@@ -870,6 +878,7 @@
HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
if (cmbHCusName.Text.Contains("鍏冭剳"))
{
+ LWSHlen = 5;
HBarCodeType = "鍏冭剳澶栫鐮�";
//鑾峰彇鏈�澶ф祦姘村彿
//鏉＄爜鍓嶇紑 = 'CA'+骞村懆
@@ -877,12 +886,23 @@
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
+ else if (cmbHCusName.Text.Contains("椤鸿揪"))
+ {
+ LWSHlen = 6;
+ HBarCodeType = "椤鸿揪澶栫鐮�";
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鏉＄爜鍓嶇紑 = 'B103288'+骞村懆
+ sTMNumber = "B103288" + sYearWeek;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
else
{
+ LWSHlen = 5;
HBarCodeType = "澶栫鐮�";
//鑾峰彇鏈�澶ф祦姘村彿
//鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
- sTMNumber = HCusModel + sYear4 + sPeriod2 + sDay;
+ sTMNumber = HCS + sYear4 + sPeriod2 + sDay;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
@@ -905,7 +925,7 @@
//
LWSH = LWSH + 1;
LSH2 = LWSH.ToString();
- while (LSH2.Length < 5) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 5 鍓嶉潰琛�0
+ while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
{
LSH2 = "0" + LSH2;
}
@@ -919,6 +939,7 @@
HQty = HWMinQty;
HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
@@ -936,11 +957,11 @@
HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = 0;
- HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
HBoxNo = HBoxNo.ToUpper();
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸鎴风墿鏂欏悕绉癏CusModel
//鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo銆佸勾鍛℉WorkLineName
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
@@ -993,7 +1014,7 @@
private void Display()
{
//鍒锋柊鍐呯鐮佸垪琛�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鍐呯鐮�' or 鏉＄爜绫诲瀷='鍏冭剳鍐呯鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鍐呯鐮�' or 鏉＄爜绫诲瀷='鍏冭剳鍐呯鐮�' or 鏉＄爜绫诲瀷='椤鸿揪鍐呯鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -1004,7 +1025,7 @@
grdSub.DataSource = DSet.Tables[0].DefaultView;
//鍒锋柊澶栫鐮佸垪琛�
- DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='澶栫鐮�' or 鏉＄爜绫诲瀷='鍏冭剳澶栫鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='澶栫鐮�' or 鏉＄爜绫诲瀷='鍏冭剳澶栫鐮�' or 鏉＄爜绫诲瀷='椤鸿揪澶栫鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DWSet == null)
{
@@ -1064,7 +1085,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 46; //鎬诲垪鏁�
+ grdMain.ColumnCount = 47; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1076,6 +1097,7 @@
grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛鏂欏彿";
+ grdMain.Columns[HCusModelCol].HeaderText = "瀹㈡埛鐗╂枡鍚嶇О";
grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
@@ -1892,10 +1914,12 @@
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
grdMain.Rows[j].Cells[HCusModelNameCol].Value = "";
+ grdMain.Rows[j].Cells[HCusModelCol].Value = "";
}
else
{
grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
+ grdMain.Rows[j].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationName"]);
if (num == 2)
{
grdMain.Rows[j].Cells[HCode1Col].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCode1"]);
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 2b95002..064ccda 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"
@@ -381,7 +381,7 @@
{
Int64 HWhID = 0;
HWhID = DBUtility.ClsPub.isLong(HBarCode.Replace("HWH", ""));
- ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HSPFlag from Gy_Warehouse with(nolock) where HStopflag=0 and HItemID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Warehouse");
+ ds = oCn.RunProcReturn("exec h_p_Gy_Warehouse_PDA " + HWhID.ToString() + "," + HStockOrgID.ToString(), "h_p_Gy_Warehouse_PDA");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -409,6 +409,44 @@
}
}
+ /// <summary>
+ /// 鑾峰彇PDA浠撳簱鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetWarehouseList_Json")]
+ [HttpGet]
+ public object GetWarehouseList_Json(string Warehouse, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_Gy_WarehouseList_PDA '" + Warehouse + "'," + HStockOrgID.ToString(), "h_p_Gy_WarehouseList_PDA");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍浠撳簱璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖浠撳簱淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
#region 浠撲綅璧勬枡
--
Gitblit v1.9.1