From a5e85a2a583f65e8d564efe656b3a3573b8812e9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 01 九月 2021 20:04:18 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 263 insertions(+), 36 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 0979c29..6e8ee3f 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -124,20 +124,19 @@
{
var msg1 = oMain["oMain"].ToString();
//淇濆瓨鍗曟嵁
- return objJsonResult = AddBillMain(msg1);
+ return objJsonResult = AddBillTmp(msg1);
}
- public json AddBillMain(string msg1)
+ public json AddBillTmp(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg = sArray[0].ToString();
string OperationType = sArray[1].ToString().Trim();
- bool bResult;
+ bool bResult = false;
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();
+ List<Sc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Sc_ICMOBillQualityStatus_Tmp>>(msg);
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
int sYear = 0;
@@ -151,52 +150,27 @@
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);
+ //鏄惁淇濆瓨
+ bResult = AddBillTmpSQL(mainList, ref ClsPub.sExeReturnInfo);
}
else if (OperationType.Equals("3"))
{
- bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //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.Message = "鎵爜淇濆瓨鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -218,6 +192,61 @@
return objJsonResult;
}
}
+ //鏂板鍗曟嵁
+ public bool AddBillTmpSQL(List<Sc_ICMOBillQualityStatus_Tmp> mainList, ref string sReturn)
+ {
+ try
+ {
+ Sc_ICMOBillQualityStatus_Tmp BillNew = new Sc_ICMOBillQualityStatus_Tmp();
+ //鍥哄畾璧嬪��=================================
+ BillNew.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ BillNew.HBillNo = mainList[0].HBillNo;
+ BillNew.HBillType = mainList[0].HBillType;
+ BillNew.HDate = mainList[0].HDate;
+ BillNew.HICMOBillNo = mainList[0].HICMOBillNo;
+ BillNew.HICMOInterID = mainList[0].HICMOInterID;
+ BillNew.HProcExchBillNo = mainList[0].HProcExchBillNo;
+ BillNew.HProcExchInterID = mainList[0].HProcExchInterID;
+ BillNew.HProcExchEntryID = mainList[0].HProcExchEntryID;
+ BillNew.HProcID = mainList[0].HProcID;
+ BillNew.HMaterID = mainList[0].HMaterID;
+ BillNew.HSourceID = mainList[0].HSourceID;
+ BillNew.HGroupID = mainList[0].HGroupID;
+ BillNew.HCheckManID = mainList[0].HCheckManID;
+ BillNew.HBadReasonID = mainList[0].HBadReasonID;
+ BillNew.HBarCode = mainList[0].HBarCode;
+ BillNew.HMaker = mainList[0].HMaker;
+ BillNew.HMakeDate = mainList[0].HMakeDate;
+ BillNew.HReportType = mainList[0].HReportType;
+ BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
+ BillNew.HSourceInterID = mainList[0].HICMOInterID;
+ BillNew.HSourceBillType = mainList[0].HSourceBillType;
+ oCN.BeginTran();
+ //涓存椂琛�
+ oCN.RunProc("Insert Into Sc_ICMOBillQualityStatus_Tmp " +
+ " (HInterID,HBillNo,HDate,HICMOBillNo,HICMOInterID" +
+ ",HProcExchBillNo,HProcExchInterID,HProcExchEntryID,HProcID,HMaterID" +
+ ",HSourceID,HGroupID,HCheckManID,HBadReasonID,HBarCode" +
+ ",HMaker,HMakeDate,HBillType,HReportType,HSourceBillNo" +
+ ",HSourceInterID,HSourceBillType" +
+ ") " +
+ " values(" + BillNew.HInterID + ",'" + BillNew.HBillNo + "','" + BillNew.HDate + "','" + BillNew.HICMOBillNo + "'," + BillNew.HICMOInterID +
+ ",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
+ "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
+ ",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
+ "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'" +
+ ") ");
+ sReturn = "鎵爜鎴愬姛锛�";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ throw (e);
+ }
+ }
#endregion
#region 璐ㄩ噺姹囨姤鍗曟壂涓嶈壇鏉＄爜鑾峰彇涓嶈壇鍘熷洜id
@@ -227,7 +256,7 @@
{
try
{
- ds = oCN.RunProcReturn("select HItemID,HNumber Gy_BadReason where HStopflag=0 and HNumber='" + HBadReasonNumber + "'", "Gy_BadReason");
+ ds = oCN.RunProcReturn("Select HItemID,HNumber from Gy_BadReason where HStopflag=0 and HNumber='" + HBadReasonNumber + "'", "Gy_BadReason");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -256,5 +285,203 @@
}
#endregion
+ #region 瀹℃牳
+ public bool set_CheckBill(long HInterID, ref string sReturn)
+ {
+ try
+ {
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("exec Sc_ICMOBillQualityStatus_AutoCheck", "Sc_ICMOBillQualityStatus_AutoCheck");
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCN.RollBack();
+ return false;
+ }
+ sReturn = "瀹℃牳鎴愬姛锛�";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鑾峰彇鎵爜鎵弿璁板綍
+ [Route("Sc_QualityReportBill/get_BarCodeDetail")]
+ [HttpGet]
+ public object get_BarCodeDetail(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(
+ "Select a.HItemID,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName" +
+ ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName " +
+ " from Sc_ICMOBillQualityStatus_Tmp a " +
+ " left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
+ " left join Gy_Employee c on a.HCheckManID = c.HItemID " +
+ " left join Gy_Group d on a.HGroupID = d.HItemID " +
+ " left join Gy_Source e on a.HSourceID = e.HItemID " +
+ " where HInterID=" + HInterID, "Sc_ICMOBillQualityStatus_Tmp"
+ );
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鑾峰彇鎵爜姹囨�昏褰�
+ [Route("Sc_QualityReportBill/get_BarCodeDetailSum")]
+ [HttpGet]
+ public object get_BarCodeDetailSum(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(
+ "Select count(*) HQty,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName,c.HName HCheckMan" +
+ ",d.HName HGroupName,e.HName HSourceName " +
+ " from Sc_ICMOBillQualityStatus_Tmp a " +
+ " left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
+ " left join Gy_Employee c on a.HCheckManID = c.HItemID " +
+ " left join Gy_Group d on a.HGroupID = d.HItemID " +
+ " left join Gy_Source e on a.HSourceID = e.HItemID " +
+ " where a.HInterID=" + HInterID +
+ " group by a.HInterID,a.HBadReasonID,a.HCheckManID,a.HGroupID,a.HSourceID" +
+ " ,b.HNumber,b.HName,c.HName,d.HName,e.HName", "Sc_ICMOBillQualityStatus_Tmp"
+ );
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎鎵弿璁板綍琛�
+ [Route("Sc_QualityReportBill/del_BarCodeDetail")]
+ [HttpGet]
+ public object del_BarCodeDetail(long HItemID)
+ {
+ try
+ {
+ oCN.RunProc("delete from Sc_ICMOBillQualityStatus_Tmp where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
+ [Route("Sc_QualityReportBill/set_SaveBill")]
+ [HttpGet]
+ public object set_SaveBill(long HInterID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ bool bResult2 = false;
+ oCN.BeginTran();
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID);
+ //鍒ゆ柇鏄惁鍏佽淇濆瓨
+ ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏄惁瀹℃牳
+ bResult2 = set_CheckBill(HInterID, ref ClsPub.sExeReturnInfo);
+ //鏄惁瀹℃牳
+ if (bResult2 == true)
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯锛佽嚜鍔ㄥ鏍稿け璐ワ紝鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1