From df41701bd6f2e21d768f4a4a8e71626e3ca83d0f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 31 八月 2023 10:47:10 +0800
Subject: [PATCH] 巡检单
---
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 60 +++++++++++++++----
Model/质检管理/ClsQC_PatrolProcCheckBillSub_BadReason.cs | 23 +++++++
WebAPI/ListModels.cs | 11 +++
WebAPI/Controllers/QC_ManagementController.cs | 27 ++++++++
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckBillController.cs | 26 ++++++++
Model/Model.csproj | 1
WebAPI/WebAPI.csproj | 2
7 files changed, 135 insertions(+), 15 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 7969ea8..c4eb85a 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -585,6 +585,7 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillSub.cs" />
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs"
new file mode 100644
index 0000000..ce20b68
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_PatrolProcCheckBillSub_BadReason : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HInterID;
+ public string HBillNo_bak;
+ public Int64 HEntryID;
+ public Int64 HItemID;
+ public Int64 HSEQ;
+ public DateTime HCreateDate;
+ public Int64 HBadReasonID;
+ public Int64 HEmpID ;
+ public Int64 HProcID ;
+ public Int64 HCheckEmpID;
+ public DateTime HFinishDate;
+ public Int64 HMaterID ;
+ public double HQty;
+ }
+}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index a3743c1..f34840d 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1223,6 +1223,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string user = sArray[2].ToString();
+ string badmsg = sArray[3].ToString();
string UserName = "";
@@ -1301,10 +1302,34 @@
oItemSub.HRelationQty = 0;
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
- oItemSub.HRemark = "";
+ //oItemSub.HRemark = "";
oBill.DetailColl.Add(oItemSub);
}
+ badmsg = badmsg.Substring(1, badmsg.Length - 2);
+ badmsg = badmsg.Replace("\\", "");
+ badmsg = badmsg.Replace("\n", ""); //\n
+ List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> bs = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
+ bs = oListModels.getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(badmsg);
+ int j = 0;
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason badSub in bs)
+ {
+ badSub.HBillNo_bak = oBill.omodel.HBillNo;//鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ j++;
+ if (string.IsNullOrWhiteSpace(badSub.HBillNo_bak))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病澶囦唤鍗曟嵁鍙凤紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ badSub.HInterID = oBill.omodel.HInterID;
+ badSub.HEntryID = j;
+ badSub.HSEQ = j;
+ oBill.DetailColl_Bad.Add(badSub);
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
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_PatrolProcCheckBillController.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_PatrolProcCheckBillController.cs"
new file mode 100644
index 0000000..9ddc150
--- /dev/null
+++ "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_PatrolProcCheckBillController.cs"
@@ -0,0 +1,26 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class QC_PatrolProcCheckBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index 7c579ed..f90c9ce 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -9,11 +9,12 @@
{
public Model.ClsQC_PatrolProcCheckBillMain omodel = new Model.ClsQC_PatrolProcCheckBillMain();
public List<Model.ClsQC_PatrolProcCheckBillSub> DetailColl = new List<Model.ClsQC_PatrolProcCheckBillSub>();
+ public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> DetailColl_Bad = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
//public List<Model.ClsQC_PatrolProcCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_PatrolProcCheckBillSub_Item>();
public ClsQC_PatrolProcCheckBill()
{
base.MvarItemKeySub = "QC_PatrolProcCheckBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub2 = "QC_PatrolProcCheckBillSub_BadReason";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_PatrolProcCheckBillMain";
@@ -59,20 +60,21 @@
//",HCloseType="+omodel.HCloseType.ToString()+
//",HDeleteMan='" + omodel.HDeleteMan + "'" +
//",HDeleteDate='" + omodel.HDeleteDate + "'" +
- ",HPrintQty=" + omodel.HPrintQty.ToString() +
+ //",HPrintQty=" + omodel.HPrintQty.ToString() +
//========================================
//",HSupID=" + omodel.HSupID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
- ",HSourceID=" + omodel.HSourceID.ToString() +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
- ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
- ",HICMOQty=" + omodel.HICMOQty.ToString() +
- ",HProcExchInterID=" + omodel.HICMOQty.ToString() +
- ",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
- ",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
- ",HProcExchQty=" + omodel.HICMOQty.ToString() +
- ",HMaterID=" + omodel.HMaterID.ToString() +
+ //",HSourceID=" + omodel.HSourceID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ //",HICMOQty=" + omodel.HICMOQty.ToString() +
+ //",HProcExchInterID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
+ //",HProcExchQty=" + omodel.HICMOQty.ToString() +
+ //",HMaterID=" + omodel.HMaterID.ToString() +
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
+ ",HMainProcID=" + omodel.HMainProcID.ToString() +
" where HInterID=" + lngBillKey.ToString();
//鏇存柊涓昏〃
oCn.RunProc(sqlerro);
@@ -80,8 +82,11 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+ //鍒犻櫎瀛愯〃2
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into QC_PatrolProcCheckBillSub " +
@@ -89,14 +94,28 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
- ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10"+
+ ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3+ "','" + oSub.HQCNote4+ "'" +
- ",'" + oSub.HQCNote5+ "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
+ ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
+ }
+
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
}
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -174,6 +193,19 @@
",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
}
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
+ }
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
// oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_Item " +
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 8e3d79a..b09a744 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -492,6 +492,17 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板宸℃鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨涓昏〃鐨刯son
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 24c726e..ec80c87 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -482,6 +482,7 @@
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
@@ -1001,6 +1002,7 @@
<Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\QC_PatrolProcCheckBill\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sb_EquipSparepartsBill\" />
<Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
--
Gitblit v1.9.1