From 5cdcde592ae19de697c4bf16dce08838065987e3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 22 八月 2023 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/QuotePriceBilController.cs | 66 ++++++++++++++++
WebAPI/Controllers/POOrderController.cs | 15 +++
WebAPI/Controllers/POOrderBillExcelController.cs | 22 ++++-
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/POInStockController.cs | 18 +++-
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/AskPriceBillController.cs | 66 ++++++++++++++++
WebAPI/DLL/Model.dll | 0
WebAPI/Controllers/BarCodeController.cs | 5
9 files changed, 180 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/AskPriceBillController.cs b/WebAPI/Controllers/AskPriceBillController.cs
new file mode 100644
index 0000000..b0ab5c4
--- /dev/null
+++ b/WebAPI/Controllers/AskPriceBillController.cs
@@ -0,0 +1,66 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using SQLHelper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Code;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class AskPriceBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
+ DataSet ds;
+
+ #region 渚涘簲鍟嗚浠峰崟鍒楄〃
+ [Route("Sup_AskPriceBill/Sup_AskPriceBillList")]
+ [HttpGet]
+ public object Sup_AskPriceBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_Sup_AskPriceBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sup_AskPriceBill");
+
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 381d0f1..6e9d2a5 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1579,7 +1579,8 @@
//妫�楠屾墦鍗版暟閲忥紙HQTY锛夊拰鏈墦鍗版暟閲�
string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
DataSet ds = oCn.RunProcReturn(sql, "tables");
- if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
+
+ if (ds.Tables[0].Rows.Count > 0 && Convert.ToDouble(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1650,7 +1651,7 @@
var HSupName_verify = HBarCode_verify[7]; //鏍￠獙渚涘簲鍟�
var HSourceBillNo_verify = HBarCode_verify[8]; //鏍￠獙閲囪喘璁㈠崟鍙�
- sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}' and HModel = '{HMaterModel_verify}'";
+ sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}'";
DataSet verifyMatInfo = oCn.RunProcReturn(sql, "tables");
sql = $"select * from Cg_POOrderBillMain where HBillNo = '{HSourceBillNo_verify}'";
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index dbce9ac..09ae8d5 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -372,7 +372,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (oItemSub.HQty > oItemSub.HRQty)
+ if (Convert.ToDecimal(oItemSub.HQty) > Convert.ToDecimal(oItemSub.HRQty))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -382,7 +382,7 @@
}
oItemSub.HEntryID = i;
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HRemark = "";
+ //oItemSub.HRemark = "";
oItemSub.HCloseMan = "";
oItemSub.HCloseType = false;
oBill.DetailColl.Add(oItemSub);
@@ -774,11 +774,13 @@
}
else
{
- sql = string.Format(@"
+ //鐟炵惇瀛楁
+ sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber
FROM CG_POINSTOCKBILLSUB B
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -861,6 +863,12 @@
FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+
+ FentityModel.Add("F_bsv_Text1", item["HExpressSupplierSub"].ToString());//鐗╂祦鍗曚綅 (鐟炵惇)
+ FentityModel.Add("F_bsv_Text2", item["HExpressNumberSub"].ToString());//鐗╂祦鍗曞彿 (鐟炵惇)
+ FentityModel.Add("FDescription", item["HRemark"].ToString());//琛ㄤ綋澶囨敞 (鐟炵惇)
+ FentityModel.Add("F_bsv_dhrq", item["HPlanArrivalDate"].ToString());//鍒拌揣鏃ユ湡 (鐟炵惇)
+ FentityModel.Add("F_bsv_xh", item["HBoxNumber"].ToString());//绠卞彿 (鐟炵惇)
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
@@ -1200,8 +1208,8 @@
}
//鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
- //瀹夌憺锛欰IS20220914133941 鐟炰笌鐞細AIS20220308151944
- DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20220308151944..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
+ //瀹夌憺锛欰IS20220914133941 鐟炰笌鐞細AIS20220308151944 鏈湴锛欰IS20210811135644 澶忓疂锛欰IS20211130140219
+ DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20210811135644..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
DataTable dt = ds.Tables[0];
if (dt.Rows.Count > 0)
{
diff --git a/WebAPI/Controllers/POOrderBillExcelController.cs b/WebAPI/Controllers/POOrderBillExcelController.cs
index 37eb707..da369e7 100644
--- a/WebAPI/Controllers/POOrderBillExcelController.cs
+++ b/WebAPI/Controllers/POOrderBillExcelController.cs
@@ -127,6 +127,18 @@
if (!tb2.Columns.Contains("鍖呰鏍囪瘑"))
error += "娌℃湁鎵惧埌銆愬寘瑁呮爣璇嗐�戠殑鏍囬,";
+ if (!tb2.Columns.Contains("鍒拌揣鏃ユ湡"))
+ error += "娌℃湁鎵惧埌銆愬埌璐ф棩鏈熴�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐗╂祦鍗曞彿"))
+ error += "娌℃湁鎵惧埌銆愮墿娴佸崟鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐗╂祦鍏徃"))
+ error += "娌℃湁鎵惧埌銆愮墿娴佸叕鍙搞�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("绠卞彿"))
+ error += "娌℃湁鎵惧埌銆愮鍙枫�戠殑鏍囬,";
+
if (error.Length > 0)
{
objJsonResult.code = "0";
@@ -141,14 +153,14 @@
{
for (int j = 0; j < tb2.Columns.Count; j++)
{
- if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[j].ToString()!= "鍖呰鏍囪瘑")
+ if (tb2.Rows[i][j].ToString() == ""&& tb2.Columns[j].ToString()!= "鍖呰鏍囪瘑" && tb2.Columns[j].ToString() != "鍒拌揣鏃ユ湡" && tb2.Columns[j].ToString() != "鐗╂祦鍗曞彿" && tb2.Columns[j].ToString() != "鐗╂祦鍏徃" && tb2.Columns[j].ToString() != "绠卞彿")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,绗瑊(i + 1)}琛岀{(j + 1)}鍒楀�间笉鑳戒负绌�!\r\n";
objJsonResult.data = null;
return objJsonResult;
- }
+ }
}
}
@@ -164,9 +176,11 @@
for (int i = 0; i < tb2.Rows.Count; i++)
{
oCn.RunProc("insert into POOrderBill_Excel(HItemID,HORGName, SupplierName, Warehouse_Shou," +
- " MaterialNum, HQty, HPackFlag)values" +
+ " MaterialNum, HQty, HPackFlag, HArrivalDate, HExpressNumberSub, HExpressSupplierSub, HBoxNumber)values" +
$"({(i + 1)},'{tb2.Rows[i]["缁勭粐"].ToString()}', '{tb2.Rows[i]["渚涘簲鍟�"].ToString()}', '{tb2.Rows[i]["鏀舵枡浠撳簱"].ToString()}', " +
- $"'{tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}', {tb2.Rows[i]["鏁伴噺"].ToString()}, '{tb2.Rows[i]["鍖呰鏍囪瘑"].ToString()}')");
+ $"'{tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}', {tb2.Rows[i]["鏁伴噺"].ToString()}, '{tb2.Rows[i]["鍖呰鏍囪瘑"].ToString()}'," +
+ $"'{tb2.Rows[i]["鍒拌揣鏃ユ湡"].ToString()}','{tb2.Rows[i]["鐗╂祦鍗曞彿"].ToString()}','{tb2.Rows[i]["鐗╂祦鍏徃"].ToString()}'," +
+ $"'{tb2.Rows[i]["绠卞彿"].ToString()}')");
}
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/POOrderController.cs b/WebAPI/Controllers/POOrderController.cs
index e8f676e..4778e3a 100644
--- a/WebAPI/Controllers/POOrderController.cs
+++ b/WebAPI/Controllers/POOrderController.cs
@@ -188,17 +188,25 @@
}
}
[Route("POOrderAccept")]
- [HttpGet]
+ [HttpPost]
/// <summary>
/// 璁㈠崟鎺ュ彈
/// </summary>
/// <param name="HInterID"></param>
/// <returns></returns>
- public object POOrderAccept(string HInterID, string HBillNo, string HUser)
+ public object POOrderAccept([FromBody] JObject oData)
{
+ var _value = oData["oData"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string HInter = sArray[0].ToString();
+ string HInterID = HInter.Replace("\"", ""); //鍐呯爜
+ string HBillNo = sArray[1].ToString().Replace("\"", "");
+ string HUser = sArray[2].ToString(); //鐢ㄦ埛鍚�
+
try
{
- if (DBUtility.ClsPub.isLong(HInterID) == 0)
+ if (DBUtility.ClsPub.isStrNull(HInterID) == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -206,6 +214,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
DAL.ClsCg_POOrderBill oBill = new DAL.ClsCg_POOrderBill();
oBill.WebAccept(DBUtility.ClsPub.isLong(HInterID), DBUtility.ClsPub.isStrNull(HBillNo), DBUtility.ClsPub.isStrNull(HUser), ref DBUtility.ClsPub.sExeReturnInfo);
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/QuotePriceBilController.cs b/WebAPI/Controllers/QuotePriceBilController.cs
new file mode 100644
index 0000000..f286c0b
--- /dev/null
+++ b/WebAPI/Controllers/QuotePriceBilController.cs
@@ -0,0 +1,66 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using SQLHelper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Code;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class QuotePriceBilController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
+ DataSet ds;
+
+ #region 渚涘簲鍟嗘姤浠峰崟鍒楄〃
+ [Route("Sup_QuotePriceBill/Sup_QuotePriceBillList")]
+ [HttpGet]
+ public object Sup_QuotePriceBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_Sup_QuotePriceBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sup_QuotePriceBill");
+
+ //娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index a60eec5..903cec0 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll
index cdeff4a..cfc3390 100644
--- a/WebAPI/DLL/Model.dll
+++ b/WebAPI/DLL/Model.dll
Binary files differ
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a6dc916..7d2421f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -210,6 +210,7 @@
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
+ <Compile Include="Controllers\QuotePriceBilController.cs" />
<Compile Include="Controllers\BarCodeController.cs" />
<Compile Include="Controllers\NpoiHelper.cs" />
<Compile Include="Controllers\POInStockBackController.cs" />
@@ -217,6 +218,7 @@
<Compile Include="Controllers\PODemandPlanController.cs" />
<Compile Include="Controllers\EntrustOrderController.cs" />
<Compile Include="Controllers\POOrderBillExcelController.cs" />
+ <Compile Include="Controllers\AskPriceBillController.cs" />
<Compile Include="Controllers\POOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportController.cs" />
--
Gitblit v1.9.1