From 54fc69f6ff988a40fc5371de8ffe59a08c6fa8c3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 23 十一月 2023 11:03:53 +0800
Subject: [PATCH] 新增应收报表调用方法，销售码单打印反审核功能优化，辅助属性显示数据排序
---
DAL/基础资料/InterFace基础资料/ClsIF_Property_View.cs | 2
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs | 5 ++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/应收管理/YS_ReceiveReportController.cs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 113 insertions(+), 1 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
index c713d91..014c98c 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
@@ -21,7 +21,7 @@
base.MvarItemKey = "h_v_IF_PropertyByMaterID";
base.SQLName = "Select HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_PropertyByMaterID ";
base.SQLWhere = " where HStopflag=0 ";
- base.SQLOrder = " ";
+ base.SQLOrder = " Order by HNumber ";
//涓嬫媺SQL
base.SQLNameForDown = " Select top 30 HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_Property ";
base.SQLOrderForDown = " Order by HNumber ";
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
index d203224..6b3776e 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_SellOutBill_BarCodeNote.cs"
@@ -415,6 +415,11 @@
#region //鍙嶅鏍搁攢鍞嚭搴撳崟
private void fsh_Click(object sender, EventArgs e)
{
+ if(HInterID==0)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨瀵瑰簲閿�鍞嚭搴撳崟锛�", "鎻愮ず");
+ return;
+ }
if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
cmbHBillStatus.Text = "鍒涘缓";
diff --git "a/WebAPI/Controllers/\345\272\224\346\224\266\347\256\241\347\220\206/YS_ReceiveReportController.cs" "b/WebAPI/Controllers/\345\272\224\346\224\266\347\256\241\347\220\206/YS_ReceiveReportController.cs"
new file mode 100644
index 0000000..39ef7e1
--- /dev/null
+++ "b/WebAPI/Controllers/\345\272\224\346\224\266\347\256\241\347\220\206/YS_ReceiveReportController.cs"
@@ -0,0 +1,106 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //搴旀敹鎶ヨ〃Controller
+ public class YS_ReceiveReportController : ApiController
+ {
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+
+ #region 瀹㈡埛搴旀敹璐︽鍒嗘瀽鎶ヨ〃
+ /// <summary>
+ /// 瀹㈡埛搴旀敹璐︽鍒嗘瀽鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("YS_ReceiveReportController/GetYS_CusShouldIncomeReport_Json")]
+ [HttpGet]
+ public object GetYS_CusShouldIncomeReport_Json(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_YS_CusShouldIncomeReport " + sWhere, "h_p_YS_CusShouldIncomeReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ 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 瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃
+ /// <summary>
+ /// 瀹㈡埛搴旀敹璐︽鏄庣粏鍒嗘瀽鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("YS_ReceiveReportController/GetYS_CusShouldIncomeEntryReport_Json")]
+ [HttpGet]
+ public object GetYS_CusShouldIncomeEntryReport_Json(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_YS_CusShouldIncomeEntryReport " + sWhere, "h_p_YS_CusShouldIncomeEntryReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ 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
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0b18663..5921c79 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -594,6 +594,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
+ <Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
--
Gitblit v1.9.1