From 2cd22bf33a21e534357c683e8f149f66a0ba5c7b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 八月 2024 15:08:30 +0800
Subject: [PATCH] 首检+巡检+工序检,测试并完善增加,最大/最小/平均/检验记录的值保存,上料防错保存方法中,注释掉给流转卡赋空值,增加 制程绩效趋势图(合格率) 查询
---
Model/质检管理/ClsQC_ProcessCheckBillSub.cs | 4
WebAPI/Controllers/生产管理/报工台工序/Sc_MaterToSourceStepBillController.cs | 6
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 454 +++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 47 ++++
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 39 +++
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user | 36 +-
WebAPI/Controllers/品质管理/工序检验单/MES_ProcessCheckBill_PDAController.cs | 20 +
7 files changed, 572 insertions(+), 34 deletions(-)
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
index 491ffd1..6e78ab2 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
@@ -12,7 +12,11 @@
public Int64 HQCCheckItemID;
public String HQCStd;
public String HQCRelValue;
+ public String HQCNote;
public String HResult;
+ public String HMax;
+ public String HMin;
+ public String HAvg;
public Int64 HProcCheckEmp;
public DateTime HProcCheckTime;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 2410e0d..4728444 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -1210,8 +1210,10 @@
long HProcID = list[0].HProcID;//宸ュ簭ID
long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ long HQCSchemeID = list[0].HQCSchemeID;//妫�楠屾柟妗�
long HProcExchInterID = list[0].HProcExchInterID;//娴佽浆鍗D
long HProcExchEntryID = list[0].HProcExchEntryID;//娴佽浆鍗″瓙ID
+ string HBatchNo = list[0].HBatchNo;//娴佽浆鍗℃壒娆″彿
long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
string HMainSourceBillNo = list[0].HMainSourceBillNo;//婧愬崟鍗曞彿
@@ -1257,7 +1259,14 @@
oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
- oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
+
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//妫�楠岃褰�
+ oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+
+
BillNew.DetailColl.Add(oSub);
}
@@ -1301,26 +1310,44 @@
oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
+ ",HPRDORGID,HLastResult,HProcID,HQCSchemeID,HBatchNo," +
+ "HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
+ "," + HPRDORGID + ",'" + HLastResult + "','" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'," +
+ "" + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
{
+ string sql = "Insert into QC_FirstPieceCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID" +
+ ",HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
+ ") values("
+ + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
+ "," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
+ ",'" + oSub.HStatus + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
+ ")";
+
oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " +
" (HInterID,HBillNo_bak,HEntryID" +
",HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HResult" +
- ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
") values("
+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
- ",'" + oSub.HStatus +
- "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HStatus + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
") ");
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
index 2b3d163..b6d8255 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckOtherBillController.cs"
@@ -27,7 +27,7 @@
#region 宸℃鍗曞垪琛�
[Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList")]
[HttpGet]
- public object QC_FirstPieceCheckBillList(string sWhere, string user)
+ public object QC_PatrolProcCheckOtherBillList(string sWhere, string user)
{
try
{
@@ -66,7 +66,7 @@
#region 宸℃鍗曠紪杈戝洖鏄�
[Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit")]
[HttpGet]
- public object QC_FirstPieceCheckBillList_Edit(string sWhere, string user)
+ public object QC_PatrolProcCheckOtherBillList_Edit(string sWhere, string user)
{
try
{
@@ -1079,5 +1079,455 @@
}
#endregion
+ #region PDA宸℃璁板綍鍗� 鏌ヨ鍒楄〃
+ [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA")]
+ [HttpGet]
+ public object QC_PatrolProcCheckOtherBillList_PDA(string sWhere, string user)
+ {
+ try
+ {
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckOtherBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
+ string sErr = "";
+ oSystemParameter.ShowBill(ref sErr);
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+ }
+ else
+ {
+ if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ {
+ //涓嶆槸绠＄悊鍛�
+ sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ }
+ }
+
+ string sql = "select * from h_v_QC_PatrolProcCheckOtherBill where 1=1 " + sWhere;
+
+ ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckOtherBill");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region PDA宸℃璁板綍鍗曟柊澧炰繚瀛�
+ [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillAddBill_PDA")]
+ [HttpPost]
+ public object QC_PatrolProcCheckOtherBillAddBill_PDA([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+ string msg_entry = sArray[3].ToString(); //鏄庣粏琛屼俊鎭�
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckOtherBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsQC_PatrolProcCheckOtherBill BillNew = new DAL.ClsQC_PatrolProcCheckOtherBill();
+
+ List<Model.ClsQC_PatrolProcCheckOtherBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillMain>>(msg2);
+ string BillType = "7505";
+ string HBillSubType = "7505";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HICMOEntryID = list[0].HICMOEntryID;//浠诲姟鍗曞瓙ID
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ //long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
+ bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ long HQCSchemeID = list[0].HQCSchemeID;//妫�楠屾柟妗�
+ long HProcExchInterID = list[0].HProcExchInterID;//娴佽浆鍗D
+ long HProcExchEntryID = list[0].HProcExchEntryID;//娴佽浆鍗″瓙ID
+ string HBatchNo = list[0].HBatchNo;//娴佽浆鍗℃壒娆″彿
+ long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
+ long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
+ string HMainSourceBillNo = list[0].HMainSourceBillNo;//婧愬崟鍗曞彿
+ string HMainSourceBillType = list[0].HMainSourceBillType;//婧愬崟绫诲瀷
+
+ //琛ㄤ綋鏁版嵁
+ List<Model.ClsQC_PatrolProcCheckOtherBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub>>(msg_entry);
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ if (subList.ToArray().Length >= 0)
+ {
+ Model.ClsQC_PatrolProcCheckOtherBillSub oSub = new Model.ClsQC_PatrolProcCheckOtherBillSub();
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
+ oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
+ oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType);
+ oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+ oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
+ oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
+ oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ //oSub.HProcCheckTime = HDate;
+ //oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ //oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ oSub.HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID);
+ oSub.HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty);
+ oSub.HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty);
+ oSub.HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty);
+ oSub.HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty);
+ oSub.HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty);
+ oSub.HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID);
+ oSub.HInspectVal = DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
+ oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
+ oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
+ oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
+ oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
+ oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
+ oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
+ oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
+ oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
+
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//妫�楠岃褰�
+ oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+
+
+
+ BillNew.DetailColl.Add(oSub);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "" && HMainSourceBillNo.Substring(0, Math.Min(2, HMainSourceBillNo.Length)) != "MO")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var num = 0;
+
+ oCN.BeginTran();
+ if (OperationType == "1")
+ {
+ num = 1;
+
+ ds = oCN.RunProcReturn("select * from QC_PatrolProcCheckOtherBillMain where HBillNo='" + HBillNo + "'", "QC_PatrolProcCheckOtherBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Insert Into QC_PatrolProcCheckOtherBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
+ ",HPRDORGID,HLastResult,HProcID,HQCSchemeID,HBatchNo," +
+ "HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
+ "," + HPRDORGID + ",'" + HLastResult + "','" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'," +
+ "" + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_PatrolProcCheckOtherBillSub oSub in BillNew.DetailColl)
+ {
+ string sql = "Insert into QC_PatrolProcCheckOtherBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID" +
+ ",HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
+ ") values("
+ + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
+ "," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
+ ",'" + oSub.HStatus + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
+ ")";
+
+ oCN.RunProc("Insert into QC_PatrolProcCheckOtherBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID" +
+ ",HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
+ ") values("
+ + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
+ "," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
+ ",'" + oSub.HStatus + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
+ ") ");
+ }
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region PDA宸℃璁板綍鍗� 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("QC_PatrolProcCheckOtherBill/CheckQC_PatrolProcCheckOtherBillBill_PDA")]
+ [HttpGet]
+ public object CheckQC_PatrolProcCheckOtherBillBill_PDA(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckOtherBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ BillOld.MvarItemKey = "QC_PatrolProcCheckOtherBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region PDA宸℃璁板綍鍗� 鍒犻櫎鍔熻兘
+ [Route("QC_PatrolProcCheckOtherBill/DelQC_PatrolProcCheckOtherBillBill_PDA")]
+ [HttpGet]
+ public object DelQC_PatrolProcCheckOtherBillBill_PDA(Int64 lngBillKey, string user)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "QC_PatrolProcCheckOtherBill_Delete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from QC_PatrolProcCheckOtherBillMain where HInterID=" + lngBillKey, "QC_PatrolProcCheckOtherBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Delete From QC_PatrolProcCheckOtherBillMain where HInterID = " + lngBillKey);
+ oCN.RunProc("Delete From QC_PatrolProcCheckOtherBillSub where HInterID = " + lngBillKey);
+ oCN.RunProc("Delete From QC_PatrolProcCheckOtherBillSub_ValueGrid where HInterID = " + lngBillKey);
+ oCN.RunProc("Delete From QC_PatrolProcCheckOtherBillSub_Result where HInterID = " + lngBillKey);
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
index 8422d60..7d878ff 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
@@ -66,8 +66,10 @@
long HProcID = list[0].HProcID;//宸ュ簭ID
long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ long HQCSchemeID = list[0].HQCSchemeID;//妫�楠屾柟妗�
Int64 HProcExchInterID = list[0].HProcExchInterID;//鎸囧紩鍗D
Int64 HProcExchEntryID = list[0].HProcExchEntryID;//鎸囧紩鍗″瓙ID
+ string HBatchNo = list[0].HBatchNo;//娴佽浆鍗℃壒娆″彿
long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
string HMainSourceBillNo = list[0].HMainSourceBillNo;//婧愬崟鍗曞彿
@@ -114,7 +116,12 @@
oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
- oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
+
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//妫�楠岃褰�
+ oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
BillNew.DetailColl.Add(oSub);
}
@@ -158,11 +165,12 @@
oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
+ ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID,HQCSchemeID,HBatchNo," +
+ "HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HProcID + "," + HMainSourceInterID +
- "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
+ "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + ",'" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'" +
+ "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_ProcessCheckBillSub oSub in BillNew.DetailColl)
@@ -173,12 +181,14 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
",HProcCheckEmp,HProcCheckTime,HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HQCNote,HMax,HMin,HAvg" +
") values("
+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "','" + oSub.HResult + "'" +
"," + oSub.HProcCheckEmp.ToString() + ",GETDATE()" + ",'" + oSub.HStatus +
- "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ", '" + oSub.HQCNote + "', '" + oSub.HMax + "', '" + oSub.HMin + "', '" + oSub.HAvg + "'" +
") ");
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index a860d62..984b459 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -931,5 +931,52 @@
}
}
#endregion
+
+
+ #region 璐ㄩ噺妯″潡 鍒剁▼缁╂晥瓒嬪娍鍥�(鍚堟牸鐜�) 鏌ヨ
+
+ [Route("QC_CustomerAppealReport/getQC_ProcessPerformancePass")]
+ [HttpGet]
+ public object getQC_ProcessPerformancePass(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformancePassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformancePassList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_ProcessPerformancePassList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏈堜唤 ";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformancePassList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
index 4f5a663..bb8c150 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MaterToSourceStepBillController.cs"
@@ -534,9 +534,9 @@
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HProcExchBillNo = ""; //娴佽浆鍗″彿
- oItem.HProcExchInterID = 0; //娴佽浆鍗′富鍐呯爜
- oItem.HProcExchEntryID = 0; //娴佽浆鍗″瓙鍐呯爜
+ //oItem.HProcExchBillNo = ""; //娴佽浆鍗″彿
+ //oItem.HProcExchInterID = 0; //娴佽浆鍗′富鍐呯爜
+ //oItem.HProcExchEntryID = 0; //娴佽浆鍗″瓙鍐呯爜
oItem.HProcID = 0; //宸ュ簭ID
oItem.HMainSourceBillNo =oItem.HSourceBillNo;
oItem.HMainSourceBillType = oItem.HSourceBillType;
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
index 0fdd025..77f271d 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-07-31T02:42:25.9690193Z;True|2024-07-31T10:39:22.9657733+08:00;</History>
+ <History>True|2024-08-02T06:51:56.4523731Z;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/31/2024 10:42:07</publishTime>
+ <publishTime>08/02/2024 14:51:21</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/31/2024 10:42:07</publishTime>
+ <publishTime>08/02/2024 14:51:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/31/2024 10:42:06</publishTime>
+ <publishTime>08/02/2024 14:51:19</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/31/2024 10:42:06</publishTime>
+ <publishTime>08/02/2024 14:51:19</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:16</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/31/2024 10:42:04</publishTime>
+ <publishTime>08/02/2024 14:51:17</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/31/2024 10:42:04</publishTime>
+ <publishTime>08/02/2024 14:51:17</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:13</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:13</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:14</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:14</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:15</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/31/2024 10:42:03</publishTime>
+ <publishTime>08/02/2024 14:51:15</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/31/2024 10:42:11</publishTime>
+ <publishTime>08/02/2024 14:51:28</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/31/2024 10:42:11</publishTime>
+ <publishTime>08/02/2024 14:51:28</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/31/2024 10:42:24</publishTime>
+ <publishTime>08/02/2024 14:51:55</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1