From 55fe5c3b051c39f047029ed3c9c6b33c998e4c40 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 25 三月 2024 13:19:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.cs | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index f85a342..a9a2bcb 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -155,6 +155,8 @@
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
+ public const string ModRightName = "Gy_BarCodeBill";
+ public const string ModRightNameSourceQty = ModRightName + "_SourceQty"; //瓒呮簮鍗曟暟閲忔帶鍒�
public bool BillChange; //
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -589,23 +591,16 @@
//鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
private bool Sub_AllowSave()
{
- ////蹇呰緭椤圭洰鏄惁涓虹┖
- //if (txtHDeptID.Tag.ToString().Trim() == "0")
- //{
- // MessageBox.Show("鐢熶骇杞﹂棿娌℃湁閫夋嫨锛�", "鎻愮ず");
- // return false;
- //}
- //if (txtHGroupID.Tag.ToString().Trim() == "0")
- //{
- // MessageBox.Show("鐝粍娌℃湁閫夋嫨锛�", "鎻愮ず");
- // return false;
- //}
- //鍗曟嵁鍙锋槸鍚﹂噸澶�
- //if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, txtHBillNo.Text.Trim(), BillStatus, BillOld.omodel.HInterID))
- //{
- // MessageBox.Show("鍗曟嵁鍙烽噸澶嶏紒", "鎻愮ず");
- // return false;
- //}
+ //绯荤粺鍙傛暟锛屾湁婧愬崟鐢熸垚鏉＄爜锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+ if (SourceQtyCtl=="N")
+ {
+ //绯荤粺鍙傛暟涓轰笉鍙秴婧愬崟鏁伴噺鏃讹紝鍐嶆鍒ゆ柇鐢ㄦ埛鏉冮檺鏄惁鍙秴婧愬崟鏁伴噺
+ //鍒ゆ柇鏉冮檺
+ if (ClsPub.Security_Log(ModRightNameSourceQty, 3, false, ClsPub.CurUserName))
+ {
+ SourceQtyCtl = "Y";
+ }
+ }
//鏄庣粏琛ㄦ槸鍚︿负闆惰
bool b = false;
for (int i = 0; i < grdMain.RowCount; i++)
--
Gitblit v1.9.1