From 291fdb29daf239a13fcfb3f5e08a2f5bf9167534 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 07 三月 2026 17:37:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 0 deletions(-)
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 6208a16..7ed618e 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"
@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.Controllers.SCGL;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -244,6 +245,7 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+ BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
List<Model.ClsQC_PatrolProcCheckOtherBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_PatrolProcCheckOtherBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -310,6 +312,8 @@
//淇濆瓨瀹屾瘯鍚庡鐞�
if (OperationType.Equals("1") || OperationType.Equals("2"))
{
+ string sAutoCheck = oSystemParameter.GetSingleSystemParameter("QC_ProcessCheckBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = sAutoCheck;
bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
}
else
@@ -337,6 +341,28 @@
//鎻愮ず
if (bResult == true)
{
+ string sReturn = "";
+ // 鍗庤垷 淇濆瓨鎴愬姛鍚庝笅鎺ㄥ伐浣滆仈绯诲崟
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillOld.omodel.HInterID + "," + 7507, "h_p_OA_WorkLinkBill_Create");
+
+ if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
+ {
+ int HInterID = int.Parse(ds2.Tables[0].Rows[0]["NewHInterID"].ToString());
+ LogService.Write("鎵ц娑堟伅鎺ㄩ��..." + HInterID);
+
+ // 瑙﹀彂娑堟伅鎺ㄩ��
+ Service.GeTuiService.PubishSingle(HInterID);
+
+ }
+ }
+ }
+
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
@@ -1326,6 +1352,63 @@
}
#endregion
+ #region 宸℃鍗曟牴鎹簮鍗曠被鍨嬭幏鍙栦俊鎭�-婧愬崟涓哄彇鏍峰崟
+ [Route("QC_PatrolProcCheckBill/get_TakeSampleCheckBill")]
+ [HttpGet]
+ public object get_TakeSampleCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProc_GetTakeSampleCheckBillList");
+
+ //娣诲姞鍒楀悕
+ 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 = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#region PDA宸℃璁板綍鍗� 鏌ヨ鍒楄〃
[Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA")]
[HttpGet]
--
Gitblit v1.9.1