From 9ccc52d6fce9c7dde1573cac96a82db3998195f1 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 31 七月 2025 11:34:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 853 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 833 insertions(+), 20 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 a788ec6..1bfb40e 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"
@@ -69,7 +69,7 @@
}
else
{
- list.Add("");
+ list.Add(CampanyName);
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -127,6 +127,11 @@
list.Add("浠櫒鎴愬搧鏉＄爜瑙勫垯");
list.Add("璇曞墏鎴愬搧鏉＄爜瑙勫垯");
}
+ else if (sCapName == "娣诲悍绉戞妧")
+ {
+ list.Add("鍞竴鏉＄爜");
+ list.Add("鎵规鏉＄爜");
+ }
else
{
list.Add("鍞竴鏉＄爜");
@@ -156,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
{
@@ -191,8 +197,16 @@
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 * 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";
@@ -218,6 +232,21 @@
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 "宸ュ簭娴佽浆鍗�":
+ 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;
@@ -335,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");
@@ -387,6 +422,18 @@
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;
}
@@ -411,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();
@@ -447,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();
@@ -465,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();
@@ -491,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 == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
@@ -533,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();
@@ -541,6 +604,15 @@
ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
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;
@@ -627,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;
@@ -644,7 +716,7 @@
if (b == false)
{
objJsonResult.code = "1";
- objJsonResult.Message="娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒";
+ objJsonResult.Message= "[3899-2-003]娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒";
return objJsonResult;
}
else //瀹屽叏灏侀棴
@@ -685,7 +757,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閫夋嫨缁勭粐鏈夐敊璇�!";
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
return objJsonResult;
}
if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
@@ -706,7 +778,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触!"+e.Message;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
return objJsonResult;
}
return objJsonResult;
@@ -739,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")
@@ -795,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
@@ -813,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();
//
@@ -825,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);
}
@@ -866,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 //閫氱敤鏂规硶
{
@@ -1093,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;
@@ -1109,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;
@@ -1141,6 +1300,11 @@
string HheatNO2 = "";
DateTime HProduceDate;
DateTime HExpiryDate;
+ long HEmpID2 = 0;
+ string HCusModel2 = "";
+ string HCusMaterName2 = "";
+ string HCheckEmpName2 = "";
+
try
{
oCN.BeginTran();
@@ -1155,6 +1319,10 @@
if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
{
HBarCodeType = "鍞竴鏉＄爜";
+ }
+ if (CampanyName == "涔濊彵")
+ {
+ HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
}
//
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
@@ -1193,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 " +
@@ -1201,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);
@@ -1272,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;
@@ -1281,7 +1455,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
objJsonResult.data = null;
objJsonResult.list = listobj;
return objJsonResult;
@@ -1292,7 +1466,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
return objJsonResult;
}
}
@@ -1327,6 +1501,645 @@
}
#endregion
+ #region 鏉＄爜瀛樺叆鏉＄爜涓绘。
+ /// <summary>
+ /// 鏉＄爜杞瓨鏉＄爜涓绘。
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_BarCode/SaveBarCode_NoGenerate")]
+ [HttpPost]
+ public object SaveBarCode_NoGenerate([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HOrgType = sArray[1].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();
+ string barCodeNo = sArray[6].ToString();
+ ClsPub.CurUserName = UserName;
+
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return objJsonResult;
+ }
+ if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //瀹㈡埛瀹氬埗
+ }
+ else
+ {
+
+ // 鏉＄爜杞瓨
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ LogService.Write(ordrlist[0]);
+
+ long HSourceInterID = string.IsNullOrEmpty(ordrlist[0].HMainID) == true ? 0 : ClsPub.isLong(ordrlist[0].HMainID);
+ long HSourceEntryID = string.IsNullOrEmpty(ordrlist[0].HSubID) == true ? 0 : ClsPub.isLong(ordrlist[0].HSubID);
+ DataSet ds1 = oCN.RunProcReturn("exec h_p_SC_BarCode_Transfer " +
+ "@HBarCodeNo = N'" + barCodeNo + "'" +
+ ",@HSubID = " + ordrlist[0].HSubID +
+ ",@HMaterID = " + ordrlist[0].HMaterID +
+ ",@HGiveAwayFlag = " + ordrlist[0].HGiveAwayFlag +
+ ",@HQty = " + ordrlist[0].HQty +
+ ",@HUnitID = " + ordrlist[0].HUnitID +
+ ",@HMinQty = " + ordrlist[0].HMinQty +
+ ",@HSupID = " + ordrlist[0].HSupID +
+ ",@HBatchNo = N'" + ordrlist[0].HBatchNo + "'" +
+ ",@HMTONO = N'" + ordrlist[0].HMTONo + "'" +
+ ",@HBarCodeDate = N'" + ordrlist[0].HDate + "'" +
+ ",@HEmpID = " + ordrlist[0].HEmpID +
+ ",@HGroupID = " + ordrlist[0].HGroupID +
+ ",@HSourceInterID = " + HSourceInterID +
+ ",@HSourceEntryID = " + HSourceEntryID
+ , "h_p_SC_BarCode_Transfer");
+
+ if((bool)ds1.Tables[0].Rows[0]["returntype"] == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ }
+ else
+ {
+ throw new Exception(ds1.Tables[0].Rows[0]["mesg"].ToString());
+ }
+
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [鏉＄爜鐢熸垚鎺ュ彛-杩﹀崡]
+ [Route("Sc_BarCode/Sub_SaveBill_JiaNan")]
+ [HttpPost]
+ public object Sub_SaveBill_JiaNan([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //鐗╂枡璁板綍
+ string HOrgType = sArray[1].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);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return objJsonResult;
+ }
+
+ //鐢熸垚鏉＄爜
+ SaveBarCode_JiaNan(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[鏉＄爜鐢熸垚鏂规硶_杩﹀崡]
+ private object SaveBarCode_JiaNan(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
+ {
+ DateTime sDate = DateTime.Now; //鏃ユ湡
+ string HSourceBillType_Temp = ""; //婧愬崟绫诲瀷
+ int n = 0; //鍚屾壒鐢熸垚鐨勬潯鐮佺储寮�
+
+ //鑾峰彇鏄庣粏淇℃伅
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+
+ DataSet Ds;
+ for (int i = 0; i < ordrlist.Count; i++)
+ {
+ HSourceBillType_Temp = ordrlist[i].HBillType;
+
+ if (ClsPub.isLong(ordrlist[i].HMaterID) != 0)
+ {
+ if (HSelectBarCodeType == "BarCode")
+ {
+ //鎷嗗垎姣忔潯鐗╂枡璁板綍涓哄鏉℃潯鐮佽褰�
+ double HSumQty = ClsPub.isDoule(ordrlist[i].HQty); //浜у搧鏁伴噺
+ double HQty = ClsPub.isDoule(ordrlist[i].HQty); //鏁伴噺
+ double HMinQty = ClsPub.isDoule(ordrlist[i].HMinQty); //鏈�灏忓寘瑁呮暟
+ int HBQty = ClsPub.isInt(ordrlist[i].HBQty); //绠辨暟
+ string WeiShu = ""; //灏炬暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 4; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[i].HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
+ string sDateStr = sDate.ToString("yyMMdd"); //鍚姩鏃ユ湡锛圷YMMDD锛�
+
+ if (HSupNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "渚涘簲鍟嗕唬鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ //鏉＄爜鍓嶇紑 = R+渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級+鍚姩鏃ユ湡锛圷YMMDD锛�+鍥涗綅娴佹按鍙�
+ sTMNumber = "R" + HSupNumber + sDateStr;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
+ LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
+
+ //鎷兼帴鏉＄爜
+ HBarCode_Temp = sTMNumber + LSH;
+
+
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = HBarCode_Temp;
+ barcode.HBarCodeType2 = "鍞竴鏉＄爜";
+ barcode.HBarCodeSubType2 = "鍖呮潯鐮�";
+ barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
+ barcode.HMaterID2 = ordrlist[i].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[i].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[i].HMaterName;
+ barcode.HMaterModel2 = ordrlist[i].HMaterModel;
+ barcode.HPinfan2 = ordrlist[i].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[i].HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist[i].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[i].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[i].HAuxPropName;
+ barcode.HUnitID2 = ordrlist[i].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[i].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[i].HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist[i].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[i].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[i].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[i].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[i].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[i].HBQty;
+ barcode.HSupID2 = ordrlist[i].HSupID;
+ barcode.HSupNumber2 = ordrlist[i].HSupNumber;
+ barcode.HSupName2 = ordrlist[i].HSupName;
+ barcode.HDeptID2 = ordrlist[i].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[i].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[i].HDeptName;
+ barcode.HRemark2 = ordrlist[i].HRemark;
+ barcode.HDate2 = ordrlist[i].HDate;
+ barcode.HShowDate2 = ordrlist[i].HShowDate;
+ barcode.HWhID2 = ordrlist[i].HWhID;
+ barcode.HWhNumber2 = ordrlist[i].HWhNumber;
+ barcode.HWhName2 = ordrlist[i].HWhName;
+ barcode.HSPID2 = ordrlist[i].HSPID;
+ barcode.HSPNumber2 = ordrlist[i].HSPNumber;
+ barcode.HSPName2 = ordrlist[i].HSPName;
+ barcode.HMTONo2 = ordrlist[i].HMTONo;
+ barcode.HCusID2 = ordrlist[i].HCusID;
+ barcode.HCusNumber2 = ordrlist[i].HCusNumber;
+ barcode.HCusName2 = ordrlist[i].HCusName;
+ barcode.HCusType2 = ordrlist[i].HCusType;
+ barcode.HSourceID2 = ordrlist[i].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[i].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[i].HSourceName;
+ barcode.HEndDate2 = ordrlist[i].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[i].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[i].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[i].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[i].HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist[i].HCoilNO;
+ barcode.HFurnaceNO = ordrlist[i].HFurnaceNO;
+ barcode.HFactory = ordrlist[i].HFactory;
+ barcode.HAuxQty = ordrlist[i].HAuxQty;
+ barcode.HheatNO = ordrlist[i].HheatNO;
+ barcode.HGroupID2 = ordrlist[i].HGroupID;
+ barcode.HEmpID2 = ordrlist[i].HEmpID;
+ barcode.HCusModel2 = ordrlist[i].HCusModel;
+ barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
+ ListRows.Add(barcode);
+
+ n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); //鏇存柊鏈�澶ф祦姘村彿
+ }
+ }
+ else if(HSelectBarCodeType == "BarCode_Box")
+ {
+ int HBQty = ClsPub.isInt(ordrlist[i].HBQty); //绠辨暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 4; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[i].HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
+ string sDateStr = sDate.ToString("yyMMdd"); //鍚姩鏃ユ湡锛圷YMMDD锛�
+
+ if (HSupNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "渚涘簲鍟嗕唬鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ //鏉＄爜鍓嶇紑 = R+渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級+鍚姩鏃ユ湡锛圷YMMDD锛�+鍥涗綅娴佹按鍙�
+ sTMNumber = "B" + HSupNumber + sDateStr;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
+ LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
+
+ //鎷兼帴鏉＄爜
+ HBarCode_Temp = sTMNumber + LSH;
+
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = HBarCode_Temp;
+ barcode.HBarCodeType2 = "鎵樼洏鏉＄爜";
+ barcode.HBarCodeSubType2 = "绠辨潯鐮�";
+ barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
+ barcode.HMaterID2 = ordrlist[i].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[i].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[i].HMaterName;
+ barcode.HMaterModel2 = ordrlist[i].HMaterModel;
+ barcode.HPinfan2 = ordrlist[i].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[i].HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist[i].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[i].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[i].HAuxPropName;
+ barcode.HUnitID2 = ordrlist[i].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[i].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[i].HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(0);
+ barcode.HBatchNo2 = ordrlist[i].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[i].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[i].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[i].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[i].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = "";
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[i].HBQty;
+ barcode.HSupID2 = ordrlist[i].HSupID;
+ barcode.HSupNumber2 = ordrlist[i].HSupNumber;
+ barcode.HSupName2 = ordrlist[i].HSupName;
+ barcode.HDeptID2 = ordrlist[i].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[i].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[i].HDeptName;
+ barcode.HRemark2 = ordrlist[i].HRemark;
+ barcode.HDate2 = ordrlist[i].HDate;
+ barcode.HShowDate2 = ordrlist[i].HShowDate;
+ barcode.HWhID2 = ordrlist[i].HWhID;
+ barcode.HWhNumber2 = ordrlist[i].HWhNumber;
+ barcode.HWhName2 = ordrlist[i].HWhName;
+ barcode.HSPID2 = ordrlist[i].HSPID;
+ barcode.HSPNumber2 = ordrlist[i].HSPNumber;
+ barcode.HSPName2 = ordrlist[i].HSPName;
+ barcode.HMTONo2 = ordrlist[i].HMTONo;
+ barcode.HCusID2 = ordrlist[i].HCusID;
+ barcode.HCusNumber2 = ordrlist[i].HCusNumber;
+ barcode.HCusName2 = ordrlist[i].HCusName;
+ barcode.HCusType2 = ordrlist[i].HCusType;
+ barcode.HSourceID2 = ordrlist[i].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[i].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[i].HSourceName;
+ barcode.HEndDate2 = ordrlist[i].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[i].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[i].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[i].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[i].HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist[i].HCoilNO;
+ barcode.HFurnaceNO = ordrlist[i].HFurnaceNO;
+ barcode.HFactory = ordrlist[i].HFactory;
+ barcode.HAuxQty = ordrlist[i].HAuxQty;
+ barcode.HheatNO = ordrlist[i].HheatNO;
+ barcode.HGroupID2 = ordrlist[i].HGroupID;
+ barcode.HEmpID2 = ordrlist[i].HEmpID;
+ barcode.HCusModel2 = ordrlist[i].HCusModel;
+ barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
+ ListRows.Add(barcode);
+
+ n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); //鏇存柊鏈�澶ф祦姘村彿
+ }
+ }
+ else if (HSelectBarCodeType == "BarCode_Pack")
+ {
+ int HBQty = ClsPub.isInt(ordrlist[i].HBQty); //绠辨暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 4; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[i].HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
+ string sDateStr = sDate.ToString("yyMMdd"); //鍚姩鏃ユ湡锛圷YMMDD锛�
+
+ if (HSupNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "渚涘簲鍟嗕唬鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ //鏉＄爜鍓嶇紑 = R+渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級+鍚姩鏃ユ湡锛圷YMMDD锛�+鍥涗綅娴佹按鍙�
+ sTMNumber = "P" + HSupNumber + sDateStr;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
+ LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
+
+ //鎷兼帴鏉＄爜
+ HBarCode_Temp = sTMNumber + LSH;
+
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = HBarCode_Temp;
+ barcode.HBarCodeType2 = "鎵樼洏鏉＄爜";
+ barcode.HBarCodeSubType2 = "鎵樻潯鐮�";
+ barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
+ barcode.HMaterID2 = ordrlist[i].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[i].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[i].HMaterName;
+ barcode.HMaterModel2 = ordrlist[i].HMaterModel;
+ barcode.HPinfan2 = ordrlist[i].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[i].HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist[i].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[i].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[i].HAuxPropName;
+ barcode.HUnitID2 = ordrlist[i].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[i].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[i].HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(0);
+ barcode.HBatchNo2 = ordrlist[i].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[i].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[i].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[i].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[i].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = "";
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[i].HBQty;
+ barcode.HSupID2 = ordrlist[i].HSupID;
+ barcode.HSupNumber2 = ordrlist[i].HSupNumber;
+ barcode.HSupName2 = ordrlist[i].HSupName;
+ barcode.HDeptID2 = ordrlist[i].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[i].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[i].HDeptName;
+ barcode.HRemark2 = ordrlist[i].HRemark;
+ barcode.HDate2 = ordrlist[i].HDate;
+ barcode.HShowDate2 = ordrlist[i].HShowDate;
+ barcode.HWhID2 = ordrlist[i].HWhID;
+ barcode.HWhNumber2 = ordrlist[i].HWhNumber;
+ barcode.HWhName2 = ordrlist[i].HWhName;
+ barcode.HSPID2 = ordrlist[i].HSPID;
+ barcode.HSPNumber2 = ordrlist[i].HSPNumber;
+ barcode.HSPName2 = ordrlist[i].HSPName;
+ barcode.HMTONo2 = ordrlist[i].HMTONo;
+ barcode.HCusID2 = ordrlist[i].HCusID;
+ barcode.HCusNumber2 = ordrlist[i].HCusNumber;
+ barcode.HCusName2 = ordrlist[i].HCusName;
+ barcode.HCusType2 = ordrlist[i].HCusType;
+ barcode.HSourceID2 = ordrlist[i].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[i].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[i].HSourceName;
+ barcode.HEndDate2 = ordrlist[i].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[i].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[i].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[i].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[i].HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist[i].HCoilNO;
+ barcode.HFurnaceNO = ordrlist[i].HFurnaceNO;
+ barcode.HFactory = ordrlist[i].HFactory;
+ barcode.HAuxQty = ordrlist[i].HAuxQty;
+ barcode.HheatNO = ordrlist[i].HheatNO;
+ barcode.HGroupID2 = ordrlist[i].HGroupID;
+ barcode.HEmpID2 = ordrlist[i].HEmpID;
+ barcode.HCusModel2 = ordrlist[i].HCusModel;
+ barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
+ ListRows.Add(barcode);
+
+ n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); //鏇存柊鏈�澶ф祦姘村彿
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ try
+ {
+ oCN.BeginTran();
+ for (int i = 0; i < ListRows.Count; i++)
+ {
+ if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
+ {
+ string HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
+ string HBarCodeType = ClsPub.isStrNull(ListRows[i].HBarCodeType2);
+ string HBarCodeSubType = ClsPub.isStrNull(ListRows[i].HBarCodeSubType2);
+ Int64 HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
+ Int64 HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
+ Int64 HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
+ Int64 HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
+ double HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
+ string HWei = ClsPub.isStrNull(ListRows[i].HWei);
+ string HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
+ Int64 HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
+ Int64 HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
+ string HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
+ string HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
+ Int64 HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
+ Int64 HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
+ Int64 HSupID = ClsPub.isLong(ListRows[i].HSupID2);
+ Int64 HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
+ Int64 HWhID = ClsPub.isLong(ListRows[i].HWhID2);
+ Int64 HSPID = ClsPub.isLong(ListRows[i].HSPID2);
+ string HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
+ string HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
+ string HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
+ string HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
+ string HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
+ Int64 HCusID = ClsPub.isLong(ListRows[i].HCusID2);
+ string HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
+ DateTime HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
+ string HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
+ string HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
+ string HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
+ bool HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+ int HPrintQty = ClsPub.isInt(ListRows[i].HPrint);
+
+ string HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
+ string HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
+ string HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
+ Int64 HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
+ string HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
+ DateTime HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
+ DateTime HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
+ int HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
+ Int64 HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
+ string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
+ string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+ string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
+ string HZZRQ = ClsPub.isStrNull(ListRows[i].HZZRQ);
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HZZRQ " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.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 + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HZZRQ + "'" + ")");
+
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+
+ oCN.Commit();
+ List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
+ //鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
+ string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ 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;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1