From 524d09e52b7bbe183595c289ec93ca8f2b26a4e8 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 26 一月 2022 00:13:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 12 +
WebAPI/Controllers/仓存管理/验收入库/Kf_EntrustOutBackBillController.cs | 12 +
LMES/ClsShowMod.cs | 2
WebAPI/Controllers/Kf_ICStockBillMainController.cs | 34 +++-
WebAPI/Controllers/仓存管理/委外用料/WW_PPBomBillController.cs | 10 +
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBackBillController.cs | 14 ++
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 69 ++++++++++-
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.resx | 3
WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs | 12 +
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 14 +
WebAPI/Controllers/仓存管理/领料发货/Kf_StepFoldOutBillController.cs | 10 +
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.Designer.cs | 34 ++--
WebAPI/Controllers/MateOutController.cs | 40 ++++++
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 12 +
WarM/仓库管理/Gy_BarCodeBill_ChaiMa.cs | 2
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 12 +
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 12 +
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 16 ++
WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs | 12 +
19 files changed, 278 insertions(+), 54 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 04aa2dd..e779c9b 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3956,7 +3956,7 @@
oSc_PackUnionBill.ShowDialog();
break;
case "gy_barcodebill_chaima":
- WarM.仓库管理.Gy_BarCodeBill_ChaiMa oGy_BarCodeBill_ChaiMa = new WarM.仓库管理.Gy_BarCodeBill_ChaiMa();
+ WarM.Gy_BarCodeBill_ChaiMa oGy_BarCodeBill_ChaiMa = new WarM.Gy_BarCodeBill_ChaiMa();
oGy_BarCodeBill_ChaiMa.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
//oGy_BarCodeBill_ChaiMa.ModCaption = gnmc;
oGy_BarCodeBill_ChaiMa.ShowDialog();
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
index e925a68..9600db4 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace WarM.浠撳簱绠＄悊
+namespace WarM
{
partial class Gy_BarCodeBill_ChaiMa
{
@@ -78,7 +78,7 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(4, 476);
+ this.grdSum.Location = new System.Drawing.Point(4, 512);
this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
@@ -93,11 +93,11 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 185);
+ this.tabControl1.Location = new System.Drawing.Point(0, 149);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1356, 525);
+ this.tabControl1.Size = new System.Drawing.Size(1356, 561);
this.tabControl1.TabIndex = 54;
//
// tabPage1
@@ -108,9 +108,9 @@
this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1348, 496);
+ this.tabPage1.Size = new System.Drawing.Size(1348, 532);
this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "椤�1";
+ this.tabPage1.Text = "鏉＄爜淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
//
// grdMain
@@ -128,7 +128,7 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1340, 472);
+ this.grdMain.Size = new System.Drawing.Size(1340, 508);
this.grdMain.TabIndex = 47;
//
// tabPage2
@@ -139,9 +139,9 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage2.Size = new System.Drawing.Size(1348, 496);
+ this.tabPage2.Size = new System.Drawing.Size(1348, 532);
this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "椤�2";
+ this.tabPage2.Text = "鏂扮爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
//
// grdMain_Pay
@@ -159,7 +159,7 @@
this.grdMain_Pay.ReadOnly = true;
this.grdMain_Pay.RowHeadersWidth = 30;
this.grdMain_Pay.RowTemplate.Height = 23;
- this.grdMain_Pay.Size = new System.Drawing.Size(1340, 464);
+ this.grdMain_Pay.Size = new System.Drawing.Size(1340, 500);
this.grdMain_Pay.TabIndex = 49;
//
// grdSum_Pay
@@ -169,7 +169,7 @@
this.grdSum_Pay.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum_Pay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum_Pay.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum_Pay.Location = new System.Drawing.Point(4, 468);
+ this.grdSum_Pay.Location = new System.Drawing.Point(4, 504);
this.grdSum_Pay.Margin = new System.Windows.Forms.Padding(4);
this.grdSum_Pay.Name = "grdSum_Pay";
this.grdSum_Pay.ReadOnly = true;
@@ -194,7 +194,7 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(1332, 15);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(1152, 19);
this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
@@ -206,29 +206,29 @@
//
this.P1.BackColor = System.Drawing.Color.Lavender;
this.P1.Controls.Add(this.gbUp);
- this.P1.Controls.Add(this.cmdSourceBillNo);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
this.P1.Location = new System.Drawing.Point(0, 62);
this.P1.Margin = new System.Windows.Forms.Padding(4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1356, 123);
+ this.P1.Size = new System.Drawing.Size(1356, 87);
this.P1.TabIndex = 49;
//
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
this.gbUp.Controls.Add(this.txtHMaker);
+ this.gbUp.Controls.Add(this.cmdSourceBillNo);
this.gbUp.Controls.Add(this.label3);
this.gbUp.Controls.Add(this.button1);
this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.txtNum);
this.gbUp.Controls.Add(this.txtHBillNo);
this.gbUp.Controls.Add(this.label2);
- this.gbUp.Location = new System.Drawing.Point(79, 15);
+ this.gbUp.Location = new System.Drawing.Point(4, 4);
this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1189, 97);
+ this.gbUp.Size = new System.Drawing.Size(1189, 74);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -400,7 +400,7 @@
this.Controls.Add(this.Tool);
this.Controls.Add(this.grdPrint);
this.Name = "Gy_BarCodeBill_ChaiMa";
- this.Text = "Gy_BarCodeBill_ChaiMa";
+ this.Text = "鏉＄爜鎷嗙爜";
this.Load += new System.EventHandler(this.Gy_BarCodeBill_ChaiMa_Load);
((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
this.tabControl1.ResumeLayout(false);
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
index 6ff1a3a..589aa62 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.cs"
@@ -8,7 +8,7 @@
using System.Text;
using System.Windows.Forms;
-namespace WarM.浠撳簱绠＄悊
+namespace WarM
{
public partial class Gy_BarCodeBill_ChaiMa : Form
{
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
index e2a76dc..2e3a02c 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Gy_BarCodeBill_ChaiMa.resx"
@@ -422,4 +422,7 @@
TkSuQmCC
</value>
</data>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>61</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index a4e2e57..7843a48 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -279,10 +279,22 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg2 = sArray[0].ToString();//淇濆瓨鏁版嵁
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+
+ ////鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Edit", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 333e99e..641981d 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -241,10 +241,20 @@
/// <returns></returns>
[Route("Cg_POInStockBill/DeltetPOInStockBill")]
[HttpGet]
- public object DeltetPOInStockBill(string HInterID)
+ public object DeltetPOInStockBill(string HInterID,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夊垹闄ょ殑鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍏堝垹闄� 閲戣澏鏁版嵁
objJsonResult = DeleteKingDee(HInterID);
if (objJsonResult.code == "0")
diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index 3ef75d4..c6cbca8 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -20,10 +20,20 @@
#region 閿�鍞��璐у崟鏌ヨ
[Route("Kf_ICStockBillMain/GetCStockBillList")]
[HttpGet]
- public object GetCStockBillList(string sWhere)
+ public object GetCStockBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_ICStockBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain");
@@ -66,18 +76,20 @@
[HttpGet]
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
- //IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
try
{
+ //IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_ICStockBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 1001a89..7583b66 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -761,6 +761,46 @@
}
}
+ //鍒锋柊琛ㄤ綋 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃锛堥鏂欏嚭搴撶畝娲佺増锛�
+ [Route("MateOutBill/DisBillEntryList_Webs_New_Json1")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillType, string sWhere)
+ {
+ try
+ {
+ ds = webserver.GetKf_PonderationBillMain_Temp_New(HBillID, HBillType, sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = new
+ {
+ list = ds.Tables[0],
+ list2 = ds.Tables[5]
+ };
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
[Route("MateOutBill/Delete_Json")]
[HttpGet]
public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
diff --git a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
index 07dab3b..3c130a4 100644
--- a/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs
@@ -23,10 +23,20 @@
/// <returns></returns>
[Route("Sc_ProductionReturnBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈢殑鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProductionReturnBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_ProductionReturnList where 1=1 order by 鏃ユ湡 desc", "h_v_IF_ProductionReturnList");
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index e9279f3..d2ee9e2 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -807,10 +807,20 @@
/// <returns></returns>
[Route("Kf_MoveStockBill/GetMoveStockBillList")]
[HttpGet]
- public object GetMoveStockBillList(string sWhere)
+ public object GetMoveStockBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList");
@@ -853,10 +863,19 @@
/// <returns></returns>
[Route("Kf_SellOutBill/GetSellOutBillList")]
[HttpGet]
- public object GetSellOutBillList(string sWhere)
+ public object GetSellOutBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetSellOutBillList(sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -931,10 +950,20 @@
/// <returns></returns>
[Route("Kf_OtherOutBill/GetOtherOutBillList")]
[HttpGet]
- public object GetOtherOutBillList(string sWhere)
+ public object GetOtherOutBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_OtherOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Kf_OtherOutBillList where 1=1 order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList");
@@ -1078,10 +1107,20 @@
/// <returns></returns>
[Route("Kf_ProductInBill/GetProductInBill")]
[HttpGet]
- public object GetProductInBill(string sWhere)
+ public object GetProductInBill(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProductInBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
@@ -1158,10 +1197,19 @@
/// <returns></returns>
[Route("Kf_OtherInBill/GetOtherInBill")]
[HttpGet]
- public object GetOtherInBill(string sWhere)
+ public object GetOtherInBill(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_OtherInBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
@@ -1205,10 +1253,19 @@
/// <returns></returns>
[Route("Kf_EntrustInBill/GetEntrustInBill")]
[HttpGet]
- public object GetEntrustInBill(string sWhere)
+ public object GetEntrustInBill(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_EntrustInBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Kf_EntrustInBillList where 1=1", "h_v_Kf_EntrustInBillList");
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 266338f..ea8d7eb 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -65,10 +65,20 @@
/// </summary>
[Route("Xs_SeOrderBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList " + sWhere, "h_v_IF_SeOrderBillList");
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 29c6a3f..867097a 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -66,10 +66,20 @@
/// </summary>
[Route("Xs_SeOutStockBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList " + sWhere, "h_v_IF_SeOutStockBillList");
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
index f9086a4..9de2e99 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
@@ -22,10 +22,16 @@
[Route("WW_PPBomBillController/Get_WW_PPBomBillList")]
[HttpGet]
- public object Get_WW_PPBomBillList(string sWhere)
+ public object Get_WW_PPBomBillList(string sWhere,string user)
{
try
{
+
+ if (!DBUtility.ClsPub.Security_Log("", 1, false, user))
+ {
+
+ }
+
ds = WW_PPBomBillList(sWhere);
if (ds == null)
{
@@ -56,7 +62,7 @@
public static DataSet WW_PPBomBillList(string sWhere)
{
- string sql1 = string.Format(@"select * from h_v_WW_PPBomBillList");
+ string sql1 = string.Format(@"select * from h_v_WW_PPBomBillList where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
{
return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_WW_PPBomBillList");
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index 4f6617d..eabb6e2 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -15,14 +15,22 @@
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- #region 璋冩嫧鍗曞垪琛�
+ #region 璋冩嫧鐢宠鍗曞垪琛�
[Route("Kf_MoveStockRequestBill/GetMoveStockRequestBillList")]
[HttpGet]
- public object GetMoveStockRequestBillList(string sWhere)
+ public object GetMoveStockRequestBillList(string sWhere,string user)
{
try
{
- //鍒ゆ柇鏉冮檺(鐣�)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockRequestBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = string.Format("select * from h_v_IF_MoveStockRequestBillList_Litee where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
index 6877909..2f58d68 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
@@ -24,10 +24,20 @@
[Route("Kf_MateOutBackBill/GetMateOutBillList")]
[HttpGet]
- public object GetMateOutBillList(string sWhere)
+ public object GetMateOutBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBackBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBackBillList order by 鏃ユ湡 desc", "h_v_IF_MateOutBackBillList");
@@ -76,7 +86,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Delete", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_EntrustOutBill_Drop", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 1a41434..8d2dc5e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -24,10 +24,20 @@
[Route("Kf_MateOutBill/GetMateOutBillList")]
[HttpGet]
- public object GetMateOutBillList(string sWhere)
+ public object GetMateOutBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList " + sWhere + " order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
index 22f70e4..b75f50a 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
@@ -23,7 +23,15 @@
{
try
{
- //鍒ゆ柇鏉冮檺(鐣�)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockStepOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = string.Format("select * from h_v_Kf_MoveStockStepOutBillList where (璋冨叆缁勭粐='" + Organization + "')");
if (sWhere == null || sWhere.Equals(""))
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
index 27a7dc6..191e7a3 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_EntrustOutBackBillController.cs"
@@ -22,8 +22,18 @@
[Route("Kf_EntrustOutBackBill/GetEntrustOutBackBillList")]
[HttpGet]
- public object GetEntrustOutBackBillList(string sWhere)
+ public object GetEntrustOutBackBillList(string sWhere,string user)
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_EntrustOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
try
{
ds = oCn.RunProcReturn("select * from h_v_Kf_EntrustOutBillList " + sWhere + " order by 鏃ユ湡 desc", "h_v_Kf_EntrustOutBillList");
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
index 34892ea..35362da 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
@@ -23,8 +23,16 @@
{
try
{
- //鍒ゆ柇鏉冮檺(鐣�)
-
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Fb_StepFoldinBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql1 = string.Format("select * from h_v_Kf_MoveStockStepInBillList where (璋冨叆缁勭粐='" + Organization + "')");
if (sWhere == null || sWhere.Equals(""))
{
--
Gitblit v1.9.1