From 055b64bfcdcb83aafa2986566df3fba49ed2eb98 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 四月 2022 14:02:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 240 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 197 insertions(+), 43 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 5f5cfa8..9411e2a 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,12 +107,27 @@
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;
}
+ else
+ {
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈� 鍒锋柊鏃舵瘡娆″瓨涓�閬�
+ 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
+ {
+
+ }
+ }
//
- grdMain.DataSource = DSet.Tables[0].DefaultView;
+
//鏍囧噯瑁呯
//for (int i = 0; i < grdMain.SelectedRows.Count; i++)
@@ -206,6 +221,12 @@
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);
+ txtHEmpID.Text = HUserName;
+ txtHEmpID.Tag = HUserID;
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -482,14 +503,14 @@
private void Sub_SetReport(string sOpenTmp)
{
//鍒ゆ柇琛屾暟
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- grdMain.Rows[i].Cells[0].Value = "";
- }
- for (int i = 0; i < grdMain.SelectedRows.Count; i++)
- {
- grdMain.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 .
@@ -529,7 +550,7 @@
try
{
DataTable ds = new DataTable();
- BLL.Utility.FillRecordToReport_Sel(Report, grdMain, ds, Fun_GetCol("閫夋嫨"));
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
}
catch (Exception e)
{
@@ -818,13 +839,24 @@
//鐢熸垚涓�涓绠辩爜
string sPackStr = "ZXM" + HYear + HPeriod + HDay; //澶栫鐮� 鍓嶇紑
DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
- Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
- string sPackBarCode = sPackStr + LSH.ToString();
+ Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+ string sPackBarCode = sPackStr + TTM_LSH.ToString();
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
-
+
+
+ //MessageBox.Show("11");
+ oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
+ ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
+ ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
+ ") values ("
+ + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
+ + ", '" + sPackBarCode.ToString() + "',1,'','" + sPackBarCode.ToString() + "',0,0,0"
+ + ",0,1,0,0,0,0,'','')");
+ //MessageBox.Show("12");
+
//1.寰幆缃戞牸锛屾牴鎹� 鏈鏁伴噺 鍒� 鐢熸垚 鍞竴鐮�
-
- for (int j = 0; j < grdMain.Rows.Count; j++)
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
{
if (DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value) > 0)
{
@@ -836,7 +868,7 @@
//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value);
- HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+ HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鏁伴噺")].Value);
HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
@@ -886,6 +918,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);
@@ -915,23 +952,25 @@
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 + "'");
+ DisplayTM();
}
}
//2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
@@ -942,9 +981,23 @@
-
-
+ sPackBarCode = "";
+ 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)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ txtHZXQty.Text = "";
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
oCn.Commit();
+ //DisplayTM();
MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
@@ -957,10 +1010,11 @@
//0缁撴潫浜嬪姟
//
- Display();
+ //Display();
+
}
- catch(Exception e )
+ catch (Exception e )
{
//鍥炴粴浜嬪姟
@@ -971,23 +1025,32 @@
private void button4_Click(object sender, EventArgs e)
{
+
//鏍规嵁鏈鏁伴噺 鏉� 鍒嗛厤鍒� 姣忎釜鐢熶骇璁㈠崟涓婏紙鍒嗛厤鏃� 瑕佽�冭檻 璁㈠崟鍓╀綑鏁伴噺宸茬粡鏄� 璐熸暟鐨勬儏鍐碉級
- //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);
@@ -1461,10 +1524,21 @@
+ ",'3710'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ",0,0,0"
+ ", 0,getdate(),'" + HBarCode + "','" + TTM + "',0,0)");
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HInterID=" + HInterID.ToString() + " and HBarCode like '%ZXM&' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+
oCn.Commit();
MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
//grdSub.RowCount = 0;
- DisplayTM();
+ //DisplayTM();
+
}
catch (Exception e1)
{
@@ -1478,7 +1552,8 @@
private void DisplayTM()
{
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
+ 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);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -1649,19 +1724,62 @@
private void cmdHSourceID_Click(object sender, EventArgs e)
{
- DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
- if (oWork.RefreshView())
+ Int64 HEmpID = 0;
+ HEmpID = ClsPub.isLong(txtHEmpID.Tag);
+ string HEmpName = "";
+ HEmpName = ClsPub.isStrNull(txtHEmpID.Text);
+
+ DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
+ if (HEmpName != "")
{
- this.txtHSourceID.Text = oWork.oModel.HName;
- this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
- //
- Display();
- //
+ if (oSource.GetInfoByID(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())
+ //{
+ // this.txtHSourceID.Text = oWork.oModel.HName;
+ // this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
+ // //
+ // Display();
+ // //
+ //}
+ //else
+ //{
+ // this.txtHSourceID.Text = "";
+ //}
}
private void cmdHEmpID_Click(object sender, EventArgs e)
@@ -1838,20 +1956,56 @@
{
//鑾峰彇缃戞牸绗竴琛孒InterID鐨勫��
Int64 HInterID = 0;
- HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
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)
+ //{
+ // 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)
+ {
+ 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)
{
//鏍规嵁
Int64 HInterID = 0;
- HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ //HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ 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;
+ 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);
}
//瓒呴鎵撳嵃
@@ -1867,7 +2021,7 @@
return;
}
//2.鍒锋柊缃戞牸
- Display();
+ //Display();
//3.寰幆缃戞牸锛岀疮璁″叏閮ㄥ墿浣欐暟閲忥紝鍒ゆ柇鏄惁 鍓╀綑鏁伴噺 灏忎簬 鏈鏁伴噺锛涘鏋� 澶т簬鍒欐姤閿� 閫�鍑恒��
double sumLeftQty = 0;
for (int i = 0; i < grdMain.Rows.Count; i++)
--
Gitblit v1.9.1