From 525b0a300d7294fe0256b9e99a9168b85ef24308 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 25 十二月 2024 16:18:05 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 100 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 5e32490..a438827 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -761,6 +761,8 @@
return objJsonResult;
}
+ LogService.Write("寮�宸�:1"+ msg1);
+
ListModels oListModels = new ListModels();
try
{
@@ -869,13 +871,15 @@
oBill.DetailCol2.Add(oItemSub);
}
+
+ LogService.Write("寮�宸�:2" + msg1);
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (oBill.omodel.HInterID == 0)
{
-
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ LogService.Write("寮�宸�:2.1" + msg1);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
if (bResult)
{
objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
@@ -883,14 +887,16 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- objJsonResult.Verify = "Y";
- }
- else
- {
- objJsonResult.Verify = "N";
- }
+ LogService.Write("寮�宸�:2.8");
+ objJsonResult.Verify = "Y";
+ //if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ //{
+ // objJsonResult.Verify = "Y";
+ //}
+ //else
+ //{
+ // objJsonResult.Verify = "N";
+ //}
}
}
@@ -900,6 +906,9 @@
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
objJsonResult.Verify = "N";
}
+
+ LogService.Write("寮�宸�:3" + msg1);
+
if (bResult)
{
@@ -929,6 +938,79 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟 鍒峰崱淇濆瓨鍒峰崱浜�
+ /// <summary>
+ /// 寮�宸ュ崟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MESBeginWorkBill/AddHCardswiper")]
+ [HttpPost]
+ public object AddHCardswiper([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();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ oCN.BeginTran();
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ List<Models.ClsSc_MESBeginWorkBillSub> lsmain = new List<Models.ClsSc_MESBeginWorkBillSub>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_MESBeginWorkBillSub(msg2);
+
+ foreach (Models.ClsSc_MESBeginWorkBillSub oItemSub in lsmain)
+ {
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailColl.Add(oItemSub);
+ }
+ ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HInterID<0 order by HInterID", "Sc_MESBeginWorkBillSub");
+ string HInterID = "-1";
+ if (ds.Tables[0].Rows.Count>0) {
+ HInterID = (int.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()) - 1).ToString();
+ }
+ //msg3 = msg3.Substring(1, msg3.Length - 2);
+ //msg3 = msg3.Replace("\\", "");
+ //msg3 = msg3.Replace("\n", ""); //\n
+
+ //淇濆瓨
+ foreach (Models.ClsSc_MESBeginWorkBillSub oSub in oBill.DetailColl)
+ {
+ ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillSub where HBillNo_bak='" + oSub.HBillNo_bak + "'", "Sc_MESBeginWorkBillSub");
+ string subSql = "insert into Sc_MESBeginWorkBillSub " +
+ "(HInterID, HEntryID,HBillNo_bak,HCloseMan,HEntryCloseDate,HCloseType, HSourceInterID, HSourceEntryID" +
+ ",HRelationQty,HRelationMoney, HSourceBillNo, HSourceBillType, HRemark,HCardswiperMan,HCardswiperDate,HEmpID) " +
+ "values(" +
+ "'" + HInterID + "','" + (ds.Tables[0].Rows.Count + 1) + "','" + oSub.HBillNo_bak + "','','" + oSub.HEntryCloseDate + "','" + oSub.HCloseType + "','',''," +
+ "0,0,'','','','" + oSub.HCardswiperMan + "',getdate(),'" + oSub.HEmpID + "')";
+ oCN.RunProc(subSql);
+ }
+ oCN.Commit();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
public DataTable getInfodatanow(string hsoucreID)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -944,7 +1026,14 @@
{
try
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HSourceID = dic["HSourceID"].ToString();
+ string HICMOBillNo = dic["HICMOBillNo"].ToString();
+ string HInterID = dic["HInterID"].ToString();
+ string Type = dic["type"].ToString();
+
+ ds = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IpadIndexButton '"+ HSourceID + "','" + HICMOBillNo + "','" + HInterID + "','" + Type + "'", "h_p_IpadIndexButton");
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
--
Gitblit v1.9.1