From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 238 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 148 insertions(+), 90 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 0129631..23d3fb3 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -107,6 +107,7 @@
DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
+ //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
{
MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
return;
@@ -118,6 +119,7 @@
if (DSet.Tables[0].Rows.Count > 0)
{
txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
}
else
{
@@ -219,6 +221,38 @@
initGrid();
cmbHBarCodeType.SelectedIndex = 0;
dtpHBeginDate.Value = DateTime.Today;
+ string HUserName = "";
+ HUserName = ClsPub.isStrNull(DBUtility.ClsPub.CurUserName);
+ Int64 HUserID = 0;
+ HUserID = ClsPub.isInt(DBUtility.ClsPub.CurUserID);
+
+ DataSet DSet;
+
+ DSet = oCn.RunProcReturn("Select HEmpID from gy_czygl Where czymc='" + HUserName + "'", "gy_czygl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DSet == null)
+ //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ else
+ {
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈� 鍒锋柊鏃舵瘡娆″瓨涓�閬�
+ if (DSet.Tables[0].Rows.Count > 0)
+ {
+
+
+ txtHEmpID.Tag = DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HEmpID"]);
+ }
+ else
+ {
+
+ }
+ }
+
+
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -495,14 +529,14 @@
private void Sub_SetReport(string sOpenTmp)
{
//鍒ゆ柇琛屾暟
- for (int i = 0; i < grdList.Rows.Count; i++)
- {
- grdList.Rows[i].Cells[0].Value = "";
- }
- for (int i = 0; i < grdList.SelectedRows.Count; i++)
- {
- grdList.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
- }
+ //for (int i = 0; i < grdList.Rows.Count; i++)
+ //{
+ // grdList.Rows[i].Cells[0].Value = "";
+ //}
+ //for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ //{
+ // grdList.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
+ //}
//
Report = new GridppReport();
Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
@@ -714,62 +748,6 @@
}
}
- private void zf_Click(object sender, EventArgs e)
- {
- //Sub_AbandonCheck();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
- }
-
- private void fzf_Click(object sender, EventArgs e)
- {
- //this.Sub_CheckBill();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return;
- }
- if (grdMain.CurrentRow == null)
- return;
- DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- {
- return;
- }
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- {
- if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- {
- MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
- return;
- }
- }
- }
- MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
- }
-
private void cmdHSaveBill_Click(object sender, EventArgs e)
{
@@ -810,7 +788,7 @@
int LSHlen = 6; //娴佹按鍙烽暱搴�
string TM = ""; //鏉＄爜
- HDate = DateTime.Now.ToShortDateString();
+ HDate = dtpHBeginDate.Value.ToShortDateString();
HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
@@ -910,6 +888,11 @@
string HWorkLineName = "";
string HSeOrderBillNo = "";
string HInnerBillNo = "";
+ Int64 HSourceID = 0;
+ //姣涢噸
+ Double HMZQty = 0;
+ HMZQty = HZXQty * ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鍏嬮噸")].Value)/1000;
+
HWei = WeiShu;
HBarCode = TM;
HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
@@ -939,20 +922,21 @@
HWorkLineName = "";
HSeOrderBillNo = "";
HInnerBillNo = sPackBarCode;
- oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ HSourceID = ClsPub.isInt(txtHSourceID.Tag);
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HMaterialMQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
- + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
- + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+ + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
@@ -968,7 +952,7 @@
sPackBarCode = "";
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_CS Where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜'", "h_v_IF_BarCodeBillList_CS", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -977,6 +961,7 @@
}
//
grdList.DataSource = DSet.Tables[0].DefaultView;
+ txtHZXQty.Text = "";
//鍐荤粨
int FrCol = 0;
string s = "鏄�";
@@ -995,7 +980,7 @@
//0缁撴潫浜嬪姟
//
- Display();
+ //Display();
}
@@ -1012,30 +997,44 @@
{
//鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紙鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
- //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
+ //濡傛灉鏈夋爣鍑嗚绠辨暟閲� 鍏堥粯璁ゅ彇鏍囧噯瑁呯鏁伴噺 娌℃湁鍐嶅彇鎵嬭緭鐨勬湰绠辨暟閲�
+ //1.鍒ゆ柇鏈鏁伴噺 蹇呴』澶т簬0
double HZXQty = 0;//鏁寸鏁伴噺
- HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ if (txtHZXQty.Text.Trim() != "")
+ {
+ HZXQty = ClsPub.isDoule(txtHZXQty.Text);
+ }
+ else
+ {
+ HZXQty = ClsPub.isDoule(txtHMiniQty.Text);
+ }
if (HZXQty <= 0)
{
MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
return;
}
//2.鍒锋柊缃戞牸
- Display();
+ //Display();
//3.鎶婃暣绠辨暟閲� 鍒嗛厤鍒� 缃戞牸涓嬮潰鐨勬瘡涓�涓� 鐢熶骇璁㈠崟涓婂幓銆� 寰幆缃戞牸
for(int i =0;i<grdMain.Rows.Count;i++)
{
- if(HZXQty>0)
+ if (HZXQty > 0)
{
- if(HZXQty>DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
+ if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value))
{
HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+
+ //MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
+ //return;
}
else
{
grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = HZXQty;
- break;
+ //
+
+ //HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+ //grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
}
}
else
@@ -1701,18 +1700,51 @@
private void cmdHSourceID_Click(object sender, EventArgs e)
{
+ Int64 HEmpID = 0;
+ HEmpID = Convert.ToInt64(txtHEmpID.Tag);
+
+
+ //MessageBox.Show(ClsPub.isStrNull(HEmpID));
+ //string HEmpName = "";
+ //HEmpName = ClsPub.isStrNull(txtHEmpID.Text);
+
DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
- if (oSource.RefreshView())
+ if (HEmpID != 0)
{
- this.txtHSourceID.Text = oSource.oModel.HName;
- this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
- //
- Display();
+ if (oSource.GetInfoByID_AoBang(HEmpID))
+ {
+ this.txtHSourceID.Text = oSource.oModel.HName;
+ this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
+ //
+ Display();
+ }
+ else
+ {
+ this.txtHSourceID.Text = "";
+ }
}
else
{
- this.txtHSourceID.Text = "";
+
+ if (oSource.RefreshView())
+ {
+ this.txtHSourceID.Text = oSource.oModel.HName;
+ this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
+ //
+ Display();
+ }
+ else
+ {
+ this.txtHSourceID.Text = "";
+ }
}
+ //if (oSource.RefreshView())
+ //{
+ // this.txtHSourceID.Text = oSource.oModel.HName;
+ // this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
+ // //
+ // Display();
+ //}
//DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
//if (oWork.RefreshView())
@@ -1897,6 +1929,7 @@
grdList.DataSource = null;
grdSub.DataSource = null;
grdMain.DataSource = null;
+ txtHEmpID.Tag = 0;
}
private void button2_Click(object sender, EventArgs e)
@@ -1907,14 +1940,29 @@
DataSet DSBefore;
DSBefore = SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
grdMain.DataSource = DSBefore.Tables[0].DefaultView;
- if (DSBefore.Tables[0].Rows.Count > 0)
+ //if (DSBefore.Tables[0].Rows.Count > 0)
+ //{
+ // txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ //}
+ //else
+ //{
+
+ //}
+ if (DSBefore == null || DSBefore.Tables[0].Rows.Count == 0)
+ //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
{
- txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ MessageBox.Show("娌℃湁涓婁竴涓墿鏂�,濡傛灉闇�瑕佽鎵炬満淇紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
}
else
{
-
+ grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
}
+
+
+
}
private void button3_Click(object sender, EventArgs e)
@@ -1925,9 +1973,19 @@
HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
DataSet DSBefore;
DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
- grdMain.DataSource = DSBefore.Tables[0].DefaultView;
- txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
- txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
+ if (DSBefore == null || DSBefore.Tables[0].Rows.Count == 0)
+ //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("娌℃湁涓嬩竴涓墿鏂�,濡傛灉闇�瑕佽鎵炬満淇紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ else
+ {
+ grdMain.DataSource = DSBefore.Tables[0].DefaultView;
+ txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+ txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+ }
+ //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
}
//瓒呴鎵撳嵃
@@ -1943,7 +2001,7 @@
return;
}
//2.鍒锋柊缃戞牸
- Display();
+ //Display();
//3.寰幆缃戞牸锛岀疮璁″叏閮ㄥ墿浣欐暟閲忥紝鍒ゆ柇鏄惁 鍓╀綑鏁伴噺 灏忎簬 鏈鏁伴噺锛涘鏋� 澶т簬鍒欐姤閿� 閫�鍑恒��
double sumLeftQty = 0;
for (int i = 0; i < grdMain.Rows.Count; i++)
--
Gitblit v1.9.1