From 19bf4875b4cf6ca5f74c08816773a764008e5ab5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 17 三月 2026 09:57:40 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 7ed618e..43e6dbb 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"
@@ -173,7 +173,22 @@
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
//淇濆瓨鍗曟嵁
- return objJsonResult = AddBillMain(msg1);
+ objJsonResult = AddBillMain(msg1);
+ JObject resultJObj = JObject.FromObject(objJsonResult);
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
+ {
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ resultJObj["NotShowTips"] = true;
+ }
+ else
+ {
+ resultJObj["NotShowTips"] = false;
+ }
+ }
+
+ return resultJObj;
}
public json AddBillMain(string msg1)
@@ -246,8 +261,13 @@
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++)
{
if (i >= 0)//HQty
@@ -314,7 +334,7 @@
{
string sAutoCheck = oSystemParameter.GetSingleSystemParameter("QC_ProcessCheckBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
objJsonResult.Verify = sAutoCheck;
- bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
}
else
{
@@ -348,7 +368,7 @@
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
//鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
- var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillOld.omodel.HInterID + "," + 7507, "h_p_OA_WorkLinkBill_Create");
+ var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 7507, "h_p_OA_WorkLinkBill_Create");
if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
{
--
Gitblit v1.9.1