From 362bced3c321443d9d83710a53e18754df671e59 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 15 一月 2026 15:15:41 +0800
Subject: [PATCH] 新增生产退料校验上传调用方法，校验模块扫描物料调用方法、校验缓存列表删除记录调用方法、已上传撤销功能调用方法修改；新增红字校验单据相关系统参数
---
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 248 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 203 insertions(+), 45 deletions(-)
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
index 9782b1f..f13c2bd 100644
--- a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -31,7 +31,7 @@
try
{
List<object> columnNameList = new List<object>();
- if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Query", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -144,7 +144,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -262,14 +262,14 @@
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
/// <returns></returns>
- [Route("WLYayBillController/AuditWLYayBill1")]
+ [Route("Sc_EmployeeSignInNoteBillController/Audit")]
[HttpGet]
- public object AuditWLYayBill(int HInterID, int IsAudit, string CurUserName)
+ public object Audit(int HInterID, int IsAudit, string CurUserName)
{
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_EmployeeSignInNoteBillMain_Check", 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -278,7 +278,7 @@
return objJsonResult;
}
- var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ var ds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillMain where HInterID=" + HInterID, "Sc_EmployeeSignInNoteBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
@@ -317,7 +317,7 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- oCN.RunProc("update WL_YayBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
+ oCN.RunProc("update Sc_EmployeeSignInNoteBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -326,7 +326,7 @@
}
if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
- oCN.RunProc("update WL_YayBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
+ oCN.RunProc("update Sc_EmployeeSignInNoteBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -349,54 +349,212 @@
}
#endregion
- //#region
- //[Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
- //[HttpPost]
- //public object APP_Edit_json(int HInterID,string HBarCode)
- //{
- // DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='"+ HBarCode+"'", "Gy_EquipFileBillMain");
- // if(ds!=null||ds.Tables.Count>0)
- // {
- // var EquipmentID = ds.Tables[0].Rows[0]["HInterID"];
- // DataSet dds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query "+ EquipmentID, "h_p_SB_HEquipHMould_Query");
- // if(dds != null || dds.Tables.Count > 0)
- // {
-
- // }
- // }
- //}
- //#endregion
-
-
-
-
-
-
-
- [Route("WLYayBillController/updateBillMEs1")]
+ #region app鎵爜妯″潡
+ [Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
[HttpGet]
- public object updateBillMEs(int HInterID,int HEntryID, int ScatteredVolume, string CurUserName)
+ public object APP_Edit_json(int HInterID, string HBarCode)
{
- var ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID, "WL_YayBillMain");
- if (ds != null || ds.Tables[0].Rows.Count <= 0)
+ oCN.BeginTran();
+ DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");
+ //DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='" + HBarCode + "'", "Gy_EquipFileBillMain");
+ if (ds != null || ds.Tables.Count > 0)
{
- oCN.BeginTran();
- oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID+ "and HEntryID="+ HEntryID);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = null;
- oCN.Commit();
- return objJsonResult;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables;
+ oCN.Commit();
+ return objJsonResult;
+
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏇存柊澶辫触锛�";
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #region 淇濆瓨/缂栬緫
+
+ [Route("Sc_EmployeeSignInNoteBillController/SaveBill_APP")]
+ [HttpPost]
+ public object SaveBill_APP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_EmployeeSignInNoteBill oBill = new DAL.ClsSc_EmployeeSignInNoteBill();
+ List<Model.ClsSc_EmployeeSignInNoteBill> lsmain = new List<Model.ClsSc_EmployeeSignInNoteBill>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBill(msg2);
+
+ foreach (Model.ClsSc_EmployeeSignInNoteBill oItem in lsmain)
+ {
+ oItem.HMaker = msg4;
+ DBUtility.ClsPub.CurUserName = msg4; //鍒跺崟浜�
+ oItem.HBillType = "4616";
+ oItem.HBillSubType = "4616";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HCheckEmp = oItem.HEmpID;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ ////琛ㄤ綋鏁版嵁
+ ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ //msg3 = msg3.Substring(1, msg3.Length - 2);
+ //msg3 = msg3.Replace("\\", "");
+ //msg3 = msg3.Replace("\n", ""); //\n
+ ////msg2 = msg2.Replace("'", "鈥�");
+ //List<Model.ClsSc_EmployeeSignInNoteBillSub> ls = new List<Model.ClsSc_EmployeeSignInNoteBillSub>();
+ //ls = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBillSub(msg3);
+ //int i = 0;
+ //foreach (Model.ClsSc_EmployeeSignInNoteBillSub oItem in ls)
+ //{
+
+ // i++;
+ // oItem.HEntryID = i;
+ // oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ // oItem.HCloseType = false; //鍏抽棴绫诲瀷
+ // oBill.DetailColl.Add(oItem);
+
+ //}
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎
+
+ [Route("Sc_EmployeeSignInNoteBillController/deleteBill")]
+ [HttpGet]
+ public object deleteBill(string HItemID, string user)
+ {
+ DataSet ds;
+ //string ModRightNameCheck = "Sc_ProcessReport_check";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillMain where HInterID=" + HItemID, "Sc_EmployeeSignInNoteBillMain");
+ DataSet dds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillSub where HInterID=" + HItemID, "Sc_EmployeeSignInNoteBillSub");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+
+ oCN.RunProc("delete Sc_EmployeeSignInNoteBillMain where HInterID=" + HItemID);
+ if (dds != null || dds.Tables[0].Rows.Count != 0)
+ {
+ oCN.RunProc("delete Sc_EmployeeSignInNoteBillSub where HInterID=" + HItemID);
+ }
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ 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
}
}
--
Gitblit v1.9.1