From a45d2cef5657df1a8a107024dba656789a4baf5f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 15 八月 2024 22:03:12 +0800
Subject: [PATCH] 作业指导书删除功能，增加自动审核入库申请单系统参数，排产添加操作工字段；屏蔽扫码同步入库申请单
---
WarM/条码打印/Kf_WeighToBarCode_StationOutBill.cs | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
index 11b1e6a..463f03c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
@@ -391,8 +391,10 @@
",0,0,0,0,0,0,0,0,0" +
",0,0,''," + sHBarCodeInterID.ToString() + "," + HStockOrgID.ToString() +
") ");
- }
+ ////鍥炲～娴佽浆鍗″叧鑱旀暟閲�
+ //oCn.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + sInterID + ",1");
+ }
//鍥炲～宸茬敓鍗曠姸鎬�
oCn.RunProc("Update KF_BCPWeighSource_Temp set HRelationInterID=1 where HInterID= " + HInterID.ToString());
MessageBox.Show("鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗曟垚鍔燂紒", "鎻愮ず");
@@ -587,9 +589,19 @@
MessageBox.Show("璇疯緭鍏ュ寘鍙凤紒", "鎻愮ず");
return false;
}
- else if (DBUtility.ClsPub.isDoule(txtHProcID.Tag) == 0)
+ else if (DBUtility.ClsPub.isLong(txtHProcID.Tag) == 0)
{
- MessageBox.Show("璇峰厛閫夋嫨宸ュ簭锛�", "鎻愮ず");
+ MessageBox.Show("宸ュ簭涓嶅厑璁镐负绌猴紝璇峰厛杈撳叆娴佹按鍙峰悗鍥炶溅纭锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isInt(txtHProcNo.Text) == 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ纭祦姘村彿锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(txtHSourceID.Tag) == 0)
+ {
+ MessageBox.Show("鐢熶骇璧勬簮涓嶅厑璁镐负绌猴紝璇峰厛閫夋嫨鐢熶骇璧勬簮锛�", "鎻愮ず");
return false;
}
@@ -601,6 +613,36 @@
{
if (MessageBox.Show("鐗╂枡缁存姢鍏嬮噸涓猴細" + HMaterWeight.ToString() + "锛屽疄闄呭厠閲嶄负锛�" + sQty.ToString() + "锛屾墍杈撳叆瀹為檯鍏嬮噸瓒呭嚭鐗╂枡缁存姢鍏嬮噸鐨勭櫨鍒嗕箣浜屽崄鎴栦笉瓒崇墿鏂欑淮鎶ゅ厠閲嶇殑鐧惧垎涔嬪叓鍗侊紝璇锋鏌ヨ緭鍏ョ殑鏁版嵁鏄惁姝ｇ‘锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
+ //return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ //鏉＄爜鐢熸垚鍓嶆帶鍒跺垽鏂�
+ double HNowQty = 0; //绫虫暟
+ double HWeightQyt = 0; //閲嶉噺
+ HNowQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
+ HWeightQyt = DBUtility.ClsPub.isDoule(txtHWeightQyt.Text);
+
+ DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Kf_WeighToBarCode_StationOutBill_AddBarCodeCheck " + HInterID.ToString() + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + "," + HProcessExchangeInterID.ToString() + "," + HProcessExchangeEntryID.ToString() + "," + HSourceQty.ToString() + "," + HNowQty.ToString() + "," + HWeightQyt.ToString(), "h_p_Kf_WeighToBarCode_StationOutBill_AddBarCodeCheck");
+ //
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏉＄爜鐢熸垚鍓嶅垽鏂敊璇紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]), "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "2")
+ {
+ if (MessageBox.Show(DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]), "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
return true;
}
else
@@ -608,7 +650,10 @@
return false;
}
}
- return true;
+ else
+ {
+ return true;
+ }
}
//鐢熸垚鏉＄爜
@@ -966,13 +1011,13 @@
{
if (e.KeyCode == Keys.Return)
{
- if (txtHProcNo.Text == "")
+ if (DBUtility.ClsPub.isLong(txtHProcNo.Text) == 0)
{
- MessageBox.Show("娴佹按鍙蜂负绌猴紝璇疯緭鍏ユ祦姘村彿锛�");
+ MessageBox.Show("娴佹按鍙蜂负绌烘垨鎵�杈撳叆娴佹按鍙蜂笉姝ｇ‘锛岃閲嶆柊杈撳叆娴佹按鍙凤紒");
return;
}
//鏍规嵁杞崱涓籌D銆佹祦姘村彿甯﹀嚭娴佽浆鍗′笂鐩稿簲宸ュ簭銆佺彮缁勩�佸伐浣滀腑蹇冦�佺敓浜ц祫婧�
- DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo " + HProcessExchangeInterID.ToString() + "," + txtHProcNo.Text, "h_p_KF_GetBCPWeighSource_HProcNo");
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo2 " + HProcessExchangeInterID.ToString() + "," + DBUtility.ClsPub.isLong(txtHProcNo.Text) + ",'" + DBUtility.ClsPub.CurUserID + "'", "h_p_KF_GetBCPWeighSource_HProcNo2");
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
txtHProcNo.Text = "";
@@ -984,7 +1029,7 @@
txtHGroupID.Text = "";
txtHSourceID.Tag = 0;
txtHSourceID.Text = "";
- MessageBox.Show("鎵�杈撳叆娴佹按鍙蜂笉鍦ㄥ綋鍓嶅伐搴忔祦杞崱涓嬶紝璇烽噸鏂拌緭鍏ユ祦姘村彿锛�");
+ MessageBox.Show("鎵�杈撳叆娴佹按鍙蜂笉鍦ㄥ綋鍓嶅伐搴忔祦杞崱涓嬫垨鐢ㄦ埛鏈叧鑱旇娴佹按鍙锋墍瀵瑰簲鐩稿叧宸ュ簭锛岃閲嶆柊杈撳叆娴佹按鍙凤紒");
return;
}
else
--
Gitblit v1.9.1