From 1e842b39abe653fddd28c998511345c30001e884 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 21 三月 2024 15:49:17 +0800
Subject: [PATCH] 条码生成模块，生成条码时增加根据用户权限判断生成条码总数量是否可超源单数量
---
WebAPI/Web.config | 4 ++--
DAL/源单/InterFace源单/Cls_S_IFCLD_ICMOList.cs | 4 ++--
WarM/条码打印/Gy_BarCodeBill.cs | 29 ++++++++++++-----------------
3 files changed, 16 insertions(+), 21 deletions(-)
diff --git "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IFCLD_ICMOList.cs" "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IFCLD_ICMOList.cs"
index dbdbdfc..cc2460a 100644
--- "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IFCLD_ICMOList.cs"
+++ "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IFCLD_ICMOList.cs"
@@ -13,8 +13,8 @@
base.ViewName = "h_v_IFCLD_ICMOBillList_Source";
base.mvarReportTitle = "鐢熶骇璁㈠崟";
base.mvarItemKey = "3710";
- base.sCondtion = " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' ";
- base.sOrderSql = " order by 鍗曟嵁鍙� ";
+ base.sCondtion = " ";
+ base.sOrderSql = " order by 鍗曟嵁鍙� desc ";
base.sKeyCol = "閮ㄩ棬";
}
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++)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0acdf79..674d84e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.53/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -34,7 +34,7 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/> 鏈湴-->
- <add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/> <!--闄堥洴闈欐湰鍦伴厤缃�-->
+ <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/> 闄堥洴闈欐湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<add key="webpages:Version" value="3.0.0.0" />
--
Gitblit v1.9.1