From c9d3e78b9afb5693df5026fcec064767eb1ed801 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 20 一月 2021 13:23:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes
---
SCM/条码打印/Gy_BarCodeBill.cs | 5
SCM/单据资料/Sc_ICMOReportToBarCode.cs | 553 +++++++++++++++++++++++++++++++++++++++++++++++++
SCM/单据资料/Sc_ICMOReportToBarCode.designer.cs | 29 --
SCM/单据资料/Sc_ICMOReportToBarCode.resx | 16
SCM/生产管理/Gy_BadReasonList.resx | 4
5 files changed, 556 insertions(+), 51 deletions(-)
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
index 8a5a5ce..460bbaa 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
锘縰sing System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -539,6 +540,549 @@
sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+=======
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+using System.IO.Ports;
+
+namespace SCM
+{
+ public partial class Sc_ICMOReportToBarCode : Form
+ {
+ public Sc_ICMOReportToBarCode()
+ {
+ InitializeComponent();
+ }
+
+ public frmBillQueryCondition_Base frmCondition;
+ public string ModCaption = "鎴愬搧鍒嗗垏鍦ㄧ嚎妫�楠�";
+ public string ModName = "Sc_ICMOReportToBarCode";
+ public string HSourceBillTypeID = ""; //鍗曟嵁绫诲瀷
+ public string HSourceBillType = ""; //鍗曟嵁绫诲瀷鍚嶇О
+ public string HSourceBillNo = "";
+ public Int64 HSourceInterID = 0;
+ public Int64 HSourceEntryID = 0;
+ public int HTMCol = 0;
+ public int HMaterIDCol = 1;
+ Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
+ public Int32 iTopRow = 0;//鐢绘í绾�
+ SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();
+ //
+
+ #region 鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ //娓呯┖鐣岄潰鎺т欢 for 鎺т欢
+ foreach (Control ct in gbUp.Controls)
+ {
+ switch (ct.GetType().Name)
+ {
+ case "ComboBox":
+ ((ComboBox)ct).SelectedIndex = 0;
+ break;
+ case "TextBox":
+ ((TextBox)ct).Text = "";
+ break;
+ case "DateTimePicker":
+ ((DateTimePicker)ct).Value = DateTime.Today;
+ break;
+ default:
+ break;
+ }
+ }
+ //
+ txtHMaker.Text = ClsPub.CurUserName;
+ initGrid();
+ }
+
+ private void Sc_ICMOReportToBarCode_Load(object sender, EventArgs e)
+ {
+ //璁剧疆鍔ㄦ�乁RL
+ oWeb.Url = SCM.ClsPub1.WEBSURL;
+ //
+ frmCondition = new frmBillQueryCondition_Base();
+ this.Text = ModCaption;
+ oSumGrid.ogrdMain = grdSub; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ initGrid();
+ //cmbHBillType.SelectedIndex = 0;
+ //cmbHSourceBillType.SelectedIndex = 0;
+ cmbFQMB.Items.Add(this.Text);
+ cmbFQMB.SelectedIndex = 0;
+
+ if(DBUtility.ClsPub.CurUserName.ToLower()=="admin")
+ {
+ txtHDQQty.ReadOnly = false;
+ txtHKSQty.ReadOnly = false;
+ }
+ }
+
+ //鍒濆鍖栫綉鏍�
+ private void initGrid()
+ {
+ ClsPub1.initGridList(grdMain, this.Name);
+ ClsPub1.initGridList(grdSub, this.Name + "grdSub");
+ ClsPub1.initGridFst(grdEmp, this.Name + "grdEmp");
+ grdMain.RowTemplate.Height = 30;
+ grdMain.RowTemplate.MinimumHeight = 30;
+ grdMain.RowsDefaultCellStyle.Font = new Font("瀹嬩綋", 15);
+ grdMain.ReadOnly = true;
+
+ grdSub.RowTemplate.Height = 30;
+ grdSub.RowTemplate.MinimumHeight = 30;
+ grdSub.RowsDefaultCellStyle.Font = new Font("瀹嬩綋", 15);
+ grdSub.ReadOnly = true;
+
+ grdEmp.RowTemplate.Height = 30;
+ grdEmp.RowTemplate.MinimumHeight = 30;
+ grdEmp.RowsDefaultCellStyle.Font = new Font("瀹嬩綋", 15);
+ grdEmp.ReadOnly = false;
+ //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ //DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.GetGrid(grdEmp, this.Name + "grdEmp");
+ }
+
+ //鏃堕棿鎺т欢
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled=false;
+ Sub_ClearBill();
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ timer2.Enabled = false;
+ //
+ if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("娌℃湁鎵惧埌")==false)
+ {
+ txtPortName.Text = ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtBaudRate.Text = ClsIni.ReadIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ cmbParity.Text = ClsIni.ReadIni("COMINFO", "cmbParity", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtDataBits.Text = ClsIni.ReadIni("COMINFO", "txtDataBits", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ cmbStopBits.Text = ClsIni.ReadIni("COMINFO", "cmbStopBits", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtHSend0.Text = ClsIni.ReadIni("COMINFO", "txtHSend0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtHSend.Text = ClsIni.ReadIni("COMINFO", "txtHSend", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtHSourceID.Text = ClsIni.ReadIni("COMINFO", "txtHSourceID", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ txtHSourceID.Tag = ClsIni.ReadIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ this.Text = this.Text + "-" + txtHSourceID.Text;
+ }
+
+ //鍒濆鍖栦覆鍙�
+ ComDevice = new SerialPort();
+ ComDevice.DataReceived += new SerialDataReceivedEventHandler(Com_DataReceived);//缁戝畾浜嬩欢
+ string[] PortNames = SerialPort.GetPortNames();
+ //鎵撳紑涓插彛
+ OpenCom();
+ }
+
+ //閫�鍑�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ private void GraphicsGrid()
+ {
+ //鐢诲簳绾�
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ //鐢绘í绾�
+ DBUtility.Xt_BaseBillFun.GraphicsRowGrid(grdMain, iTopRow, iTopRow + 50, Fun_GetCol("hmainid"));
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdEmp, this.Name + "grdEmp");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdEmp, this.Name + "grdEmp");
+ }
+
+ #endregion
+
+
+ #region 杩斿洖婧愬崟淇℃伅
+
+ private void xd_Click(object sender, EventArgs e)
+ {
+
+ }
+
+
+ private void Display(string SourceBillType, Int64 HSourceBillInterID, Int64 HSourceBillEntryID)
+ {
+ DataSet Ds;
+ //鐢熶骇璁㈠崟
+ if (SourceBillType == "鐢熶骇璁㈠崟")
+ {
+ //寰楀埌淇℃伅
+ Ds = oWeb.getDataSetBySQL("select * from h_v_IFCLD_ICMOList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IFCLD_ICMOList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], 0);
+ }
+ //鏀舵枡閫氱煡鍗�
+ if (SourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ //寰楀埌淇℃伅
+ Ds = oWeb.getDataSetBySQL("select * from h_v_IF_POInStockList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IF_POInStockList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], 0);
+ }
+ //鐢熶骇姹囨姤鍗�
+ if (SourceBillType == "鐢熶骇姹囨姤鍗�")
+ {
+ //寰楀埌淇℃伅
+ Ds = oWeb.getDataSetBySQL("select * from h_v_IF_ICMOReportBillList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IF_POInStockList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], 0);
+ }
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm(DataTable oTable, int i)
+ {
+ try
+ {
+ txtHSourceBillNo.Text = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ txtHMaterNumber.Text = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ txtHOldMaterNumber.Text = oTable.Rows[0]["鏃х墿鏂欑紪鐮�"].ToString();
+ txtHMaterNumber.Tag = oTable.Rows[0]["HMaterID"].ToString();
+ txtHMaterName.Text = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ txtHMaterName.Tag = oTable.Rows[0]["HMaterID"].ToString();
+ txtHMaterModel.Text = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ txtHUnitName.Text = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ txtHUnitName.Tag = oTable.Rows[0]["HUnitID"].ToString();
+ txtHBatchNo.Text = oTable.Rows[0]["鎵规"].ToString();
+ txtHSumQty.Text = oTable.Rows[0]["鏁伴噺"].ToString();
+ txtHRelationQty.Text = oTable.Rows[0]["宸茬敓鎴愭潯鐮佹暟閲�"].ToString();
+ txtHSYQty.Text = oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ txtHKSQty.Text = lblHNowQty.Text;
+ txtHDQQty.Text = lblHNowQty.Text;
+ if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text)>0)
+ {
+ txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);
+ }
+ else
+ {
+ txtHSJQty.Text = "0";
+ }
+ DisplayMain();
+ //DisplaySub();
+ }
+ catch(Exception e)
+ {
+ MessageBox.Show("璇诲彇澶辫触锛�" + e.Message);
+ }
+ }
+
+
+ private void DisplayMain()
+ {
+ DataSet DSet;
+ string sSql = "";
+ string sWhere = "";
+ //杩囨护鏉′欢
+ sSql = " exec h_p_Sc_ICMOReportToBarCode_All '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();
+ //
+ DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_All", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ if (DSet.Tables[0].Rows.Count>0)
+ {
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ }
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(0);
+ string s = "鏄�";
+ ClsPub1.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //鐢荤嚎
+ //Total();
+ ///////////////////////////////////////////
+ if (DSet.Tables[1].Rows.Count > 0)
+ {
+ grdSub.DataSource = DSet.Tables[1].DefaultView;
+ }
+ //鍐荤粨
+ ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ /////////////////////////////
+ txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["鍏宠仈鏁伴噺"], 1);
+ if(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text)>=0)
+ {
+ txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 1);
+ }
+ else
+ {
+ txtHSYQty.Text = "0";
+ }
+ //////////////////////////
+ }
+
+ private void DisplaySub()
+ {
+ DataSet DSet;
+ string sSql = "";
+ string sWhere = "";
+ //杩囨护鏉′欢
+ sSql = " exec h_p_Sc_ICMOReportToBarCode_Sub '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();
+
+ //
+ DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_Sub", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdSub.DataSource = DSet.Tables[0].DefaultView;
+
+
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(0);
+ string s = "鏄�";
+ ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ //鐢荤嚎
+ //Total();
+ }
+
+
+ #endregion
+
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ string sBarCode = "";
+
+ //棰勮
+ int CurRows = 0;
+
+
+
+
+
+
+
+ #endregion
+
+
+ #region 鐣岄潰鎺т欢澶勭悊
+
+ private void cmdHDeptID_Click(object sender, EventArgs e)
+ {
+ SCM.ClsIF_Department_View oDept = new SCM.ClsIF_Department_View();
+ string sWhere = "";
+ if (oDept.RefreshView(sWhere))
+ {
+ this.txtHDeptID.Text = oDept.oModel.HName;
+ this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHDeptID.Text = "";
+ }
+ }
+
+ private void txtHDeptID_TextChanged(object sender, EventArgs e)
+ {
+ BLL.ClsPub_BLL.Sub_ClearText(txtHDeptID);
+ }
+
+ #endregion
+
+
+ //閫夋嫨婧愬崟
+ private void cmdHSourceBillNo_Click(object sender, EventArgs e)
+ {
+ Gy_SourceBillList_Touch oGy_SourceBillList_Touch = new Gy_SourceBillList_Touch();
+ oGy_SourceBillList_Touch.HSourceBillType = HSourceBillType;//绫诲瀷鍚嶇О
+ oGy_SourceBillList_Touch.ShowDialog();
+ if (oGy_SourceBillList_Touch.OKTag == 1)
+ {
+ //鏍规嵁閫変腑鐨勬簮鍗曞唴鐮佸拰瀛愬唴鐮侊紝杩斿洖鐩稿簲淇℃伅
+ HSourceEntryID = oGy_SourceBillList_Touch.HSelEntryID;
+ HSourceInterID = oGy_SourceBillList_Touch.HSelInterID;
+ HSourceBillTypeID = oGy_SourceBillList_Touch.HSourceBillTypeID;
+ HSourceBillNo = oGy_SourceBillList_Touch.HSourceBillNo;
+ Display(HSourceBillType, oGy_SourceBillList_Touch.HSelInterID, oGy_SourceBillList_Touch.HSelEntryID);
+ }
+ else
+ {
+ HSourceEntryID = 0;
+ HSourceInterID = 0;
+ HSourceBillTypeID = "";
+ HSourceBillNo = "";
+ }
+ }
+
+ //
+ private void cmdCancel_Click(object sender, EventArgs e)
+ {
+ CloseCom();
+ this.Close();
+ }
+
+ private void label19_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ public bool SaveBill(string sType)
+ {
+ try
+ {
+ int LSHlen = 2; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ string HNumber = ""; //鐗╂枡浠ｇ爜
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //绠辨暟
+ double HQty = 0; //鏁伴噺
+ string WeiShu = ""; //灏炬暟
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string HBatchNo = ""; //鎵规
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ DataSet Ds;
+ //
+ string HWei = ""; //灏炬暟
+ HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ DateTime HBeginDate;
+ string HSeOrderBillNo = "";
+ string HJiaYe2 = "";
+ string HPressModel = "";
+ string HCusModel = "";
+ string HMaterialModel = "";
+ string HColor = "";
+ string HLogo = "";
+ string HPackageSize = "";
+ double HMaterialJQty = 0;
+ double HMaterialMQty = 0;
+ string HCustomBatchNo = "";
+ string HGBBarCode = "";
+ string POOrderBillNo = "";
+ //
+ cmdHSaveBill.Enabled = false;
+ //鍒ゆ柇鏄惁瀛樺湪 婧愬崟淇℃伅锛�
+ if (HSourceInterID <= 0 || HSourceEntryID <= 0 || DBUtility.ClsPub.isLong(txtHMaterName.Tag) <= 0 || DBUtility.ClsPub.isLong(txtHUnitName.Tag) <= 0)//鍒ゆ柇鏄惁鏈夋簮鍗�
+ {
+ MessageBox.Show("娌℃湁閫夊崟锛�");
+ cmdHSaveBill.Enabled = true;
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) >= 0)
+ {
+ txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1); //瀹為檯绫虫暟= 褰撳墠绫虫暟-寮�濮嬬背鏁�
+ lblHRelQty.Text = txtHSJQty.Text;
+ }
+ else
+ {
+ if (MessageBox.Show("褰撳墠绫虫暟灏忎簬寮�濮嬬背鏁帮紝鏄惁纭畾瑕佹竻闆跺紑濮嬬背鏁�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ txtHKSQty.Text = "0";
+ txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //瀹為檯绫虫暟= 褰撳墠绫虫暟-寮�濮嬬背鏁�
+ lblHRelQty.Text = txtHSJQty.Text;
+ }
+ }
+ if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) <= 0)
+ {
+ MessageBox.Show("褰撳墠鏁伴噺涓嶈兘灏忎簬绛変簬0锛�");
+ cmdHSaveBill.Enabled = true;
+ return false;
+ }
+ //if (DBUtility.ClsPub.isDoule(txtHSYQty.Text) <= 0)
+ //{
+ // MessageBox.Show("鍓╀綑鏁伴噺宸茬粡涓�0锛屼笉鑳藉湪瑁佸垏锛�");
+ // cmdHSaveBill.Enabled = true;
+ // return false;
+ //}
+ if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0 )
+ {
+ MessageBox.Show("鑱屽憳1鎴栬�呰亴鍛�2娌℃湁閫夋嫨锛�");
+ cmdHSaveBill.Enabled = true;
+ return false;
+ }
+ if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0 )
+ {
+ MessageBox.Show("鐝粍娌℃湁閫夋嫨锛�");
+ cmdHSaveBill.Enabled = true;
+ return false;
+ }
+
+
+ //鏍规嵁婧愬崟 鐢熸垚鏉″舰鐮� 骞朵繚瀛樺鏁版嵁搴�
+ HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);
+ HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
+ sDate = dtpHDate.Value.ToShortDateString();
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+>>>>>>> parent of d95a654 (nothing)
sDay = sDay.Substring(sDay.Length - 2, 2);
//鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
@@ -552,12 +1096,10 @@
else if (sType == "Sample")
{
sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text) + "B";
- txtHCheckerResult.Text = "";
}
else
{
sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
- txtHCheckerResult.Text = "";
}
//sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
@@ -683,7 +1225,7 @@
+ ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"
+ ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','"+ HRemark + "')";
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','"+ txtHReasonList.Text + "','"+ HRemark + "')";
oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -774,7 +1316,6 @@
Report.FieldByName("缁勫憳").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text);
Report.FieldByName("鏁伴噺").AsString = ClsPub.isStrNull(txtHSJQty.Text);
Report.FieldByName("鏃х墿鏂欑紪鐮�").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text);
- Report.FieldByName("涓嶈壇鍘熷洜").AsString = ClsPub.isStrNull(txtHCheckerResult.Text);
//Report.FieldByName("婧愬崟鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);
//Report.FieldByName("閿�鍞鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);
//Report.FieldByName("鐢熶骇杞﹂棿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);
@@ -1277,8 +1818,6 @@
{
txtHReasonList.Text = "";
txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
- txtHCheckerResult.Text = "";
- txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;
if (SaveBadReasonBill())
{
MessageBox.Show("淇濆瓨涓嶈壇鍘熷洜鎴愬姛锛�");
@@ -1411,8 +1950,6 @@
{
txtHReasonList.Text = "";
txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
- txtHCheckerResult.Text = "";
- txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;
oGy_BadReasonList = null;
if (SaveBill("SaveDown"))
{
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
index c191fd3..099a8f1 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
@@ -155,8 +155,6 @@
this.label12 = new System.Windows.Forms.Label();
this.button4 = new System.Windows.Forms.Button();
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.txtHCheckerResult = new System.Windows.Forms.TextBox();
- this.label33 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -168,7 +166,6 @@
((System.ComponentModel.ISupportInitialize)(this.grdEmp)).BeginInit();
this.groupBox4.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -893,8 +890,6 @@
// tabPage4
//
this.tabPage4.BackColor = System.Drawing.Color.Lavender;
- this.tabPage4.Controls.Add(this.label33);
- this.tabPage4.Controls.Add(this.txtHCheckerResult);
this.tabPage4.Controls.Add(this.label15);
this.tabPage4.Controls.Add(this.cmbHOrgID);
this.tabPage4.Controls.Add(this.label3);
@@ -1667,27 +1662,6 @@
this.timer3.Interval = 300;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
- // txtHCheckerResult
- //
- this.txtHCheckerResult.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHCheckerResult.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCheckerResult.Location = new System.Drawing.Point(795, 96);
- this.txtHCheckerResult.Name = "txtHCheckerResult";
- this.txtHCheckerResult.ReadOnly = true;
- this.txtHCheckerResult.Size = new System.Drawing.Size(166, 30);
- this.txtHCheckerResult.TabIndex = 151;
- //
- // label33
- //
- this.label33.AutoSize = true;
- this.label33.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label33.ForeColor = System.Drawing.Color.Black;
- this.label33.Location = new System.Drawing.Point(714, 102);
- this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(72, 16);
- this.label33.TabIndex = 152;
- this.label33.Text = "涓嶈壇娓呭崟";
- //
// Sc_ICMOReportToBarCode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1724,7 +1698,6 @@
this.panel1.ResumeLayout(false);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
@@ -1869,7 +1842,5 @@
private System.Windows.Forms.TextBox txtHEmpID3;
private System.Windows.Forms.Button cmdZero;
private System.Windows.Forms.Button cmdSaveAndDown2;
- private System.Windows.Forms.Label label33;
- private System.Windows.Forms.TextBox txtHCheckerResult;
}
}
\ No newline at end of file
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
index 3702151..3a1c07f 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -387,10 +387,10 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
<data name="cmdHEmp3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -718,10 +718,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>292, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>39</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 404b65b..09f8d62 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -92,7 +92,6 @@
public const Int16 HJiaYeLXCol = 71;
public const Int16 HJiaYeLCol = 72;
public const Int16 POOrderBillNoCol = 73;
- public const Int16 HMaker = 74;
public Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
@@ -1538,7 +1537,7 @@
{
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 75; //鎬诲垪鏁�
+ grdMain.ColumnCount = 74; //鎬诲垪鏁�
ClsPub1.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1606,7 +1605,6 @@
grdMain.Columns[HJiaYeLXCol].HeaderText = "鍒跺喎娑茬被鍨�";
grdMain.Columns[HJiaYeLCol].HeaderText = "鍔犳恫閲�";
grdMain.Columns[POOrderBillNoCol].HeaderText = "閲囪喘璁㈠崟鍙�";
- grdMain.Columns[HMaker].HeaderText = "鍒跺崟浜�";
////
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
@@ -2617,7 +2615,6 @@
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- grdMain.Rows[i].Cells[HMaker].Value = ClsPub.CurUserName;
if (CampanyName == "鍦ｉ緳") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
{
diff --git "a/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx" "b/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
index d58980a..19dc0dd 100644
--- "a/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
+++ "b/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
--
Gitblit v1.9.1