From 8b83671f3d3369e6313313a1b3fefdf5b6c0252f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 四月 2024 14:10:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 18 +++
DAL/仓库管理/ClsKf_MoveStockBill.cs | 4
DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs | 8 +
WebAPI/Controllers/PlateBindingController.cs | 123 ++++++++++++++++++++++++
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 37 +++++++
DAL/销售管理/ClsXs_ReceivableBill.cs | 62 ++++++++++++
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 6 +
WebAPI/Controllers/WebAPIController.cs | 18 +++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs | 4
10 files changed, 277 insertions(+), 4 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
index 026cf4f..9a4511d 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
@@ -87,6 +87,10 @@
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
+
+ //鐩存帴璋冩嫧鍗� 淇敼 鎾ら攢 鍥炲～ 璋冩嫧鐢宠鍗� 鍏宠仈鏁伴噺
+ oCn.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + omodel.HInterID.ToString());
+
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
index 942808f..425538d 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
@@ -51,6 +51,10 @@
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
}
+ else if (DetailColl[0].HSourceBillType == "1402") //鍙戣揣閫氱煡鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
+ }
else
{
@@ -80,6 +84,10 @@
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
}
+ else if(DetailColl[0].HSourceBillType == "1402") //鍙戣揣閫氱煡鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
+ }
else
{
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
index 7f7a56b..3691193 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
@@ -32,6 +32,61 @@
#endregion
#endregion
+
+ #region 鍏宠仈鏁伴噺
+
+ //鍒犻櫎鍏宠仈
+ //public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ //{
+ // //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ // try
+ // {
+ // if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ // {
+ // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + lngBillKey.ToString());
+ // }
+ // else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
+ // {
+ // oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + lngBillKey.ToString());
+ // }
+ // else
+ // {
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // throw (e);
+ // }
+ //}
+ ////鏂板鍏宠仈
+ //public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ //{
+ // //閿�鍞鍗� 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ // try
+ // {
+ // if (DetailColl[0].HSourceBillType == "1401") //閿�鍞鍗�
+ // {
+ // oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Add " + lngBillKey.ToString());
+ // }
+ // else if (DetailColl[0].HSourceBillType == "1205") //閿�鍞嚭搴撳崟
+ // {
+ // oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockToPOStockIn_Add " + lngBillKey.ToString());
+ // }
+ // else
+ // {
+
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // throw (e);
+ // }
+ //}
+
+ #endregion
+
+
+
#region 淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -113,6 +168,9 @@
")";
oCn.RunProc(subSql);
}
+
+ ////鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ //AddNewRelation(ref sReturn, omodel.HInterID);
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -229,6 +287,10 @@
")";
oCn.RunProc(subSql);
}
+
+ ////鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ //AddNewRelation(ref sReturn, omodel.HInterID);
+
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
diff --git a/WebAPI/Controllers/PlateBindingController.cs b/WebAPI/Controllers/PlateBindingController.cs
new file mode 100644
index 0000000..1821d54
--- /dev/null
+++ b/WebAPI/Controllers/PlateBindingController.cs
@@ -0,0 +1,123 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class PlateBindingController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ /// <summary>
+ /// 淇濆瓨骞虫澘缁戝畾
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Save/Xt_PlateBinding")]
+ [HttpPost]
+ public object Save([FromBody] JObject msg)
+ {
+ try
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+
+ string filePath = "Configuration";
+ bool isAppend = true;
+
+ filePath = $@"{filePath}\PlateBinding.txt";
+
+ filePath = "D:\\" + filePath;
+
+ if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
+ {
+ System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+ }
+ //鍒ゆ柇鏄惁宸茬粡瀛樺湪骞虫澘缁戝畾鏂囦欢锛岃嫢宸插瓨鍦ㄥ垯鍒犻櫎锛岄噸鏂板垱寤�
+ bool fileExists = System.IO.File.Exists(filePath);
+
+ //瀛樺湪 鍒欏垹闄よ鏂囦欢
+ if (fileExists)
+ {
+ File.Delete(filePath);
+ }
+ //鍒涘缓鏂囦欢
+
+ using (StreamWriter writer = new StreamWriter(filePath, isAppend))
+ {
+ //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+ if (fileExists && isAppend)
+ {
+ writer.WriteLine();
+ }
+
+ var content = msg1 is string ? msg1 : JsonConvert.SerializeObject(msg1);
+ writer.WriteLine($"{DateTime.Now}");
+ writer.WriteLine("");
+ msg1 = msg1.Replace("{","").Replace("}","").Replace("\"","");
+ string[] arr = msg1.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+ for (int i = 0; i < arr.Length; i++)
+ {
+ writer.WriteLine(arr[i]);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "骞虫澘缁戝畾淇℃伅鍐欏叆鎴愬姛锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆骞虫澘缁戝畾淇℃伅杩囩▼涓彂鐢熷紓甯革紒";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+
+ #region 鑾峰彇骞虫澘缁戝畾鏂囦欢鏁版嵁
+
+ [Route("Get/Xt_PlateBinding")]
+ [HttpGet]
+ public object Get(string user)
+ {
+ try
+ {
+ //鏍规嵁鎸囧畾璺緞锛岃鍙栨枃浠跺唴瀹癸紝杩斿洖鏁版嵁涓烘暟缁勬牸寮�
+ string[] ConfigFileInfo = File.ReadAllLines(@"D:\Configuration\PlateBinding.txt");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ConfigFileInfo;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 205b36f..495f0a8 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1632,7 +1632,7 @@
oCN.BeginTran();
- //鍒嗗竷寮忚皟鍏ュ崟鏂板鍥炲～鍒嗗竷寮忚皟鍑哄崟鍏宠仈鏁伴噺
+ //鐩存帴璋冩嫧鍗� 鍒犻櫎 鎾ら攢 鍥炲～ 璋冩嫧鐢宠鍗� 鍏宠仈鏁伴噺
oCN.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + HInterID);
oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
@@ -1801,6 +1801,10 @@
//閿�鍞嚭搴撳垹闄ゅ洖濉攢鍞鍗曞叧鑱旀暟閲�
//oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);
+ //閿�鍞嚭搴撳垹闄ゅ洖濉敹璐ч�氱煡鍗曞叧鑱旀暟閲�
+ //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Del " + HInterID);
+
+
//oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
//oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index fdb9109..31c8db2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11636,14 +11636,26 @@
/// <returns></returns>
[Route("Web/GetHSourceBillType")]
[HttpGet]
- public object GetHSourceBillType(string HName)
+ public object GetHSourceBillType(string HName,int Num)
{
try
{
ClsCN oCn = new ClsCN();
DataSet oDs = new DataSet();
- //==========
- oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='"+HName+"'", "Xt_BillSourceSet");
+ //鏈夌殑鍗曞瓙婧愬崟鍒嗕负绾㈣摑鍗� 0浠ｈ〃钃濆崟 1浠ｈ〃绾㈠崟
+ if (Num==0)
+ { //婧愬崟涓鸿摑鍗�
+ oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "' HRedBlueFlag ='"+ Num+"' ", "Xt_BillSourceSet");
+ }
+ else if (Num==1)
+ { //婧愬崟涓虹孩鍗�
+ oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "' HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
+ }
+ else if(Num==2)
+ { //涓嶅垎绾㈣摑鍗�
+ oDs = oCn.RunProcReturn("select * from Xt_BillSourceSet where HName='" + HName + "'", "Xt_BillSourceSet");
+ }
+
objjson.code = "1";
objjson.count = 1;
objjson.Message = "鑾峰彇鎴愬姛锛�";
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index 7bbe376..ff159be 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -1078,6 +1078,43 @@
}
#endregion
+ #region 閿�鍞嚭搴撳崟 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栧彂璐ч�氱煡鍗曟暟鎹�
+ [Route("Kf_SellOutBill/loadXs_SeOutStockBill_Push")]
+ [HttpGet]
+ public object loadXs_SeOrderBill_Push(long HInterID, long HSubID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_SeOutStockBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ 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
+
#region 閿�鍞嚭搴撳崟 妫�鏌ュ崟鎹槸鍚﹀瓨鍦�
/// <summary>
/// </summary>
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index 02e88d1..128b977 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -363,6 +363,24 @@
oCN.BeginTran();
+ //ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillList_Query where hmainid=" + HInterID, "h_v_Xs_ReceivableBillList_Query");
+ //foreach (DataRow row in ds.Tables[0].Rows)
+ //{
+ // // 鑾峰彇褰撳墠琛岀殑 HSourceBillType 鍊�
+ // string hSourceBillType = row["HSourceBillType"].ToString();
+
+ // if (hSourceBillType == "1401")
+ // {
+ // //搴旀敹鍗� 鍒犻櫎鍥炲～ 閿�鍞鍗� 鍏宠仈鏁伴噺
+ // oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + HInterID);
+ // }
+ // else if (hSourceBillType == "1205")
+ // {
+ // //搴旀敹鍗� 鍒犻櫎鍥炲～ 閿�鍞嚭搴撳崟 鍏宠仈鏁伴噺
+ // oCN.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + HInterID);
+ // }
+ //}
+
oCN.RunProc("delete from Xs_ReceivableBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from Xs_ReceivableBillSub where HInterID= " + HInterID);
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
index 2b72194..943d17e 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
@@ -268,6 +268,10 @@
+ ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + " where HInterID=" + HInterID;
oCN.RunProc(sql);
+
+ //鍒嗗竷寮忚皟鍏ュ崟 缂栬緫 鎾ら攢 鍥炲～鍒嗗竷寮忚皟鍑哄崟鍏宠仈鏁伴噺
+ oCN.RunProc("exec h_p_Kf_UpDateRelation_ICStockToPOStockIn_Del " + HInterID);
+
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index fca7dca..24962fd 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -417,6 +417,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\PlateBindingController.cs" />
<Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
<Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
--
Gitblit v1.9.1