From 60c33d122fed78adebb7cb9e85ab8dff3d7aa72a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 12 六月 2025 16:26:25 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 310 insertions(+), 44 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index cb0f9a4..8409a77 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1,4 +1,5 @@
-锘縰sing DBUtility;
+锘縰sing DAL;
+using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
@@ -68,7 +69,7 @@
}
else
{
- list.Add("");
+ list.Add(CampanyName);
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -126,12 +127,17 @@
list.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
list.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
}
+ else if (sCapName == "娣诲悍绉戞妧")
+ {
+ list.Add("鍞竴鏉＄爜");
+ list.Add("鎵规鏉＄爜");
+ }
else
{
list.Add("鍞竴鏉＄爜");
list.Add("鍝佺鏉＄爜");
list.Add("鎵规鏉＄爜");
- //list.Add("鎵樼洏鏉＄爜");
+ list.Add("鎵樼洏鏉＄爜");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -155,6 +161,7 @@
[HttpGet]
public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
List<object> columnNameList = new List<object>();
try
{
@@ -176,39 +183,70 @@
case "鐢熶骇璁㈠崟":
tabname = "h_v_IFCLD_ICMOBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇姹囨姤鍗�":
tabname = "h_v_IF_ICMOReportBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "閲囪喘璁㈠崟":
tabname = "h_v_IF_POOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鏀舵枡閫氱煡鍗�":
tabname = "h_v_IF_POInStockBillList_Source";
- count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
+ else
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
break;
case "濮斿璁㈠崟":
tabname = "h_v_IF_EntrustOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "閫�璐ч�氱煡鍗�":
+ case "鐢熶骇鍏ュ簱鍗�":
+ tabname = "h_v_IF_ProductInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProductInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "鍏朵粬鍏ュ簱鍗�":
+ case "閲囪喘鍏ュ簱鍗�":
+ tabname = "h_v_IF_POStockInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POStockInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "鐩存帴璋冩嫧鍗�":
- break;
- case "閲囪喘閫�鏂欏崟":
+ case "閿�鍞��璐у崟":
+ tabname = "h_v_IF_SellOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBackBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇閫�鏂欏崟":
+ tabname = "h_v_IF_MateOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "缁勮鎷嗗嵏鍗�":
+ case "宸ュ簭娴佽浆鍗�":
+ tabname = "h_v_IF_ProcessExchangeBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "閿�鍞嚭搴撳崟":
+ tabname = "h_v_IF_SellOutBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "棰嗘枡鍑哄簱鍗�":
+ tabname = "h_v_IF_MateOutBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
default:
break;
@@ -217,8 +255,8 @@
string aa = ds.Tables[0].Columns[0].ToString();
//ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
//ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
- ds.Tables[0].Columns["hmainid"].ColumnName= "HMainID";
- ds.Tables[0].Columns["hsubid"].ColumnName= "HSubID";
+ ds.Tables[0].Columns["hmainid"].ColumnName = "HMainID";
+ ds.Tables[0].Columns["hsubid"].ColumnName = "HSubID";
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -326,6 +364,12 @@
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
+ case "1205": //閿�鍞嚭搴撳崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_SellOutBillList_BarCode where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SellOutBillList_BarCode");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
case "1102": //閲囪喘璁㈠崟
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList");
@@ -344,6 +388,30 @@
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
+ case "1202": //鐢熶骇鍏ュ簱
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_ProductInBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_ProductInBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1201": //閲囪喘鍏ュ簱
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_POStockInBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1247": //閿�鍞��璐�
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_SellOutBackBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_SellOutBackBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1244": //鐢熶骇閫�鏂�
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_MateOutBackBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_MateOutBackBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
case "1403": //閫�璐ч�氱煡鍗�
break;
case "1203": //鍏朵粬鍏ュ簱鍗�
@@ -352,9 +420,19 @@
break;
case "1239": //閲囪喘閫�鏂欏崟
break;
- case "1244": //鐢熶骇閫�鏂欏崟
- break;
case "1255": //缁勮鎷嗗嵏鍗�
+ break;
+ case "3772": //宸ュ簭娴佽浆鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_ProcessExchangeList where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1204": //棰嗘枡鍑哄簱鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_MateOutBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString(), "h_p_Gy_BarCodeBill_MateOutBillList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
default:
break;
@@ -380,6 +458,7 @@
public object HSourceOrderList(DataTable dt, HSouceOrderList ordrlist,string HBarCodeType)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
for (int i = 0; i < dt.Rows.Count; i++)
{
ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -416,6 +495,17 @@
ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString();
ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ ordrlist.HGroupID = Convert.ToInt32(dt.Rows[i]["HBeginWorkGroupID"]);
+ ordrlist.HGroupNumber = dt.Rows[i]["寮�宸ョ彮缁勪唬鐮�"].ToString();
+ ordrlist.HGroupName = dt.Rows[i]["寮�宸ョ彮缁勫悕绉�"].ToString();
+ ordrlist.HEmpID = Convert.ToInt32(dt.Rows[i]["HBeginWorkEmpID"]);
+ ordrlist.HEmpNumber = dt.Rows[i]["寮�宸ヤ汉浠ｇ爜"].ToString();
+ ordrlist.HEmpName = dt.Rows[i]["寮�宸ヤ汉鍚嶇О"].ToString();
+ }
+
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -434,6 +524,7 @@
public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
for (int i = 0; i < dt.Rows.Count; i++)
{
ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -460,9 +551,12 @@
if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
{
- ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
- ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
- ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�")
+ {
+ ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
+ ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ }
}
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
@@ -502,7 +596,7 @@
ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
ordrlist.HCusName= dt.Rows[i]["瀹㈡埛"].ToString();
}
- if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�")
+ if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�" || HSourceBillType == "棰嗘枡鍑哄簱鍗�")
{
ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
@@ -511,10 +605,58 @@
ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
}
+ if(HSourceBillType == "閿�鍞嚭搴撳崟")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ //ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ //ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ //ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
}
return ordrlist;
}
+ //鏍规嵁TABLE鍐欏叆鐣岄潰(鍑哄叆搴撳崟鎹�)
+ private object Sub_WriteInForm_InOut(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType, string HSourceBillType)
+ {
+
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HinitQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["HMainID"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["HSubID"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵瑰彿"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
+ ordrlist.HAuxPropNumber = dt.Rows[i]["杈呭姪灞炴�т唬鐮�"].ToString();
+ ordrlist.HAuxPropName = dt.Rows[i]["杈呭姪灞炴��"].ToString();
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString();
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ }
+ return ordrlist;
+ }
#endregion
#region [鍚屾璧勬枡]
@@ -557,13 +699,13 @@
if (oDs == null && oDs.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "1";
- objJsonResult.Message="鐢熸垚鎵规澶辫触锛�";
+ objJsonResult.Message= "[0000-2-053]鐢熸垚鎵规澶辫触锛�";
return objJsonResult;
}
else if (DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0][0]) == "1")
{
objJsonResult.code = "1";
- objJsonResult.Message = "鐢熸垚鎵规鎴愬姛锛�";
+ objJsonResult.Message = "[0000-2-054]鐢熸垚鎵规鎴愬姛锛�";
objJsonResult.data = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
HBatchNo = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
b = true;
@@ -574,7 +716,7 @@
if (b == false)
{
objJsonResult.code = "1";
- objJsonResult.Message="娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒";
+ objJsonResult.Message= "[3899-2-003]娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒";
return objJsonResult;
}
else //瀹屽叏灏侀棴
@@ -596,10 +738,11 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string HOrgType = sArray[1].ToString();
- string HSourceBillType = sArray[2].ToString();
+ string HSourceBillTypeName = sArray[2].ToString();
string HSelectBarCodeType = sArray[3].ToString();
string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
string UserName = sArray[5].ToString();
+ ClsPub.CurUserName = UserName;
//鑾峰彇鍐呯爜
HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -614,7 +757,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閫夋嫨缁勭粐鏈夐敊璇�!";
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
return objJsonResult;
}
if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
@@ -628,14 +771,14 @@
else
{
//鐢熸垚鏉＄爜
- SaveBarCode(msg2, HSelectBarCodeType, CampanyName);
+ SaveBarCode(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
}
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触!"+e.Message;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
return objJsonResult;
}
return objJsonResult;
@@ -668,7 +811,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇�";
+ objJsonResult.Message = "[3899-2-007]鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇�";
return false;
}
else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
@@ -690,7 +833,7 @@
#endregion
#region[鏉＄爜鐢熸垚鏂规硶]
- private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName)
+ private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName,string HSourceBillTypeName)
{
int LSHlen = 6; //娴佹按鍙烽暱搴�
int SumLen = 10; //鎬婚暱搴�
@@ -724,6 +867,12 @@
decimal HAuxQty = 0;
string HheatNO = "";
+ Int64 HGroupID = 0;
+ long HEmpID = 0;
+ string HCusModel = ""; //瀹㈡埛鐗╂枡瑙勬牸
+ string HCusMaterName = ""; //瀹㈡埛鐗╂枡鍚嶇О
+ string HCheckEmpName = ""; //妫�楠屽憳鍚嶇О
+
DataSet Ds;
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -742,6 +891,11 @@
HFactory = ClsPub.isStrNull(ordrlist[j].HFactory);
HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty);
HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO);
+ HGroupID = ClsPub.isInt(ordrlist[j].HGroupID);
+ HEmpID = ClsPub.isLong(ordrlist[j].HEmpID);
+ HCusModel = ClsPub.isStrNull(ordrlist[j].HCusModel);
+ HCusMaterName = ClsPub.isStrNull(ordrlist[j].HCusMaterName);
+ HCheckEmpName = ClsPub.isStrNull(ordrlist[j].HCheckEmpName);
//鏃ユ湡鑾峰彇鏂瑰紡
sDate = DateTime.Now.ToString();
//
@@ -754,6 +908,10 @@
sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate);
}
else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ else if (CampanyName == "涔濊彵")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
{
sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
}
@@ -795,6 +953,72 @@
Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (CampanyName == "鐟炰笌绁�") {
+ var date = DateTime.Now.ToString("yyMMdd");//鏃ユ湡
+ if (HSourceBillTypeName == "鏀舵枡閫氱煡鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-渚涘簲鍟嗕唬鐮�-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+
+ DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_TEZV_BASE from AIS20220308151944..T_PUR_Receive a
+inner join AIS20220308151944..T_PUR_RECEIVEENTRY b on a.FID = b.FID
+left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_TEZV_BASE=pr.FID
+where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PUR_Receive");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_TEZV_BASE"].ToString() + "-" + date + "-" + ordrlist[j].HSupNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-" + date + "-" + ordrlist[j].HSupNumber + "-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (HSourceBillTypeName == "鐢熶骇鍏ュ簱鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-缁勭粐浠ｇ爜-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+ DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_bsv_Base1,a.FPRDORGID from AIS20220308151944..T_PRD_INSTOCK a
+inner join AIS20220308151944..T_PRD_INSTOCKENTRY b on a.FID = b.FID
+join(
+select HERPInterID, HERPEntryID, HInterID, HEntryID from Kf_ICStockBillSub
+)kf on b.FID = kf.HERPInterID and b.FENTRYID = kf.HERPEntryID
+left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_bsv_Base1=pr.FID
+where kf.HInterID = {ordrlist[j].HMainID} and kf.HEntryID = {ordrlist[j].HSubID}", "T_PRD_INSTOCK");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+ string RQHNumber = "";
+ if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100014")//姹熻嫃
+ {
+ RQHNumber = "1.07.008";
+ }
+ else if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100012")//涓婃捣
+ {
+ RQHNumber = "1.04.008";
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_bsv_Base1"].ToString() + "-" + date + "-" + RQHNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-"+ date + "-缁勭粐浠ｇ爜-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
}
else //閫氱敤鏂规硶
{
@@ -889,10 +1113,14 @@
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
}
- //else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
- //{
- // TM = HOrgNumber + HNumber + LSH2;
- //}
+ else if (HSelectBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ LSHlen = 4; //娴佹按鍙烽暱搴�
+ //鏉＄爜鍓嶇紑 = 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
else
{
objJsonResult.code = "0";
@@ -932,7 +1160,7 @@
{
LSH2 = "0" + LSH2;
}
- if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ if (HSelectBarCodeType == "鍞竴鏉＄爜" || HSelectBarCodeType == "鎵樼洏鏉＄爜")
{
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
@@ -1018,6 +1246,12 @@
barcode.HFactory = ordrlist[j].HFactory;
barcode.HAuxQty = ordrlist[j].HAuxQty;
barcode.HheatNO = ordrlist[j].HheatNO;
+
+ barcode.HGroupID2 = ordrlist[j].HGroupID;
+ barcode.HEmpID2 = ordrlist[j].HEmpID;
+ barcode.HCusModel2 = ordrlist[j].HCusModel;
+ barcode.HCusMaterName2 = ordrlist[j].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[j].HCheckEmpName;
ListRows.Add(barcode);
k = k + 1;
n = n + 1;
@@ -1034,7 +1268,7 @@
double HQty2 = 0;
string HBatchNo2 = "";
Int64 HSupID = 0;
- Int64 HGroupID = 0;
+ Int64 HGroupID2 = 0;
int HPrintQty = 0;
Int64 HSourceInterID = 0;
Int64 HSourceEntryID = 0;
@@ -1066,6 +1300,11 @@
string HheatNO2 = "";
DateTime HProduceDate;
DateTime HExpiryDate;
+ long HEmpID2 = 0;
+ string HCusModel2 = "";
+ string HCusMaterName2 = "";
+ string HCheckEmpName2 = "";
+
try
{
oCN.BeginTran();
@@ -1080,6 +1319,10 @@
if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
{
HBarCodeType = "鍞竴鏉＄爜";
+ }
+ if (CampanyName == "涔濊彵")
+ {
+ HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
}
//
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
@@ -1118,6 +1361,11 @@
HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
+ HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
+ HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
+ HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
+ HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+ HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1126,16 +1374,17 @@
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
- ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
- + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
+ + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
//HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
@@ -1170,6 +1419,23 @@
//澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
//
+
+
+ //鏉＄爜鐢熸垚鏃跺悓姝ョ敓鎴愭潯鐮佸嚭鍏ュ簱璁板綍
+ if (HSourceBillTypeName.Trim() == "鐢熶骇鍏ュ簱鍗�" || HSourceBillTypeName.Trim() == "閲囪喘鍏ュ簱鍗�"
+ || HSourceBillTypeName.Trim() == "閿�鍞��璐у崟" || HSourceBillTypeName.Trim() == "鐢熶骇閫�鏂欏崟")
+ {
+ if (!oWebs.set_BarCodeAutoWMS(HInterID, HSourceBillType, HOrgID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ objJsonResult.list = null;
+ return objJsonResult;
+ }
+ }
+
oCN.Commit();
List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
//鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
@@ -1180,7 +1446,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-037]鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
objJsonResult.list = listobj;
return objJsonResult;
@@ -1189,7 +1455,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
objJsonResult.data = null;
objJsonResult.list = listobj;
return objJsonResult;
@@ -1200,7 +1466,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
return objJsonResult;
}
}
--
Gitblit v1.9.1