MES-WEB-API.git

			@@ -132,6 +132,10 @@
			list.Add("å¯ä¸æ¡ç ");
			list.Add("æ¹æ¬¡æ¡ç ");
			}
			else if (sCapName == "æµ·è¯")
			{
			list.Add("åç§æ¡ç ");
			}
			else
			{
			list.Add("å¯ä¸æ¡ç ");
			@@ -589,6 +593,16 @@
			ordrlist.HGiveAwayFlag = 0;
			}
			}
			if (HSourceBillType == "éè´è®¢åÂÂ")
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "æµ·è¯Â") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			ordrlist.HSourceBillSEQ = dt.Rows[i]["HSEQ"].ToString();
			ordrlist.HFactory = dt.Rows[i]["å®¢æ·ç¼å·"].ToString();
			ordrlist.HCoilNO = dt.Rows[i]["æ¬¾å·"].ToString();
			ordrlist.HFurnaceNO = dt.Rows[i]["åç»Â"].ToString();
			}
			}
			}
			if (HSourceBillType == "éè´§éç¥å")
			{
			@@ -621,7 +635,7 @@
			//æ ¹æ®TABLEåå¥çé¢(åºå¥åºåæ®)
			private object Sub_WriteInForm_InOut(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();
			@@ -654,6 +668,20 @@
			ordrlist.HMTONo = dt.Rows[i]["è®¡åè·è¸ªå·"].ToString();
			ordrlist.HDate = dt.Rows[i]["æ¥æ"].ToString();
			ordrlist.HShowDate = DateTime.Now.ToString();

			if (HSourceBillType == "éè´å¥åºå")
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "æµ·è¯Â") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			ordrlist.HInnerBillNo = dt.Rows[i]["éè´è®¢åå·"].ToString();
			ordrlist.HSupID = dt.Rows[i]["HSupID"].ToString();
			ordrlist.HSupNumber = dt.Rows[i]["ä¾åºåä»£ç Â"].ToString();
			ordrlist.HSupName = dt.Rows[i]["ä¾åºåÂÂ"].ToString();
			ordrlist.HFactory = dt.Rows[i]["å®¢æ·ç¼å·"].ToString();
			ordrlist.HCoilNO = dt.Rows[i]["æ¬¾å·"].ToString();
			ordrlist.HFurnaceNO = dt.Rows[i]["åç»Â"].ToString();
			}
			}
			}
			return ordrlist;
			}
			@@ -801,12 +829,13 @@
			long HMaterID = DBUtility.ClsPub.isLong(ordrlist[i].HMaterID); // ç©æåç
			string HBatchNo = DBUtility.ClsPub.isStrNull(ordrlist[i].HBatchNo); // æ¹å·
			long HAuxPropID = DBUtility.ClsPub.isLong(ordrlist[i].HAuxPropID); // è¾å©å±æ§ID
			string HMTONo = DBUtility.ClsPub.isStrNull(ordrlist[i].HMTONo); //è®¡åè·è¸ªå·
			double HSourceQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // æºåæ°é
			double HQty = DBUtility.ClsPub.isDoule(ordrlist[i].HQty); // æ°é
			double HMinQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // æå°åè£æ°
			if (HMaterID != 0)
			{
			DataSet oDsCheck = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
			DataSet oDsCheck = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck_New " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "'," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck_New");
			if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -845,7 +874,7 @@
			int HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			string WeiShu = ""; //å°¾æ°
			int LSH = 0; //æµæ°´å·
			Int64 LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			string sDate = ""; //æ¥æ
			string sYear = ""; //å¹´
			@@ -935,7 +964,7 @@
			sTMNumber = HNumber + sYear + sPeriod + sDay;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "é£é¾")
			{
			@@ -952,7 +981,7 @@
			sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "çä¸ç¥º") {
			var date = DateTime.Now.ToString("yyMMdd");//æ¥æ
			@@ -977,7 +1006,7 @@

			//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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (HSourceBillTypeName == "çäº§å¥åºå")
			{
			@@ -1011,13 +1040,13 @@

			//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]);
			LSH = ClsPub.isLong(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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			}
			else //éç¨æ¹æ³
			@@ -1026,7 +1055,7 @@
			sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			}
			else if (HSelectBarCodeType == "åç§æ¡ç ")
			@@ -1050,7 +1079,7 @@
			sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 4;
			}
			else if (HSelectBarCodeType == "ä»ªå¨æåæ¡ç è§å") //å¦å¤å¤çäº
			@@ -1067,7 +1096,7 @@
			sTMNumber = HMaterNumber + HBatchNo;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 6;
			}
			else if (HSelectBarCodeType == "åéæºæ¡ç ")
			@@ -1077,7 +1106,7 @@
			sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00";
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 16)
			{
			@@ -1094,7 +1123,7 @@
			sTMNumber = HMaterNumber.Replace(".", "") + HBarCodeDate + HBarCodeBatchNo;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			if (sTMNumber.Length != 18)
			{
			@@ -1110,7 +1139,7 @@
			sTMNumber = HICMOBillNo;
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			}
			else if (HSelectBarCodeType == "æçæ¡ç ")
			@@ -1119,7 +1148,7 @@
			//æ¡ç åç¼ = ç©æåç + å¹´ + æ + æ¥
			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]);
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			@@ -1184,6 +1213,33 @@
			return objJsonResult;
			}
			HBarCodeList barcode = new HBarCodeList();

			if (CampanyName == "æµ·è¯") //ç³»ç»åæ° å®¢æ·å®å¶ååç§°
			{
			string sHMTONo = ""; //è®¡åè·è¸ªå·
			string sHSourceBillNo = ""; //æºååå·
			string sHSourceBillSEQ = ""; //æºåè¡å·
			string sSupNumber = ""; //ä¾åºåä»£ç
			string sHQty = ""; //æ°é

			sHMTONo = DBUtility.ClsPub.isStrNull(ordrlist[j].HMTONo);
			sHSourceBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo);
			sHSourceBillSEQ = DBUtility.ClsPub.isStrNull(ordrlist[j].HSourceBillSEQ);
			sSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);
			sHQty = DBUtility.ClsPub.isStrNull(HMinQty);

			if (DBUtility.ClsPub.isStrNull(ordrlist[j].HBillType) == "1102") //æºåï¼éè´è®¢å
			{
			//æ¡ç è§åï¼éè´è®¢ååå·@è¡å·@ç©æä»£ç @MTO@æ°é@ä¾åºåä»£ç
			TM = sHSourceBillNo + "@" + sHSourceBillSEQ + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
			}
			else
			{
			//æ¡ç è§åï¼ç©æåç @MTO@æ°é
			TM = HNumber + "@" + sHMTONo + "@" + sHQty;
			}
			}

			barcode.HBarCode2 = TM;
			barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
			barcode.HMaterID2 = ordrlist[j].HMaterID;