From 62c7287e0ca2c548e6ab8c2a2f4e676042ba8519 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 十一月 2023 14:03:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
index 37c58d0..e775084 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -29,6 +29,7 @@
public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
public DateTime HDate = DateTime.Today;
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill(); //瀵瑰簲鍗曟嵁绫�
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
#region //鍥哄畾浠ｇ爜
@@ -324,6 +325,8 @@
txtHMoney.Text = DSet.Tables[0].Rows[0]["鏈崟閲戦"].ToString();
txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["淇＄敤宸"].ToString();
HInterID = DBUtility.ClsPub.isLong(DSet.Tables[0].Rows[0]["HInterID"]);
+ txtHMaker.Text = DSet.Tables[0].Rows[0]["鍒跺崟浜�"].ToString();
+ txtHChecker.Text = DSet.Tables[0].Rows[0]["瀹℃牳浜�"].ToString();
//杩斿洖鍩烘湰淇℃伅銆佺爜鍗曚俊鎭�
grdMain.DataSource = DSet.Tables[1].DefaultView;
@@ -338,28 +341,31 @@
//鐢荤嚎
GraphLine();
- //鏈鏍�
if (cmbHBillStatus.Text == "宸插鏍�")
{
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
}
else if (cmbHBillStatus.Text == "宸插叧闂�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Closed.jpg");
}
else if (cmbHBillStatus.Text == "宸蹭綔搴�")
{
sh.Enabled = false;
+ fsh.Enabled = false;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Deleted.jpg");
}
else
{
sh.Enabled = true;
+ fsh.Enabled = false;
pic1.Visible = false;
pic1.Image = null;
}
@@ -397,10 +403,40 @@
else
{
cmbHBillStatus.Text="宸插鏍�";
+ txtHChecker.Text = HMaker.ToString();
sh.Enabled = false;
+ fsh.Enabled = true;
pic1.Visible = true;
pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");
MessageBox.Show("瀹℃牳鎴愬姛锛�", "鎻愮ず");
+ return;
+ }
+ }
+
+ #endregion
+
+ #region //鍙嶅鏍搁攢鍞嚭搴撳崟
+ private void fsh_Click(object sender, EventArgs e)
+ {
+ if(HInterID==0)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨瀵瑰簲閿�鍞嚭搴撳崟锛�", "鎻愮ず");
+ return;
+ }
+ if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ cmbHBillStatus.Text = "鍒涘缓";
+ txtHChecker.Text = "";
+ sh.Enabled = true;
+ fsh.Enabled = false;
+ pic1.Visible = false;
+ pic1.Image = null;
+ MessageBox.Show("鍙嶅鏍告垚鍔燂紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
return;
}
}
@@ -478,6 +514,8 @@
Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ Report.FieldByName("鍒跺崟浜�").AsString = txtHMaker.Text;
+ Report.FieldByName("瀹℃牳浜�").AsString = txtHChecker.Text;
}
catch (Exception e)
{
@@ -505,11 +543,11 @@
private void BarCodedy_Click(object sender, EventArgs e)
{
- if (cmbHBillStatus.Text != "宸插鏍�")
- {
- MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
- return;
- }
+ //if (cmbHBillStatus.Text != "宸插鏍�")
+ //{
+ // MessageBox.Show("鎵�閫夊崟鎹搴斿崟鎹姸鎬佷笉涓衡�樺凡瀹℃牳鈥欑姸鎬侊紝涓嶅厑璁告墦鍗帮紒", "鎻愮ず");
+ // return;
+ //}
//閫夋嫨鎵撳嵃妯℃澘
BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
oFrm.sBillName = ModName;
@@ -559,6 +597,8 @@
Report.FieldByName("鍗曟嵁鐘舵��").AsString = cmbHBillStatus.Text;
Report.FieldByName("鏈崟閲戦").AsString = txtHMoney.Text;
Report.FieldByName("淇＄敤宸").AsString = txtHCreditDifference.Text;
+ Report.FieldByName("鍒跺崟浜�").AsString = txtHMaker.Text;
+ Report.FieldByName("瀹℃牳浜�").AsString = txtHChecker.Text;
}
catch (Exception e)
{
--
Gitblit v1.9.1