From c7cfb07c1d5941a2023431c4b41519dcb2b0f872 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 01 九月 2022 08:49:54 +0800
Subject: [PATCH] 新增了出站汇报单显示流转卡信息 批量汇报功能
---
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index cb9454f..867326d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -89,7 +89,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -99,6 +99,7 @@
}
ds = Sc_MouldMoveStockStepOutBill(sWhere,Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -120,11 +121,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (璋冨嚭缁勭粐='" + Organization + "' or 璋冨叆缁勭粐='" + Organization + "')");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepOutBill");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldMoveStockStepOutBill");
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere+ "order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
}
@@ -155,6 +156,8 @@
public object Sc_MouldMoveStockStepOutBillListProjectDetai(string sqlWhere)
{
DataSet ds;
+ DataSet ds1;
+ List<object> list = new List<object>();
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -166,10 +169,6 @@
璋冨叆浠撲綅浠ｇ爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠ｇ爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID,
璋冨嚭浠撲綅浠ｇ爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅 FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
}
else
{
@@ -182,11 +181,18 @@
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
}
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,
+ hscwhid,max(璋冨嚭浠撳簱浠ｇ爜)璋冨嚭浠撳簱浠ｇ爜,max(璋冨嚭浠撳簱)璋冨嚭浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldMoveStockStepOutBill
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,hscwhid,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldMoveStockStepOutBill");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
}
catch (Exception e)
{
@@ -221,7 +227,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -310,13 +316,20 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -354,7 +367,7 @@
public object DeltetMouldMoveStockStepOutBil(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -393,10 +406,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -431,7 +455,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Check", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1