From dabd6d20c31442d461fc30c49aa04abd4549be6b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 三月 2023 13:30:53 +0800
Subject: [PATCH] wip页面优化
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 259 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 227 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 2e2beea..6d8ee64 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,14 +31,30 @@
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
try
{
//濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
- List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
long HMainInterID = 0;
HMainInterID = list[0].HMainInterID;
long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜
+
+
+
if (HProcExchInterID <= 0)
{
objJsonResult.code = "0";
@@ -55,8 +72,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
- if (HProcNo <= 0)
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ if (HProcNo == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -106,6 +123,7 @@
string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HMaterID <= 0)
{
@@ -172,7 +190,7 @@
",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
- ",HProcNo,HOrderProcNO,HMainInterID" +
+ ",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
@@ -180,7 +198,7 @@
",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
- ",'" + HProcNo + "','" + HOrderProcNO + "'," + HMainInterID +
+ ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
") ");
}
else if ("Modify".Equals(eventType))
@@ -276,6 +294,18 @@
}
oCN.Commit();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
@@ -348,39 +378,138 @@
}
#endregion
- #region 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
- [Route("Cj_StationInBill/get_Display")]
+
+
+
+ #region 宸ュ簭杩涚珯鎺ユ敹鍗曟牴鎹亴鍛樹唬鐮佹ā绯婂洖杞︽煡璇�
+ [Route("Cj_StationInBill/GetMessageByEmpNumber")]
[HttpGet]
- public object get_Display(string sWhere)
+ public object GetMessageByEmpNumber(string HEmpNumber)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere+ " order by 杩涚珯鏃堕棿 desc", "h_v_MES_StationInBillList");
- }
- else
- {
- string sql1 = "select * from h_v_MES_StationInBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
- }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from gy_employee where hnumber like '%" + HEmpNumber + "%'", "gy_employee");
+ //鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌鍑虹珯鍗曟槑缁嗕俊鎭紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+ #region 宸ュ簭杩涚珯鎺ユ敹鍗曟牴鎹墿鏂欎唬鐮佹ā绯婂洖杞︽煡璇�
+ [Route("Cj_StationInBill/GetMessageByMaterNumber")]
+ [HttpGet]
+ public object GetMessageByMaterNumber(string HMaterNumber)
+ {
+ try
+ {
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from gy_material where hnumber like '%" + HMaterNumber + "%'", "gy_material");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鐗╂枡淇℃伅锛�";
+ objJsonResult.data = null;
return objJsonResult;
}
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ #region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
+ [Route("Cj_StationInBill/get_Display")]
+ [HttpGet]
+ public object get_Display(string sWhere,string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_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_MES_StationInBillList order by hmainid desc", "h_v_MES_StationInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationInBillList where 1 = 1 ";
+ string sql = sql1 + sWhere+ " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -480,9 +609,9 @@
{
try
{
- string ModRightNameCheck = "MES_StationInBill_Check";
+ string ModRightNameCheck = "Cj_StationInBill_Check";
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -597,6 +726,17 @@
{
try
{
+ string ModRightNameCheck = "Cj_StationInBill_Check";
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (HInterID == 0)
{
objJsonResult.code = "0";
@@ -777,9 +917,8 @@
{
try
{
-
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, true, HDeleteMan))
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -868,7 +1007,7 @@
}
#endregion
- //#region 鏌ョ湅宸ュ簭娴佽浆鍗″叧鑱旀暟閲忓垪琛ㄥ姞杞�
+ #region 鏌ョ湅宸ュ簭娴佽浆鍗″叧鑱旀暟閲忓垪琛ㄥ姞杞�
[Route("Cj_StationInBill/GetStationQtyList")]
[HttpGet]
public object GetStationQtyList(string HInterID)
@@ -902,6 +1041,62 @@
return objJsonResult;
}
}
- //#endregion
+ #endregion
+
+ #region 杩斿洖鐢ㄦ埛鑾峰彇榛樿鍊煎垪琛�
+ [Route("Cj_StationInBill/GetDefValByUser")]
+ [HttpGet]
+ public object GetDefValByUser(string Czybm, string Czymc)
+ {
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (Czymc == null || Czymc.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser", "h_v_Cj_GetDefValByUser");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cj_GetDefValByUser where 1 = 1 ";
+ string sql = sql1 + " and 鐢ㄦ埛缂栫爜 ='" + Czybm + "' and 鐢ㄦ埛鍚嶇О ='" + Czymc + "'";
+ ds = oCN.RunProcReturn(sql, "h_v_Cj_GetDefValByUser");
+ }
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1