From c23b8434054d5de5ef8575e25c4441ede6c6ac2d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期日, 09 十月 2022 15:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
index 7e795b8..e210529 100644
--- a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -29,6 +29,7 @@
public int HOrgID;//缁勭粐
public string HPZStatus;//鍝佽川纭
public string HCKStatus;//浠撳簱鎺ユ敹
+ public string Arbitrarily;//浠绘剰鍙傛暟
}
[Route("Cj_CallGoodsBillBack/CallGoodsBillBackMainList")]
@@ -57,8 +58,25 @@
}
CallGoodsBill ca = JsonConvert.DeserializeObject<CallGoodsBill>(sWhere);
- 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");
+ 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");
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -94,7 +112,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"exec Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Delete {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
--
Gitblit v1.9.1