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 == "æ¶æéç¥å" \|\| 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,40 @@
			return objJsonResult;
			}
			HBarCodeList barcode = new HBarCodeList();

			if (CampanyName == "æµ·è¯") //ç³»ç»åæ° å®¢æ·å®å¶ååç§°
			{
			string sHMTONo = ""; //è®¡åè·è¸ªå·
			string sHSourceBillNo = ""; //æºååå·
			string sHSourceBillSEQ = ""; //æºåè¡å·
			string sHSourceEntryID = ""; //æºååID
			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);
			sHSourceEntryID = DBUtility.ClsPub.isStrNull(ordrlist[j].HSubID);
			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 if (DBUtility.ClsPub.isStrNull(ordrlist[j].HBillType) == "1103") //æºåï¼æ¶æéç¥å
			{
			//æ¡ç è§åï¼æ¶æéç¥åå·@åæ®ååç @ç©æä»£ç @MTO@æ°é@ä¾åºåä»£ç
			TM = sHSourceBillNo + "@" + sHSourceEntryID + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
			}
			else
			{
			//æ¡ç è§åï¼ç©æåç @MTO@æ¹æ¬¡å·@æ°é
			TM = HNumber + "@" + sHMTONo + "@" + HBatchNo + "@" + sHQty;
			}
			}

			barcode.HBarCode2 = TM;
			barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
			barcode.HMaterID2 = ordrlist[j].HMaterID;
			@@ -1501,6 +1564,115 @@
			}
			#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.None);
			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();
			string HFactory = sArray[7].ToString();
			string HCoilNO = sArray[8].ToString();
			string HFurnaceNO = sArray[9].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
			{
			string HBarCodeType = ClsPub.isStrNull(HSelectBarCodeType);
			// æ¡ç è½¬å
			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 +
			",@HSourceInterID = " + HSourceInterID +
			",@HSourceEntryID = " + HSourceEntryID +
			",@HBarCodeType = N'" + HBarCodeType + "'" +
			",@HSourceBillNo = N'" + ordrlist[0].HSourceBillNo + "'" +
			",@HMaker = N'" + ordrlist[0].HMaker + "'" +
			",@HFactory = N'" + HFactory + "'" +
			",@HCoilNO = N'" + HCoilNO + "'" +
			",@HFurnaceNO = N'" + HFurnaceNO + "'" +
			",@HInnerBillNo = N'" + ordrlist[0].HSourceBillNo + "'"
			, "h_p_SC_BarCode_Transfer");

			if((bool)ds1.Tables[0].Rows[0]["returntype"] == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = ds1.Tables[0].Rows[0]["mesg"].ToString();
			}
			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")]
			@@ -1697,6 +1869,7 @@
			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; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1801,6 +1974,7 @@
			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; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1905,6 +2079,7 @@
			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; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1975,6 +2150,7 @@
			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 " +
			@@ -1983,7 +2159,7 @@
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
			",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
			",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()
			@@ -1993,7 +2169,7 @@
			+ ", " + 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 + "'" + ")");
			+ ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HZZRQ + "'" + ")");

			}
			}