MES-WEB-API.git

			@@ -155,6 +155,8 @@
			//
			public string ModName = "85";
			public string ModCaption = "æ¡ç çæ";
			public const string ModRightName = "Gy_BarCodeBill";
			public const string ModRightNameSourceQty = ModRightName + "_SourceQty"; //è¶æºåæ°éæ§å¶
			public bool BillChange; //

			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			@@ -206,6 +208,10 @@
			cmbHBarCodeType.Items.Add("ä»ªå¨æåæ¡ç è§å");
			cmbHBarCodeType.Items.Add("è¯åæåæ¡ç è§å");
			}
			else if (sCapName == "ä¸æ§")
			{
			cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç ");
			}
			else
			{
			//
			@@ -215,20 +221,28 @@
			//cmbHBarCodeType.Items.Add("æçæ¡ç ");
			}

			//
			cmbSourceBillType.Items.Add("çäº§è®¢å");
			cmbSourceBillType.Items.Add("çäº§æ±æ¥å");
			cmbSourceBillType.Items.Add("éè´è®¢å");
			cmbSourceBillType.Items.Add("æ¶æéç¥å");
			cmbSourceBillType.Items.Add("å§å¤è®¢å");
			cmbSourceBillType.Items.Add("å·¥åºæ±æ¥å");
			cmbSourceBillType.Items.Add("å·¥åºæµè½¬å¡");
			cmbSourceBillType.Items.Add("éè´§éç¥å");
			cmbSourceBillType.Items.Add("å¶ä»å¥åºå");
			cmbSourceBillType.Items.Add("ç´æ¥è°æ¨å");
			cmbSourceBillType.Items.Add("éè´éæå");
			cmbSourceBillType.Items.Add("çäº§éæå");
			cmbSourceBillType.Items.Add("ç»è£æå¸å");
			//æºåç±»å
			if (sCapName == "ä¸æ§")
			{
			cmbSourceBillType.Items.Add("çäº§æ±æ¥å");
			cmbSourceBillType.Items.Add("æ¶æéç¥å");
			}
			else
			{
			cmbSourceBillType.Items.Add("çäº§è®¢å");
			cmbSourceBillType.Items.Add("çäº§æ±æ¥å");
			cmbSourceBillType.Items.Add("éè´è®¢å");
			cmbSourceBillType.Items.Add("æ¶æéç¥å");
			cmbSourceBillType.Items.Add("å§å¤è®¢å");
			cmbSourceBillType.Items.Add("å·¥åºæ±æ¥å");
			cmbSourceBillType.Items.Add("å·¥åºæµè½¬å¡");
			cmbSourceBillType.Items.Add("éè´§éç¥å");
			cmbSourceBillType.Items.Add("å¶ä»å¥åºå");
			cmbSourceBillType.Items.Add("ç´æ¥è°æ¨å");
			cmbSourceBillType.Items.Add("éè´éæå");
			cmbSourceBillType.Items.Add("çäº§éæå");
			cmbSourceBillType.Items.Add("ç»è£æå¸å");
			}
			//
			DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
			//
			@@ -424,6 +438,16 @@
			PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
			UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
			}
			//ç³»ç»åæ°ï¼ææºåçææ¡ç ï¼çææ¡ç æ°éå¯å¦è¶æºåæ°éæ§å¶ï¼Nä¸ºä¸å¯è¶æºåæ°éï¼
			if (SourceQtyCtl == "N")
			{
			//ç³»ç»åæ°ä¸ºä¸å¯è¶æºåæ°éæ¶ï¼åæ¬¡å¤æç¨æ·æéæ¯å¦å¯è¶æºåæ°é
			//å¤ææé
			if (ClsPub.Security_Log(ModRightNameSourceQty, 3, false, ClsPub.CurUserName))
			{
			SourceQtyCtl = "Y";
			}
			}

			cmbHWorksNumber.Items.Clear();
			if (CampanyName == "é£é¾") //ç³»ç»åæ° å®¢æ·å®å¶ååç§°
			@@ -577,23 +601,6 @@
			//åæ®å®æ´æ§å¤æ æªå®æ
			private bool Sub_AllowSave()
			{
			////å¿è¾é¡¹ç®æ¯å¦ä¸ºç©º
			//if (txtHDeptID.Tag.ToString().Trim() == "0")
			//{
			// MessageBox.Show("çäº§è½¦é´æ²¡æéæ©ï¼", "æç¤º");
			// return false;
			//}
			//if (txtHGroupID.Tag.ToString().Trim() == "0")
			//{
			// MessageBox.Show("çç»æ²¡æéæ©ï¼", "æç¤º");
			// return false;
			//}
			//åæ®å·æ¯å¦éå¤
			//if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, txtHBillNo.Text.Trim(), BillStatus, BillOld.omodel.HInterID))
			//{
			// MessageBox.Show("åæ®å·éå¤ï¼", "æç¤º");
			// return false;
			//}
			//æç»è¡¨æ¯å¦ä¸ºé¶è¡
			bool b = false;
			for (int i = 0; i < grdMain.RowCount; i++)
			@@ -754,6 +761,8 @@
			int k = 0;
			Int64 n = 0; //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡
			string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼
			string sSourceBillNo = ""; //æºåå·
			string sSourceEntryID = ""; //è¡å·ï¼æºååIDï¼
			DataSet Ds;
			//Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
			//LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			@@ -815,6 +824,23 @@
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "ä¸æ§")
			{
			sSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
			sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
			if (sSourceBillNo == "")
			{
			//æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥
			sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
			Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			//æ¡ç = æºååå· + ç©æID + è¡å·
			sTMNumber = sSourceBillNo + HNumber + sSourceEntryID;
			}
			}
			else //éç¨æ¹æ³
			{
			@@ -924,6 +950,8 @@
			return;
			}

			Int64 HBQty2 = 0; //ç®±æ°
			HBQty2 =ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
			HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
			HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
			@@ -957,8 +985,30 @@
			}
			if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			if (CampanyName == "ä¸æ§")
			{
			if (sSourceBillNo == "")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			else
			{
			if (HBQty2 > 1)
			{
			MessageBox.Show("çäº§æ±æ¥åãæ¶æéç¥åçææ¡ç æ¶ï¼ç®±æ°ä¸è½å¤§äº1ï¼");
			bc.Enabled = true;
			return;
			}
			//æ¡ç ç¼å· = æ¡ç åç¼
			TM = sTMNumber;
			}
			}
			else
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;
			}
			}
			else if (cmbHBarCodeType.Text == "åºåç ")
			{
			@@ -2060,6 +2110,11 @@
			grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
			grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
			}
			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
			grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
			}
			oEdit.Text = oMater.omodel.HNumber;
			}
			else
			@@ -2189,7 +2244,17 @@

			if (cmbSourceBillType.Text.Trim() == "çäº§è®¢å")
			{
			string sWhere = " and HOrgID =" + HOrgID.ToString();
			string sWhere = "";
			//ç³»ç»åæ°ï¼çææ¡ç æ°éå¯å¦è¶æºåæ°éæ§å¶ï¼Nä¸ºä¸å¯è¶æºåæ°éï¼
			if (SourceQtyCtl == "N")
			{
			sWhere = " and HOrgID =" + HOrgID.ToString() + " and ä»»å¡æ°é>0";
			}
			else
			{
			sWhere = " and HOrgID =" + HOrgID.ToString();
			}

			DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
			if (oIFCLD_ICMOList.Refresh(sWhere)) //éæ©åå
			{
			@@ -2343,7 +2408,8 @@
			grdMain.Rows.Add();
			grdMain.Rows[i].Cells[HTagCol].Value = "*";
			//å¾å°ä¿¡æ¯
			Ds = oCn.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
			Ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_ICMOBillList");
			//Ds = oCn.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
			//åå¥ä¿¡æ¯
			Sub_WriteInForm(Ds.Tables[0], i);
			}
			@@ -2393,7 +2459,7 @@
			grdMain.Rows.Add();
			grdMain.Rows[i].Cells[HTagCol].Value = "*";
			//å¾å°ä¿¡æ¯
			Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInList");
			Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBillList_Source where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source");
			//åå¥ä¿¡æ¯
			Sub_WriteInForm1(Ds.Tables[0], i);
			}
			@@ -2477,7 +2543,7 @@
			//åå¥ä¿¡æ¯
			Sub_WriteInForm1(Ds.Tables[0], i);
			}
			//çäº§æ±æ¥å
			//å·¥åºæ±æ¥å
			if (oSelectRow.BillType == "3714")
			{
			grdMain.Rows.Add();
			@@ -2561,6 +2627,11 @@
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();
			}
			grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
			grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].ToString();
			grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
			grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
			grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
			//--
			//è®¾ç½®å¯ç¼è¾å
			string sAllowCol = HQtyCol.ToString() +
			@@ -2611,6 +2682,11 @@
			grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["è®¡éåä½"].ToString();
			grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["å¤æ³¨"].ToString();
			grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["è®¡åè·è¸ªå·"].ToString();
			grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["çäº§æ¥æ"].ToString();
			grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["æææè³"].ToString();
			grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
			grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
			grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
			if (cmbHBarCodeType.Text == "ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]);
			@@ -2621,7 +2697,14 @@
			}
			else
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();
			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]);
			}
			else
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°åè£æ°"].ToString();
			}
			}
			grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
			if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å"\|\| cmbSourceBillType.Text.Trim() == "éè´è®¢å"
			@@ -2722,6 +2805,10 @@
			grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
			grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
			grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
			if (CampanyName == "ä¸æ§")
			{
			grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æ°é"]);
			}
			//--
			//è®¾ç½®å¯ç¼è¾å
			string sAllowCol = HQtyCol.ToString() +
			@@ -3405,15 +3492,32 @@
			if (cmbSourceBillType.Text.Trim() == "çäº§è®¢å")
			{
			DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
			if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //éæ©åå
			//ç³»ç»åæ°ï¼çææ¡ç æ°éå¯å¦è¶æºåæ°éæ§å¶ï¼Nä¸ºä¸å¯è¶æºåæ°éï¼
			if (SourceQtyCtl == "N")
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString() + " and ä»»å¡æ°é>0")) //éæ©åå
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //éæ©åå
			{
			FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
			txtHSourceBillNo.Text = "";
			}
			else
			{
			MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»åä¸æºååå·æ¯å¦æ£ç¡®ï¼");
			return;
			}
			}
			}
			else if (cmbSourceBillType.Text.Trim() == "çäº§æ±æ¥å")
			@@ -3613,11 +3717,37 @@
			}
			else
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç ");
			cmbHBarCodeType.Items.Add("åç§æ¡ç ");
			cmbHBarCodeType.Items.Add("æ¹æ¬¡æ¡ç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			if (CampanyName == "å¤å®çµå¨")
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("åéæºæ¡ç ");
			cmbHBarCodeType.Items.Add("å¤éæºæ¡ç ");
			cmbHBarCodeType.Items.Add("åæåæ¡ç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			else if (CampanyName == "åæ¥ç§æ")
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("ä»ªå¨å¤è´ä»¶æ¡ç æ®éè§å");
			cmbHBarCodeType.Items.Add("ä»ªå¨å¤è´ä»¶æ¡ç å®¹å¨è§å");
			cmbHBarCodeType.Items.Add("ä»ªå¨æåæ¡ç è§å");
			cmbHBarCodeType.Items.Add("è¯åæåæ¡ç è§å");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			else if (CampanyName == "ä¸æ§")
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			else
			{
			cmbHBarCodeType.Items.Clear();
			cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç ");
			cmbHBarCodeType.Items.Add("åç§æ¡ç ");
			cmbHBarCodeType.Items.Add("æ¹æ¬¡æ¡ç ");
			this.cmbHBarCodeType.SelectedIndex = 0;
			}
			}
			}
			}