From 00d963405d2d5161052934f2cb67a2b6ea0947dd Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:14:30 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
index 14bef06..fb7102c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -1,4 +1,5 @@
using DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -31,6 +32,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_OrderBackInfoList", 1, false, user))
{
@@ -42,30 +44,40 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere, "h_v_Gy_OrderBackInfoList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�", "h_v_Gy_OrderBackInfoList");
}
else
{
string sql1 = "select * from h_v_Gy_OrderBackInfoList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�";
ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
--
Gitblit v1.9.1