From b210dfbde4b9a91fec598f203acaf6855d3a9acf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 27 九月 2024 16:21:39 +0800
Subject: [PATCH] 取样单增加增加下拉框字段 送测类型 首件,实验,巡检 TestType varchar(50) 设备工艺参数趋势分析图,增加下拉框类型(手动输入,设备采集),人工输入:取设备工艺参数点检 模具保养计划修改时增加子表保存
---
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
index e210529..c71dd6c 100644
--- a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -58,25 +58,8 @@
}
CallGoodsBill ca = JsonConvert.DeserializeObject<CallGoodsBill>(sWhere);
- oCN.RunProc($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
- $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'");
-
- if (ca.HPZStatus == "鍏ㄩ儴" && ca.HCKStatus == "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query1 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query1");
- }
- else if (ca.HPZStatus != "鍏ㄩ儴" && ca.HCKStatus == "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query2 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query2");
- }
- else if (ca.HPZStatus == "鍏ㄩ儴" && ca.HCKStatus != "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query3 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query3");
- }
- else if (ca.HPZStatus != "鍏ㄩ儴" && ca.HCKStatus != "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query4 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query4");
- }
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
+ $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'", "h_p_JIT_BackGoodsBillList_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1