From 170dc25004f6d0a22add0d71fdec602545902999 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 十一月 2025 10:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 537 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 488 insertions(+), 49 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 6cbbd57..01cff2b 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"
@@ -25,6 +25,7 @@
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
private WebS.WebService1 oWebs = new WebS.WebService1();
+ public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public Int64 HInterID = 0; //鍐呯爜
@@ -909,6 +910,8 @@
string HSupNumber = ""; // 渚涘簲鍟嗙紪鐮�
string HPOInStockBillNo = ""; // 鏀舵枡閫氱煡鍗曞彿
+ string HPOOrderBillNo = ""; // 閲囪喘璁㈠崟鍙�
+
DataSet Ds;
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -959,6 +962,8 @@
HPOInStockBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo); // 鏀舵枡閫氱煡鍗曞彿 鍏磋揪鏉＄爜
HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);// 渚涘簲鍟嗙紪鍙� 鍏磋揪鏉＄爜
+
+ HPOOrderBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo); // 閲囪喘璁㈠崟鍙� 灏忓崼鐢靛櫒
//
sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
@@ -1069,6 +1074,14 @@
Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
LSHlen = 3; // 涓変綅娴佹按鍙�
+ }
+ else if (CampanyName.Contains("灏忓崼"))
+ {
+ // 灏忓崼鐢靛櫒
+ // 鏉＄爜鍓嶇紑 = 鍗曟嵁鍙� + 鐗╂枡缂栫爜 + 鎵规鍙�
+ sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else //閫氱敤鏂规硶
{
@@ -1824,7 +1837,7 @@
}
#endregion
- #region 鏇存柊鏉＄爜 瀵瑰簲鍗曟嵁 鍗曞彿 娆℃暟 鏃堕棿
+ #region 鏇存柊鏉＄爜瀵瑰簲鍑哄簱鐢宠鍗曞彿 鍏磋揪
public class BarCodeMeta
{
public string HBarCode { get; set; }
@@ -1851,23 +1864,24 @@
string msg2 = sArray[0].ToString();
string HBillType = sArray[1].ToString();
string HBillNo = sArray[2].ToString();
+ string HOrgName = sArray[3].ToString();
List<BarCodeMeta> BarCodeMetaList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BarCodeMeta>>(msg2);
+ oCN.BeginTran();
try
{
- oCN.BeginTran();
-
for(int i = 0; i < BarCodeMetaList.Count; i++)
{
if (HBillType == "1205") // 閿�鍞嚭搴�
{
- oCN.RunProcReturn("Update Gy_BarCodeBill set HOutStockDate = getdate(), HOutStockCounts=isnull(HOutStockCounts,0)+1," +
- "HOutStockBillNo='" + HBillNo + " 'where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");
- }
- if (HBillType == "1201") // 閲囪喘鍏ュ簱
- {
- oCN.RunProcReturn("Update Gy_BarCodeBill set HInStockDate = getdate(), HInStockCounts=isnull(HOutStockCounts,0)+1," +
- "HInStockBillNo='" + HBillNo + " 'where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");
+
+ if (HOrgName.Contains("鍏磋揪") && !string.IsNullOrEmpty(HBillNo))
+ {
+ // 鍏磋揪 閿�鍞嚭搴撴洿鏂� 鍙戣揣閫氱煡鍗�
+ oCN.RunProcReturn("Update Gy_BarCodeBill set " +
+ "HSeOutStockBillNo='" + HBillNo + "' where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");
+ }
+
}
}
@@ -1879,6 +1893,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇敼澶辫触!" + e.Message;
@@ -1890,12 +1905,12 @@
#region [鑾峰彇鏍囩鎵撳嵃鎸囦护 CPCL鎸囦护]
[Route("Sc_BarCode/Get_BarCodePrintCode_CPCL")]
[HttpGet]
- public object Get_BarCodePrintCode_CPCL(string HOrginationName, string HViewName, string HBillSubType, int HInterID, int HItemID)
+ public object Get_BarCodePrintCode_CPCL(string HOrginationName, string HBillSubType, int HInterID, int HItemID)
{
try
{
ds = oCN.RunProcReturn("exec h_p_getHBarCodePrintCode_CPCL N'" + HOrginationName + "'" +
- ",N'" + HViewName + "',N'" + HBillSubType + "'," + HInterID + "," + HItemID, "h_p_getHBarCodePrintCode_CPCL");
+ ",N'" + HBillSubType + "'," + HInterID + "," + HItemID, "h_p_getHBarCodePrintCode_CPCL");
if((int)ds.Tables[0].Rows[0]["resultType"] == 1)
{
string resultMesg = ds.Tables[0].Rows[0]["payload"].ToString().Replace("\\r\\n", "\r\n");
@@ -2523,64 +2538,86 @@
{
try
{
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- //鏌ヨ鏉＄爜淇℃伅
- if (HBarCodeNo != null)
+ if (string.IsNullOrWhiteSpace(HBarCodeNo))
{
- string prefix = HBarCodeNo.Trim() + "-";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇疯緭鍏ユ潯鐮佺紪鍙�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- ds = oCn.RunProcReturn("SELECT * FROM h_v_Gy_SplitBarCode WITH(NOLOCK) WHERE HBarCode LIKE '" + prefix + "' + '%' AND HBarCode NOT LIKE '" + prefix + "' + '%-%' AND ISNUMERIC(RIGHT(HBarCode, LEN(HBarCode) - LEN( '" + prefix + "' ))) = 1 AND TRY_CAST(RIGHT(HBarCode, LEN(HBarCode) - LEN( '" + prefix + "' )) AS INT) IS NOT NULL ", "Gy_BarCodeBill");
- if (ds != null || ds.Tables[0].Rows.Count >= 0)
+ // 鍘荤┖鏍�
+ string cleanBarCode = HBarCodeNo.Trim();
+ string prefix = cleanBarCode + "-"; // 鐢ㄤ簬鏌ュ瓙鐮�
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ // 1. 鍏堟煡鐩存帴瀛愮爜锛堜竴绾у瓙鐮侊細xxx-1, xxx-2, ...锛�
+ string sqlSub = @"SELECT * FROM h_v_Gy_SplitBarCode WITH(NOLOCK) WHERE HBarCode LIKE '" + prefix + @"%'
+ AND HBarCode NOT LIKE '" + prefix + @"%-%'
+ AND ISNUMERIC(RIGHT(HBarCode, LEN(HBarCode) - LEN('" + prefix + @"'))) = 1
+ AND TRY_CAST(RIGHT(HBarCode, LEN(HBarCode) - LEN('" + prefix + @"')) AS INT) IS NOT NULL";
+
+ DataSet ds = oCn.RunProcReturn(sqlSub, "Gy_BarCodeBill");
+
+ // 2. 濡傛灉鏈夊瓙鐮� 鈫� 杩斿洖瀛愮爜 + 涓嬩竴涓紪鍙�
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ int maxSuffix = 0;
+ foreach (DataRow row in ds.Tables[0].Rows)
{
- // 鎵惧嚭鏈�澶у悗缂�鏁板瓧锛岀敤浜庣敓鎴愪笅涓�涓紪鍙�
- int maxSuffix = 0;
- foreach (DataRow row in ds.Tables[0].Rows)
- {
- string barCode = row["HBarCode"].ToString();
- string suffixPart = barCode.Substring(prefix.Length); // 鍙� - 鍚庣殑閮ㄥ垎
- if (int.TryParse(suffixPart, out int num))
- {
- if (num > maxSuffix) maxSuffix = num;
- }
- }
+ string barCode = row["HBarCode"].ToString();
+ string suffix = barCode.Substring(prefix.Length);
+ if (int.TryParse(suffix, out int num) && num > maxSuffix)
+ maxSuffix = num;
+ }
- // 鐢熸垚涓嬩竴涓瓙鐮佺紪鍙�
- string nextBarCode = $"{HBarCodeNo}-{maxSuffix + 1}";
+ string nextBarCode = $"{cleanBarCode}-{maxSuffix + 1}";
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛岃繑鍥炵洿鎺ュ瓙鐮�";
+ objJsonResult.data = new
+ {
+ SubBarCodes = ds.Tables[0],
+ NextBarCode = nextBarCode
+ };
+ }
+ else
+ {
+ // 3. 娌℃湁瀛愮爜 鈫� 鏌ヨ嚜宸�
+ string sqlSelf = @"SELECT * FROM h_v_Gy_SplitBarCode WITH(NOLOCK) WHERE HBarCode = '" + cleanBarCode.Replace("'", "''") + "'";
+
+ DataSet dsSelf = oCn.RunProcReturn(sqlSelf, "Gy_BarCodeBill");
+
+ if (dsSelf != null && dsSelf.Tables[0].Rows.Count > 0)
+ {
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "璇ユ潯鐮佹棤瀛愮爜锛岃繑鍥炶嚜韬�";
objJsonResult.data = new
{
- SubBarCodes = ds.Tables[0], // 鏉＄爜鍩虹淇℃伅
- NextBarCode = nextBarCode // 涓嬩竴涓敓鎴愮殑鏉＄爜
+ SubBarCodes = dsSelf.Tables[0],
+ NextBarCode = $"{cleanBarCode}-1" // 寤鸿浠� -1 寮�濮�
};
- return objJsonResult;
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜缂栧彿涓嶅瓨鍦�, 鎻愮ず";
+ objJsonResult.Message = "鏉＄爜涓嶅瓨鍦紝璇锋鏌�";
objJsonResult.data = null;
- return objJsonResult;
- }
+ }
}
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇疯緭鍏ユ潯鐮佺紪鍙锋垨鎷嗗垎鏉＄爜鏁�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
+
+ return objJsonResult;
}
- catch (Exception e) //鎶涘嚭寮傚父
+ catch (Exception ex)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "寮傚父锛�" + ex.Message;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2713,6 +2750,408 @@
}
#endregion
+ #region [鏉＄爜鐢熸垚鎺ュ彛_灏忓崼闀洉鐮乚
+ [Route("Sc_BarCode/SaveSNByICMO_XW")]
+ [HttpGet]
+ public object SaveSNByICMO_XW(String HBillNo,string HSN, int HBeginNo, int HEndNo, int HCount,string HMachineCode)
+ {
+ try
+ {
+ if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]鍗曟嵁鍚屾澶辫触璇疯仈绯荤鐞嗗憳,"+ DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "', " + HSN +","+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");
+
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜淇濆瓨澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]鏉＄爜缁戝畾澶辫触锛�"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鏉＄爜鐢熸垚鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region [鏉＄爜鐢熸垚鎺ュ彛_灏忓崼鎵樻潯鐮乚
+ [Route("Sc_BarCode/Sub_SaveBill_xiaowei")]
+ [HttpPost]
+ public object Sub_SaveBill_xiaowei([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 = "鐢熶骇璁㈠崟";//婧愬崟绫诲瀷
+ string HSelectBarCodeType = "鎵樼洏鏉＄爜";
+ string CampanyName = "灏忓崼";
+ string UserName = sArray[2].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
+ {
+ //鐢熸垚鏉＄爜
+ SaveBarCode_xiaowei(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[鏉＄爜鐢熸垚鏂规硶_xiaowei]
+ private object SaveBarCode_xiaowei(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
+ HSouceOrderList ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<HSouceOrderList>(msg2);
+
+ // List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+
+ DataSet Ds;
+ for (int i = 0; i < 1; i++)
+ {
+ HSourceBillType_Temp = ordrlist.HBillType;
+
+ if (ClsPub.isLong(ordrlist.HMaterID) != 0)
+ {
+ if (HSelectBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ //鎷嗗垎姣忔潯鐗╂枡璁板綍涓哄鏉℃潯鐮佽褰�
+ double HSumQty = ClsPub.isDoule(ordrlist.HQty); //浜у搧鏁伴噺
+ double HQty = ClsPub.isDoule(ordrlist.HQty); //鏁伴噺
+ double HMinQty = ClsPub.isDoule(ordrlist.HMinQty); //鏈�灏忓寘瑁呮暟
+ int HBQty = ClsPub.isInt(ordrlist.HBQty); //绠辨暟
+ string WeiShu = ""; //灏炬暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 6; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HMaterialName = DBUtility.ClsPub.isStrNull(ordrlist.HMaterName);
+ string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist.HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
+ int lastDigit = int.Parse(DateTime.Today.Year.ToString().Last().ToString());
+ char productionMonth = DateTime.Today.Month <= 9
+ ? (char)(DateTime.Today.Month + '0')
+ : (char)('A' + DateTime.Today.Month - 10);
+ if (HMaterialName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡涓嶈兘涓虹┖锛屼笉鑳界敓鎴愭潯鐮侊紒";
+ return objJsonResult;
+ }
+ //todo
+ //鏉＄爜鍓嶇紑 = p+鍟嗗搧SKU+鐢熶骇骞翠唤+鐢熶骇鏈堜唤+6浣嶆祦姘村彿+鐢熶骇宸ュ巶浠ｇ爜
+ sTMNumber = "P" + HMaterialName + lastDigit+ productionMonth;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ 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+"XXX";
+
+
+ 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.HMaterID;
+ barcode.HMaterNumber2 = ordrlist.HMaterNumber;
+ barcode.HMaterName2 = ordrlist.HMaterName;
+ barcode.HMaterModel2 = ordrlist.HMaterModel;
+ barcode.HPinfan2 = ordrlist.HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist.HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist.HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist.HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist.HAuxPropName;
+ barcode.HUnitID2 = ordrlist.HUnitID;
+ barcode.HUnitNumber2 = ordrlist.HUnitNumber;
+ barcode.HUnitName2 = ordrlist.HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist.HBatchNo;
+ barcode.HSourceInterID2 = ordrlist.HMainID;
+ barcode.HSourceEntryID2 = ordrlist.HSubID;
+ barcode.HSourceBillNo2 = ordrlist.HBillNo;
+ barcode.HSourceBillType2 = ordrlist.HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist.HBQty;
+ barcode.HSupID2 = ordrlist.HSupID;
+ barcode.HSupNumber2 = ordrlist.HSupNumber;
+ barcode.HSupName2 = ordrlist.HSupName;
+ barcode.HDeptID2 = ordrlist.HDeptID;
+ barcode.HDeptNumber2 = ordrlist.HDeptNumber;
+ barcode.HDeptName2 = ordrlist.HDeptName;
+ barcode.HRemark2 = ordrlist.HRemark;
+ barcode.HDate2 = ordrlist.HDate;
+ barcode.HShowDate2 = ordrlist.HShowDate;
+ barcode.HWhID2 = ordrlist.HWhID;
+ barcode.HWhNumber2 = ordrlist.HWhNumber;
+ barcode.HWhName2 = ordrlist.HWhName;
+ barcode.HSPID2 = ordrlist.HSPID;
+ barcode.HSPNumber2 = ordrlist.HSPNumber;
+ barcode.HSPName2 = ordrlist.HSPName;
+ barcode.HMTONo2 = ordrlist.HMTONo;
+ barcode.HCusID2 = ordrlist.HCusID;
+ barcode.HCusNumber2 = ordrlist.HCusNumber;
+ barcode.HCusName2 = ordrlist.HCusName;
+ barcode.HCusType2 = ordrlist.HCusType;
+ barcode.HSourceID2 = ordrlist.HSourceID;
+ barcode.HSourceNumber2 = ordrlist.HSourceNumber;
+ barcode.HSourceName2 = ordrlist.HSourceName;
+ barcode.HEndDate2 = ordrlist.HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist.HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist.HInnerBillNo;
+ barcode.HMaker2 = ordrlist.HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist.HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist.HCoilNO;
+ barcode.HFurnaceNO = ordrlist.HFurnaceNO;
+ barcode.HFactory = ordrlist.HFactory;
+ barcode.HAuxQty = ordrlist.HAuxQty;
+ barcode.HheatNO = ordrlist.HheatNO;
+ barcode.HGroupID2 = ordrlist.HGroupID;
+ barcode.HEmpID2 = ordrlist.HEmpID;
+ barcode.HCusModel2 = ordrlist.HCusModel;
+ barcode.HCusMaterName2 = ordrlist.HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist.HCheckEmpName;
+ barcode.HZZRQ = ordrlist.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 + "'" + ")");
+
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ //鑷姩瑁呯
+ string sql_autoForBoxBill = "exec h_v_Gy_BarCode_AutoProductBarCodeBox " + HInterID.ToString();
+ oCN.RunProc(sql_autoForBoxBill);
+
+ 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