MES-WEB-API.git

			@@ -8,6 +8,7 @@
			using gregn6Lib;
			using Pub_Class;
			using System.Threading;
			using System.Globalization;

			namespace WarM
			{
			@@ -64,9 +65,10 @@
			public const Int16 HEXPPERIODCol = 43;
			public const Int16 HLSHCol = 44;
			public const Int16 HBaNoCol = 45;
			public const Int16 HCusModelCol = 46;
			//
			public string ModName = "85";
			public string ModCaption = "æµªæ½®å®¢æ·æ ç¾çæ";
			public string ModCaption = "æµªæ½®ãåèãé¡ºè¾¾å®¢æ·æ ç¾çæ";
			public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_LangChao";

			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			@@ -78,13 +80,15 @@
			public int selectRow = 0;
			public Int64 HInterID = 0; //åç
			public Int64 HOrgID = ClsPub.HOrgID;
			public string HCusModel = "Z"; //ååä»£ç
			public string HCS = "Z"; //ååä»£ç
			public string sDate = ""; //æ¥æ
			public string sYear = ""; //å¹´ï¼2ä½ï¼
			public string sYear4 = ""; //å¹´ï¼4ä½ï¼
			public string sPeriod = ""; //æ
			public string sPeriod2 = ""; //æï¼æ£å¸¸ï¼
			public string sDay = ""; //æ¥
			public string sWeek = ""; //å¨
			public string sYearWeek = ""; //å¹´ï¼2ä½ï¼å¨ï¼2ä½ï¼


			#region åºå®ä»£ç
			@@ -460,6 +464,12 @@
			sPeriod2 = sPeriod.Substring(sPeriod.Length - 2, 2);
			sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
			sDay = sDay.Substring(sDay.Length - 2, 2);
			//è·åå¨
			GregorianCalendar calendar = new GregorianCalendar();
			int weekNumber = calendar.GetWeekOfYear(dtpHDate.Value, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
			sWeek = "0" + weekNumber.ToString();
			sWeek = sWeek.Substring(sWeek.Length - 2, 2);
			sYearWeek = sYear + sWeek;
			//==================================
			switch (sYear)
			{
			@@ -571,9 +581,9 @@
			string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // æ¹æ¬¡ä½
			HCode2 = HCode2.ToUpper();
			string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // çæ¬å·
			string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel; // æ¹æ¬¡çæåç¼
			string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCS; // æ¹æ¬¡çæåç¼
			HBatchNoNumber = HBatchNoNumber.ToUpper();
			string HBarCodeType = ""; // æ¡ç ç±»å
			string HBarCodeType = cmbHCusName.Text; // æ¡ç ç±»å
			string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // å®¢æ·è®¢åå·

			if (HMaterID != 0)
			@@ -654,6 +664,7 @@
			{
			string TM = ""; //æ¡ç
			int LSHlen = 4; //æµæ°´å·é¿åº¦
			int LWSHlen = 5; //å¤ç®±æµæ°´å·é¿åº¦
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //åç®±æå°åè£æ°
			int HBQty = 0; //åç®±æ°
			@@ -678,6 +689,7 @@
			double HQty = 0; //æ°é
			Int64 HCusID = 0; //å®¢æ·ID
			string HCusModelName = ""; //å®¢æ·æå·
			string HCusModel = ""; //å®¢æ·ç©æåç§°
			bool HGiveAwayFlag = false; //èµ åæ è®°
			string HProduceDate; //çäº§æ¥æï¼ä¿è´¨æç¨ï¼
			string HExpiryDate; //ä¿è´¨æè³ï¼ä¿è´¨æç¨ï¼
			@@ -721,7 +733,7 @@
			string sHCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // ç©æç±»å«
			string sHCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // æ¹æ¬¡ä½
			sHCode2 = sHCode2.ToUpper();
			string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCusModel; // æ¹æ¬¡çæåç¼
			string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCS; // æ¹æ¬¡çæåç¼
			HBatchNoNumber = HBatchNoNumber.ToUpper();

			DataSet oDsBatchNo = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo '" + sHSourceBillNo + "'," + sHMaterID.ToString() + ",'" + sHMaterNumber + "','" + sHCusModelName + "','" + sHCode2 + "','" + HBatchNoNumber + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo");
			@@ -784,13 +796,25 @@

			HEntryID = j + 1;
			HBarCode = TM.ToUpper();
			HBarCodeType = "åç®±ç ";
			if(cmbHCusName.Text.Contains("åè"))
			{
			HBarCodeType = "åèåç®±ç ";
			}
			else if (cmbHCusName.Text.Contains("é¡ºè¾¾"))
			{
			HBarCodeType = "é¡ºè¾¾åç®±ç ";
			}
			else
			{
			HBarCodeType = "åç®±ç ";
			}
			HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
			HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
			HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
			HQty = HMinQty;
			HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
			HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
			HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
			HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
			HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
			HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
			@@ -808,12 +832,12 @@
			HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
			HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
			HSno = LSH;
			HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
			HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
			HBoxNo = HBoxNo.ToUpper();
			sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // çé¢ä¸è¾å¥çæ¹æ¬¡ä½

			//å®¢æ·æå·HCusModelNameãç©æç±»å«HCode1ãæ¹æ¬¡ä½HCode2ãçæ¬å·HCode3ãæ¹æ¬¡åºåå·HSnoãæ¹æ¬¡çæåç¼HBoxNoãååä»£ç HCusModel
			//çé¢ä¸è¾å¥çæ¹æ¬¡ä½HSupNameã36è¿å¶æ¹æ¬¡åºåå·HSupNumberãå®¢æ·è®¢åå·HInnerBillNo
			//å®¢æ·æå·HCusModelNameãç©æç±»å«HCode1ãæ¹æ¬¡ä½HCode2ãçæ¬å·HCode3ãæ¹æ¬¡åºåå·HSnoãæ¹æ¬¡çæåç¼HBoxNoãå®¢æ·ç©æåç§°HCusModel
			//çé¢ä¸è¾å¥çæ¹æ¬¡ä½HSupNameã36è¿å¶æ¹æ¬¡åºåå·HSupNumberãå®¢æ·è®¢åå·HInnerBillNoãå¹´å¨HWorkLineName
			oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
			"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
			",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
			@@ -835,7 +859,7 @@
			+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
			+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
			+ ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
			+ ",'" + ClsPub.CurUserName + "',getdate(),'','','" + HMTONo + "'"
			+ ",'" + ClsPub.CurUserName + "',getdate(),'','" + sYearWeek + "','" + HMTONo + "'"
			+ ",0,'','','" + HInnerBillNo + "'"
			+ ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
			+ ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
			@@ -852,11 +876,36 @@
			{
			HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
			HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
			//è·åæå¤§æµæ°´å·
			//æ¡ç åç¼ = ä¾åºåä»£ç + å¹´ + æ + æ¥
			sTMNumber = HCusModel + sYear4 + sPeriod2 + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			if (cmbHCusName.Text.Contains("åè"))
			{
			LWSHlen = 5;
			HBarCodeType = "åèå¤ç®±ç ";
			//è·åæå¤§æµæ°´å·
			//æ¡ç åç¼ = 'CA'+å¹´å¨
			sTMNumber = "CA" + sYearWeek;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (cmbHCusName.Text.Contains("é¡ºè¾¾"))
			{
			LWSHlen = 6;
			HBarCodeType = "é¡ºè¾¾å¤ç®±ç ";
			//è·åæå¤§æµæ°´å·
			//æ¡ç åç¼ = 'B103288'+å¹´å¨
			sTMNumber = "B103288" + sYearWeek;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			LWSHlen = 5;
			HBarCodeType = "å¤ç®±ç ";
			//è·åæå¤§æµæ°´å·
			//æ¡ç åç¼ = ä¾åºåä»£ç + å¹´ + æ + æ¥
			sTMNumber = HCS + sYear4 + sPeriod2 + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}

			HWBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HWBQtyCol].Value);
			HWMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HWMinQtyCol].Value);
			@@ -876,7 +925,7 @@
			//
			LWSH = LWSH + 1;
			LSH2 = LWSH.ToString();
			while (LSH2.Length < 5) //å¦ææµæ°´å·ä½æ°å°äº 5 åé¢è¡¥0
			while (LSH2.Length < LWSHlen) //å¦æå¤ç®±æµæ°´å·ä½æ°å°äº å¤ç®±æµæ°´å·é¿åº¦ åé¢è¡¥0
			{
			LSH2 = "0" + LSH2;
			}
			@@ -884,13 +933,13 @@

			HEntryID = j + 1;
			HBarCode = TM.ToUpper();
			HBarCodeType = "å¤ç®±ç ";
			HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
			HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
			HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
			HQty = HWMinQty;
			HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
			HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
			HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
			HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
			HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
			HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
			@@ -908,12 +957,12 @@
			HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
			HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
			HSno = 0;
			HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
			HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
			HBoxNo = HBoxNo.ToUpper();
			sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // çé¢ä¸è¾å¥çæ¹æ¬¡ä½

			//å®¢æ·æå·HCusModelNameãç©æç±»å«HCode1ãæ¹æ¬¡ä½HCode2ãçæ¬å·HCode3ãæ¹æ¬¡åºåå·HSnoãæ¹æ¬¡çæåç¼HBoxNoãååä»£ç HCusModel
			//çé¢ä¸è¾å¥çæ¹æ¬¡ä½HSupNameã36è¿å¶æ¹æ¬¡åºåå·HSupNumberãå®¢æ·è®¢åå·HInnerBillNo
			//å®¢æ·æå·HCusModelNameãç©æç±»å«HCode1ãæ¹æ¬¡ä½HCode2ãçæ¬å·HCode3ãæ¹æ¬¡åºåå·HSnoãæ¹æ¬¡çæåç¼HBoxNoãå®¢æ·ç©æåç§°HCusModel
			//çé¢ä¸è¾å¥çæ¹æ¬¡ä½HSupNameã36è¿å¶æ¹æ¬¡åºåå·HSupNumberãå®¢æ·è®¢åå·HInnerBillNoãå¹´å¨HWorkLineName
			oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
			"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
			",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
			@@ -935,7 +984,7 @@
			+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
			+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
			+ ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
			+ ",'" + ClsPub.CurUserName + "',getdate(),'','','" + HMTONo + "'"
			+ ",'" + ClsPub.CurUserName + "',getdate(),'','" + sYearWeek + "','" + HMTONo + "'"
			+ ",0,'','','" + HInnerBillNo + "'"
			+ ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
			+ ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
			@@ -965,7 +1014,7 @@
			private void Display()
			{
			//å·æ°åç®±ç åè¡¨
			DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and æ¡ç ç±»å='åç®±ç ' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
			DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å='åç®±ç ' or æ¡ç ç±»å='åèåç®±ç ' or æ¡ç ç±»å='é¡ºè¾¾åç®±ç ') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
			//çæé¦è¡æ é¢
			if (DSet == null)
			{
			@@ -976,7 +1025,7 @@
			grdSub.DataSource = DSet.Tables[0].DefaultView;

			//å·æ°å¤ç®±ç åè¡¨
			DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and æ¡ç ç±»å='å¤ç®±ç ' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
			DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å='å¤ç®±ç ' or æ¡ç ç±»å='åèå¤ç®±ç ' or æ¡ç ç±»å='é¡ºè¾¾å¤ç®±ç ') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
			//çæé¦è¡æ é¢
			if (DWSet == null)
			{
			@@ -1036,7 +1085,7 @@
			private void initGrid()
			{
			grdMain.RowCount = 0;
			grdMain.ColumnCount = 46; //æ»åæ°
			grdMain.ColumnCount = 47; //æ»åæ°
			DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
			grdMain.Columns[HSnoCol].HeaderText = "åºå·";
			grdMain.Columns[HMainIDCol].HeaderText = "æºåä¸»ID";
			@@ -1048,6 +1097,7 @@
			grdMain.Columns[HMaterNameCol].HeaderText = "ç©æåç§°";
			grdMain.Columns[HMaterModelCol].HeaderText = "è§æ ¼åå·";
			grdMain.Columns[HCusModelNameCol].HeaderText = "å®¢æ·æå·";
			grdMain.Columns[HCusModelCol].HeaderText = "å®¢æ·ç©æåç§°";
			grdMain.Columns[HUnitIDCol].HeaderText = "è®¡éåä½ID";
			grdMain.Columns[HUnitNumberCol].HeaderText = "è®¡éåä½ä»£ç ";
			grdMain.Columns[HUnitNameCol].HeaderText = "è®¡éåä½åç§°";
			@@ -1115,6 +1165,8 @@
			//"," + HMaterNumberCol.ToString() +
			"," + HAuxPropNumberCol.ToString() +
			"," + HUnitNumberCol.ToString() +
			"," + HCusModelNameCol.ToString() +
			"," + HCusModelCol.ToString() +
			//"," + HCode1Col.ToString() +
			//"," + HCode2Col.ToString() +
			//"," + HCode3Col.ToString() +
			@@ -1544,6 +1596,8 @@
			"," + HMinQtyCol.ToString() +
			"," + HWMinQtyCol.ToString() +
			"," + HAuxPropNumberCol.ToString() +
			"," + HCusModelNameCol.ToString() +
			"," + HCusModelCol.ToString() +
			//"," + HCode1Col.ToString() +
			//"," + HCode2Col.ToString() +
			//"," + HCode3Col.ToString() +
			@@ -1863,11 +1917,23 @@
			DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_CusMatNo " + num.ToString() + "," + HCusID.ToString() + "," + HMaterID.ToString(), "h_p_Gy_CusBarCodeBill_CusMatNo");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			grdMain.Rows[j].Cells[HCusModelNameCol].Value = "";
			//ç½æ ¼ä¸æéæ©æ¡
			DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
			column.Items.Add("");
			grdMain.Rows[j].Cells[HCusModelNameCol] = column;
			grdMain.Rows[j].Cells[HCusModelCol].Value = "";
			}
			else
			{
			//ç½æ ¼ä¸æéæ©æ¡
			DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			column.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HCusRelationNumber"]));
			}
			grdMain.Rows[j].Cells[HCusModelNameCol] = column;
			grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
			grdMain.Rows[j].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationName"]);
			if (num == 2)
			{
			grdMain.Rows[j].Cells[HCode1Col].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCode1"]);