派生自 MES-WEB-API
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -1,4 +1,5 @@ using DBUtility; using 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; @@ -131,7 +132,7 @@ list.Add("å¯ä¸æ¡ç "); list.Add("åç§æ¡ç "); list.Add("æ¹æ¬¡æ¡ç "); //list.Add("æçæ¡ç "); list.Add("æçæ¡ç "); } objJsonResult.code = "1"; objJsonResult.count = 1; @@ -155,6 +156,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 +178,55 @@ 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 "ç产éæå": 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; default: break; @@ -217,8 +235,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) { @@ -344,6 +362,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": //å ¶ä»å ¥åºå @@ -351,8 +393,6 @@ case "1207": //ç´æ¥è°æ¨å break; case "1239": //éè´éæå break; case "1244": //ç产éæå break; case "1255": //ç»è£ æå¸å break; @@ -415,6 +455,7 @@ ordrlist.HPinfan = dt.Rows[i]["HPinfan"].ToString(); ordrlist.HSourceName = dt.Rows[i]["ç产线"].ToString(); ordrlist.HEndDate = dt.Rows[i]["计åå®å·¥æ¥æ"].ToString();//åæ¥ ç产订å 失ææ¥æ ordrlist.HMinQty = dt.Rows[i]["æå°å è£ æ°"].ToString(); if (HBarCodeType == "仪å¨å¤è´ä»¶æ¡ç 容å¨è§å") { ordrlist.HMinQty = dt.Rows[i]["æªçææ¡ç æ°é"].ToString(); @@ -433,6 +474,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(); @@ -456,6 +498,17 @@ ordrlist.HUnitName = dt.Rows[i]["计éåä½"].ToString(); ordrlist.HRemark = dt.Rows[i]["å¤æ³¨"].ToString(); ordrlist.HMTONo = dt.Rows[i]["计åè·è¸ªå·"].ToString(); if(HSourceBillType == "æ¶æéç¥å") { 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 == "仪å¨å¤è´ä»¶æ¡ç 容å¨è§å") { ordrlist.HMinQty = dt.Rows[i]["æªçææ¡ç æ°é"].ToString(); @@ -506,6 +559,45 @@ 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 [åæ¥èµæ] @@ -587,10 +679,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); @@ -619,7 +712,7 @@ else { //çææ¡ç SaveBarCode(msg2, HSelectBarCodeType, CampanyName); SaveBarCode(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName); } } catch (Exception e) @@ -681,7 +774,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; //æ»é¿åº¦ @@ -708,6 +801,13 @@ int k = 0; int n = 0; //åä¸æ¹çææ¡ç ä¸ç第å æ¡ string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼ string HCoilNO = ""; string HFurnaceNO = ""; string HFactory = ""; decimal HAuxQty = 0; string HheatNO = ""; DataSet Ds; msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n @@ -720,6 +820,12 @@ HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID); HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber); HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo); HCoilNO = ClsPub.isStrNull(ordrlist[j].HCoilNO); HFurnaceNO = ClsPub.isStrNull(ordrlist[j].HFurnaceNO); HFactory = ClsPub.isStrNull(ordrlist[j].HFactory); HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty); HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO); //æ¥æè·åæ¹å¼ sDate = DateTime.Now.ToString(); // @@ -773,6 +879,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 //éç¨æ¹æ³ { @@ -867,10 +1039,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"; @@ -910,7 +1086,7 @@ { LSH2 = "0" + LSH2; } if (HSelectBarCodeType == "å¯ä¸æ¡ç ") if (HSelectBarCodeType == "å¯ä¸æ¡ç " || HSelectBarCodeType == "æçæ¡ç ") { //æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å· TM = sTMNumber + LSH2; @@ -990,6 +1166,12 @@ barcode.HInnerBillNo2 = ordrlist[j].HInnerBillNo; barcode.HMaker2 = ordrlist[j].HMaker; barcode.HGiveAwayFlag2 = ordrlist[j].HGiveAwayFlag; barcode.HCoilNO = ordrlist[j].HCoilNO; barcode.HFurnaceNO = ordrlist[j].HFurnaceNO; barcode.HFactory = ordrlist[j].HFactory; barcode.HAuxQty = ordrlist[j].HAuxQty; barcode.HheatNO = ordrlist[j].HheatNO; ListRows.Add(barcode); k = k + 1; n = n + 1; @@ -1030,6 +1212,14 @@ string HInnerBillNo = ""; bool HGiveAwayFlag = false; Int64 HEntryID = 0; string HCoilNO2 = ""; string HFurnaceNO2 = ""; string HFactory2 = ""; decimal HAuxQty2 = 0; string HheatNO2 = ""; DateTime HProduceDate; DateTime HExpiryDate; try { oCN.BeginTran(); @@ -1074,6 +1264,14 @@ HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2); HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2); HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2); HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO); HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO); HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory); HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty); HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO); HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate); HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate); oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + @@ -1081,7 +1279,8 @@ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + ",HGiveAwayFlag " + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" + ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " + ") values (" + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString() @@ -1090,7 +1289,7 @@ + ", " + 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 + "')"); + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")"); //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value); @@ -1125,6 +1324,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 //è·åçæçæ¡ç ä¿¡æ¯
