From ce58bfdb73054fa181e0731d60f4c2e74798cabb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/华远datamapping/QC_CheckNote_PNL_TempController.cs | 124 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 124 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
index d23e91a..977ca39 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
@@ -252,6 +252,130 @@
}
#endregion
+ #region 鎵归噺娣诲姞QC_CheckNote_PNL_Temp
+ [Route("QC_CheckNote_PNL_TempController/BatchAddBill")]
+ [HttpPost]
+ public object BatchAddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ 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();//褰撳墠浜�
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("QC_CheckNote_PNL_Temp_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁淇敼鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍙嶅簭鍒楀寲
+ //msg2 = "[" + msg2.ToString() + "]";
+ List<Models.ClsQC_CheckNote_PNL_Temp> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsQC_CheckNote_PNL_Temp>>(msg2);
+
+ oCN.BeginTran();
+ for (int i = 0; i < list.Count; i++)
+ {
+ int HItemID = list[i].HItemID;
+ string HBarCode = list[i].HBarCode;
+ string HSetNo = list[i].HSetNo;
+ string HPCSNo = list[i].HPCSNo;
+ int HPosition_x = list[i].HPosition_x;
+ int HPosition_y = list[i].HPosition_y;
+ string HCheckProc = list[i].HCheckProc;
+ string HPageIndex = list[i].HPageIndex;
+ string HBadReason = list[i].HBadReason;
+ string HMaker = list[i].HMaker;
+ DateTime HMakeDate = list[i].HMakeDate;
+
+ DataSet ds_editCheck;
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ ds_editCheck = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_Temp_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_QC_CheckNote_PNL_Temp_BeforeSaveCtrl");
+ if (ds_editCheck == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append("Insert Into QC_CheckNote_PNL_Temp(HBarCode, HSetNo, HPCSNo, HPosition_x,HPosition_y,HCheckProc,HPageIndex ,HBadReason, HMaker, HMakeDate) Values(");
+ sb.Append("N'" + HBarCode + "',");
+ sb.Append("N'" + HSetNo + "',");
+ sb.Append("N'" + HPCSNo + "',");
+ sb.Append("N'" + HPosition_x + "',");
+ sb.Append("N'" + HPosition_y + "',");
+ sb.Append("N'" + HCheckProc + "',");
+ sb.Append("N'" + HPageIndex + "',");
+ sb.Append("N'" + HBadReason + "',");
+ sb.Append("N'" + HMaker + "',");
+ sb.Append("N'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "')");
+ string sql = sb.ToString();
+ sb.Clear();
+ ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds_editCheck = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_Temp_AfterSaveCtrl " + msg3 + ",'1'", "h_p_QC_CheckNote_PNL_Temp_AfterSaveCtrl");
+ if (ds_editCheck == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds_editCheck.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鍒犻櫎QC_CheckNote_PNL_Temp
[Route("QC_CheckNote_PNL_TempController/DeleteBill")]
[HttpGet]
--
Gitblit v1.9.1