From a5e3cae8ab6c4635c316ea0d3a2cfe6b200e0f78 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 30 六月 2021 15:43:21 +0800
Subject: [PATCH] 新增模具维修记录单
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 372 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 346 insertions(+), 26 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 761dd47..c461134 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -21,6 +21,130 @@
DataSet ds1;
+ ///// <summary>
+ ///// test
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Cj_StationInBill/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // try
+ // {
+ // //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ // string BillType = "3790";
+ // long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ // string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ // int HBillStatus = 0;
+ // string HMaker = list[0].HMaker;//鍒跺崟浜�
+ // int HYear = 2021;
+ // long HPeriod = 1;
+ // string HRemark = list[0].HRemark;//澶囨敞
+ // long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ // string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ // int HProcPlanInterID = 0;
+ // int HProcPlanEntryID = 0;
+ // string HProcPlanBillNo = "";
+ // int HProcExchInterID = 0;
+ // int HProcExchEntryID = 0;
+ // string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ // long HMaterID = list[0].HMaterID;//浜у搧ID
+ // long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ // double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ // double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ // long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ // long HGroupID = list[0].HGroupID;//鐝粍ID
+ // long HDeptID = 0;
+ // long HEmpID = list[0].HEmpID;//鎺ユ敹浜篒D
+ // string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+ // string HAddr = "";
+ // string HBarCodeMaker = "";
+ // long HSupID = 0;
+ // double HQty = list[0].HQty;//鎺ユ敹鏁伴噺
+ // double HPrice = 0;
+ // double HMoney = 0;
+ // double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
+ // string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ // long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ // long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ // string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+
+ // ListModels oListModels = new ListModels();
+
+ // DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill();
+
+ // BillNew.omodel.HInterID = HInterID;
+ // BillNew.omodel.HYear = HYear;
+ // BillNew.omodel.HPeriod = HPeriod;
+ // BillNew.omodel.HBillNo = HBillNo;
+ // BillNew.omodel.HICMOBillNo = HICMOBillNo;
+ // BillNew.omodel.HICMOInterID = HICMOInterID;
+ // BillNew.omodel.HProcExchInterID = HProcExchInterID;
+ // BillNew.omodel.HProcExchEntryID = HProcExchEntryID;
+ // BillNew.omodel.HProcExchBillNo = HProcExchBillNo;
+ // BillNew.omodel.HProcID = HProcID;
+ // BillNew.omodel.HMaterID = HMaterID;
+ // BillNew.omodel.HStationInTime = DateTime.Now;
+ // BillNew.omodel.HEmpID = HEmpID;
+ // BillNew.omodel.HSourceID = HSourceID;
+ // BillNew.omodel.HGroupID = HGroupID;
+ // BillNew.omodel.HICMOQty = HICMOQty;
+ // BillNew.omodel.HPlanQty = HPlanQty;
+ // BillNew.omodel.HQty = HQty;
+ // BillNew.omodel.HPieceQty = HPieceQty;
+ // BillNew.omodel.HSourceName = HSourceName;
+ // BillNew.omodel.HCenterID = HCenterID;
+ // BillNew.omodel.HBillStatus = HBillStatus;
+ // BillNew.omodel.HMaker = HMaker;
+ // BillNew.omodel.HRemark = HRemark;
+ // BillNew.omodel.HProcPlanInterID = HProcPlanInterID;
+ // BillNew.omodel.HProcPlanEntryID = HProcPlanEntryID;
+ // BillNew.omodel.HProcPlanBillNo = HProcPlanBillNo;
+ // BillNew.omodel.HDeptID = HDeptID;
+ // BillNew.omodel.HBarCode = HBarCode;
+ // BillNew.omodel.HAddr = HAddr;
+ // BillNew.omodel.HBarCodeMaker = HBarCodeMaker;
+ // BillNew.omodel.HSupID = HSupID;
+ // BillNew.omodel.HPrice = HPrice;
+ // BillNew.omodel.HMoney = HMoney;
+
+ // BillNew.omodel.HProcNo = HProcNo;
+ // BillNew.omodel.HOrderProcNO = HOrderProcNO;
+ // bool bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+
+ // //鎻愮ず
+ // if (bResult == true)
+ // {
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + HBillNo.Trim();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
@@ -38,6 +162,43 @@
//濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜
+ if (HProcExchInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬祦杞崱鍐呯爜锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ long HProcExchEntryID = list[0].lngBillSubKey;//娴佽浆鍗″瓙鍐呯爜
+ if (HProcExchEntryID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ if (HProcNo <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗″彿娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string eventType = list[0].eventType;
string BillType = "3790";
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
@@ -48,12 +209,9 @@
string HRemark = list[0].HRemark;//澶囨敞
long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
- int HProcPlanInterID = 0;
- int HProcPlanEntryID = 0;
+ long HProcPlanInterID = 0;
+ long HProcPlanEntryID = 0;
string HProcPlanBillNo = "";
- int HProcExchInterID = 0;
- int HProcExchEntryID = 0;
- string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
long HMaterID = list[0].HMaterID;//浜у搧ID
long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
@@ -72,28 +230,140 @@
double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- string HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HMaterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浜у搧娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HSourceID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヤ綔涓績娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HProcID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠宸ュ簭娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎺ユ敹涓暟涓嶈兘涓�0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select HInterID from Sc_ProcessExchangeBillSub Where hinterid=" + HProcExchInterID + " and hprocno<" + HProcNo + " order by hprocno", "Sc_ProcessExchangeBillSub");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇棣栭亾宸ュ簭澶辫触锛屼笉鍏佽淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Insert Into Sc_StationInBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
- ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
- ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
- ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
- ",HProcNo,HOrderProcNO" +
- ") " +
- " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
- "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
- ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
- "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
- "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
- ",'" + HProcNo + "','" + HOrderProcNO + "'" +
- ") ");
+
+ if ("Add".Equals(eventType))
+ {
+ if (!AllowbillNo(HBillNo))
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻掑叆涓昏〃
+ oCN.RunProc("Insert Into Sc_StationInBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
+ ",HProcNo,HOrderProcNO" +
+ ") " +
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
+ ",'" + HProcNo + "','" + HOrderProcNO + "'" +
+ ") ");
+ }
+ else if ("Modify".Equals(eventType))
+ {
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HProcExchInterID + ",-1");
+ //鏇存柊涓昏〃
+ oCN.RunProc("UpDate Sc_StationInBillMain set " +
+ " HBillNo='" + HBillNo + "'" +
+ ",HYear='" + HYear + "'" +
+ ",HPeriod='" + HPeriod + "'" +
+ ",HBillStatus='" + HBillStatus + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HUpDater='" + HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ ",HSupID=" + HSupID +
+ ",HQty=" + HQty +
+ ",HPieceQty=" + HPieceQty +
+ ",HSourceName='" + HSourceName + "'" +
+ ",HICMOInterID=" + HICMOInterID +
+ ",HICMOBillNo='" + HICMOBillNo + "'" +
+ ",HProcPlanInterID=" + HProcPlanInterID +
+ ",HProcPlanEntryID=" + HProcPlanEntryID +
+ ",HProcPlanBillNo='" + HProcPlanBillNo + "'" +
+ ",HProcExchInterID=" + HProcExchInterID +
+ ",HProcExchEntryID=" + HProcExchEntryID +
+ ",HProcExchBillNo='" + HProcExchBillNo + "'" +
+ ",HMaterID=" + HMaterID +
+ ",HProcID=" + HProcID +
+ ",HICMOQty=" + HICMOQty +
+ ",HPlanQty=" + HPlanQty +
+ ",HStationInTime=getdate()" +
+ ",HSourceID=" + HSourceID +
+ ",HGroupID=" + HGroupID +
+ ",HDeptID=" + HDeptID +
+ ",HEmpID=" + HEmpID +
+ ",HBarCode='" + HBarCode + "'" +
+ ",HSaveBillFlag=0 " +
+ ",HAddr='" + HAddr + "'" +
+ ",HBarCodeMaker='" + HBarCodeMaker + "'" +
+ ",HProcNo='" + HProcNo + "'" +
+ ",HOrderProcNO='" + HOrderProcNO + "'" +
+ " where HInterID=" + HInterID);
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+
+
ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
if (ds == null)
{
@@ -129,10 +399,10 @@
" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
{
-
+
}
else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
- {
+ {
}
oCN.Commit();
@@ -151,6 +421,15 @@
objJsonResult.data = null;
return objJsonResult;
}
+ }
+ private bool AllowbillNo(string HBillNo)
+ {
+ ds = oCN.RunProcReturn("select HBillNo from Sc_StationInBillMain where HBillNo = '" + HBillNo + "'", "Sc_StationInBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return true;
+ }
+ return false;
}
/// <summary>
@@ -249,6 +528,47 @@
}
}
+ /// <summary>
+ /// 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationInBill/GetStationInBill")]
+ [HttpGet]
+ public object GetStationOutBill(int HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_GetStationInBill where HInterID = " + HInterID, "h_v_GetStationInBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭幏鍙栧け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ 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;
+ }
+ }
+
+
+
//
}
--
Gitblit v1.9.1