From 536cb4b530878367a01a49af6ca77e654a0d3867 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 27 八月 2021 18:48:59 +0800
Subject: [PATCH] nothing（改回SCGL文件数据）
---
WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs | 159 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 131 insertions(+), 28 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
index e33b355..7d70a87 100644
--- a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
@@ -10,22 +10,18 @@
namespace WebAPI.Controllers
{
- //鐢熶骇姹囨姤Controller
- public class Sc_ICMOReportBillController : ApiController
+ //璐ㄩ噺姹囨姤鍗旵ontroller
+ //鏁版嵁搴撲富琛⊿c_QualityReportBillMain
+ //鏁版嵁搴撳瓙琛⊿c_QualityReportBillSub
+ public class Sc_QualityReportBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
- /// <summary>
- /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Sc_ICMOReportBill/list")]
+ #region 杩斿洖鐢熶骇璐ㄩ噺姹囨姤鍗曞垪琛�
+ [Route("Sc_QualityReportBill/list")]
[HttpGet]
public object list(string sWhere)
{
@@ -33,13 +29,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList " + sWhere, "h_v_IF_ICMOReportBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail");
}
else
{
- string sql1 = "select * from h_v_IF_ICMOReportBillList where 1 = 1 ";
+ string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -67,33 +63,37 @@
return objJsonResult;
}
}
+ #endregion
- /// <summary>
- /// 杩斿洖鐢熶骇璐ㄩ噺姹囨姤鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Sc_AssemblyBill/list1")]
+ #region 璐ㄩ噺姹囨姤鍗曟牴鎹簮鍗曠被鍨嬭幏鍙栦俊鎭�-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+ [Route("Sc_QualityReportBill/get_ICMOBillStatus_Tmp")]
[HttpGet]
- public object list1(string sWhere)
+ public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
+ if (HInterID == 0 || HBillType.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_AssemblyBillList " + sWhere, "h_v_Sc_AssemblyBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
- string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList");
+ ds = oCN.RunProcReturn
+ ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
+ ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel " +
+ " from Sc_ICMOBillStatus_Tmp a " +
+ " left join Gy_Material m on a.HMaterID=m.HItemID " +
+ " Where a.HInterID=" + HInterID + " and a.HBillType="+ HBillType, "Sc_ICMOBillStatus_Tmp");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -101,8 +101,111 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺姹囨姤鍗曟壂涓嶈壇鏉＄爜淇濆瓨淇℃伅
+ [Route("Sc_QualityReportBill/set_SaveBarCode")]
+ [HttpPost]
+ public object set_SaveBarCode([FromBody] JObject oMain)
+ {
+ var msg1 = oMain["oMain"].ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg = sArray[0].ToString();
+ string OperationType = sArray[1].ToString().Trim();
+ bool bResult;
+ try
+ {
+ msg = "[" + msg.ToString() + "]";
+ List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg);
+ DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HMakeDate;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ //鍥哄畾璧嬪��=================================
+ BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ //BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ //BillNew.omodel.HDate = HDate;
+ //BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ //BillNew.omodel.HMaker = mainList[0].HMaker;
+ //BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+ //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ //BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ //BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);
+ //BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+ //BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+ //BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+ //BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ //BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ //BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ //BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
+ //BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ //BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ //BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ //BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ BillNew.omodel.HBillStatus = 1;
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (OperationType.Equals("1") || OperationType.Equals("2"))
+ {
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ }
+ else if (OperationType.Equals("3"))
+ {
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ ClsPub.sExeReturnInfo = "鏃犳晥鐨勬搷浣滅被鍨嬶紒";
+ bResult = false;
+ }
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -115,7 +218,7 @@
return objJsonResult;
}
}
+ #endregion
- //
}
}
\ No newline at end of file
--
Gitblit v1.9.1