From ace57897fc40d465114820fcf1c3c87f9bf42f42 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 七月 2024 09:24:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Kf_WeighToBarCode.designer.cs | 1
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs | 307 ++++++++++++
Model/基础资料/基础资料/ClsGy_UnitConvertRate_Model.cs | 18
WarM/条码打印/Kf_WeighToBarCode.cs | 238 ---------
WebAPI/Controllers/MateOutController.cs | 156 ++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 131 ++--
WebAPI/Controllers/条码管理/WEBSController.cs | 554 +++++++++++++++++++++++
WebAPI/Web.config | 4
Model/Model.csproj | 1
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 2
WebAPI/InvokeHelper.cs | 17
WebAPI/WebAPI.csproj | 1
12 files changed, 1,122 insertions(+), 308 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 18bb2dc..bf54238 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -468,6 +468,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BarCodeCheckType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_UnitConvertRate_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeMain_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeSub_Model.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs"
new file mode 100644
index 0000000..668cb8d
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs"
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_UnitConvertRate_Model : DBUtility.ClsGy_Base_Model
+ {
+ public string HBILLNO; // varchar(30)
+ public Int64 HMATERID; // int --物料
+ public Int64 HCURRENTUNITID; // int --当前单位
+ public Int64 HDESTUNITID; // int --目标单位
+ public string HCONVERTTYPE; // varchar(20) --类型
+ public double HCONVERTNUMERATOR; // dec(23, 10) --分子
+ public double HCONVERTDENOMINATOR; // dec(23, 10) --分母
+ public string HFORBIDSTATUS; // varchar(10) --状态
+ }
+}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index 55d6d88..4dc1ac2 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -14,9 +14,6 @@
using System.IO.Ports;
using System.Linq;
-using System.IO.Ports;
-using System.Linq;
-
namespace WarM
{
public partial class Kf_WeighToBarCode : Form
@@ -54,13 +51,6 @@
public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
-
-
- private static string repeatData = string.Empty;
- private SerialPort ComDevice = null;
- private int HGetWeight = 0;
- private string Message = "";
- private int timeIndex = 0;
#region //鍥哄畾浠ｇ爜
@@ -191,228 +181,6 @@
DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
}
-
-
- //鎵撳紑涓插彛
- private void button3_Click(object sender, EventArgs e)
- {
- OpenCom();
- }
- public void OpenCom()
- {
- //鍒濆鍖栦覆鍙�
- ComDevice = new SerialPort();
- ComDevice.DataReceived += new SerialDataReceivedEventHandler(Com_DataReceived);//缁戝畾浜嬩欢
- string[] PortNames = SerialPort.GetPortNames();
-
-
- if (!ComDevice.IsOpen)
- {
-
- try
- {
- ComDevice.PortName = txtPortName.Text;
- ComDevice.BaudRate = int.Parse(txtBaudRate.Text);
- switch (cmbParity.SelectedItem.ToString())
- {
- case "0":
- ComDevice.Parity = Parity.None;
- break;
- case "1":
- ComDevice.Parity = Parity.Odd;
- break;
- case "2":
- ComDevice.Parity = Parity.Even;
- break;
- case "3":
- ComDevice.Parity = Parity.Mark;
- break;
- case "4":
- ComDevice.Parity = Parity.Space;
- break;
- default:
- break;
- }
-
- ComDevice.DataBits = int.Parse(txtDataBits.Text);
- switch (cmbStopBits.SelectedItem.ToString())
- {
- case "0":
- ComDevice.StopBits = StopBits.None;
- break;
- case "1":
- ComDevice.StopBits = StopBits.One;
- break;
- case "2":
- ComDevice.StopBits = StopBits.Two;
- break;
- case "1.5":
- ComDevice.StopBits = StopBits.OnePointFive;
- break;
- default:
- break;
- }
-
- ComDevice.Open();
-
- //lblComStatus.Text = "涓插彛鐘舵�侊細寮�鍚�";
- timer3.Enabled = true;
- }
- catch (Exception ex)
- {
- MessageBox.Show("鎵撳紑涓插彛澶辫触锛�" + ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- }
- else
- {
-
- }
- }
-
- //鍏抽棴涓插彛
- private void button2_Click(object sender, EventArgs e)
- {
- CloseCom();
- }
- public void CloseCom()
- {
- if (!ComDevice.IsOpen)
- {
-
- }
- else
- {
- try
- {
- timer3.Enabled = false;
- Thread.Sleep(100);
- ComDevice.Close();
- // valueCounts = new Dictionary<string, int>();
- // lblComStatus.Text = "涓插彛鐘舵�侊細鍏抽棴";
-
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- }
- }
-
- //鍙戦�佹暟鎹�
- public bool SendData(byte[] data)
- {
- if (ComDevice.IsOpen)
- {
- try
- {
- ComDevice.Write(data, 0, data.Length);//鍙戦�佹暟鎹�
- return true;
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- finally
- {
-
- }
- }
- else
- {
- MessageBox.Show("涓插彛鏈墦寮�", "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- return false;
- }
-
- //鎺ユ敹鏁版嵁
- private void Com_DataReceived(object sender, SerialDataReceivedEventArgs e)
- {
- //if (!ComDevice.IsOpen)
- // {
- // return;
- // }
- // Thread.Sleep(100);
- if (HGetWeight == 1)
- {
- byte[] ReDatas = new byte[ComDevice.BytesToRead];
- ComDevice.Read(ReDatas, 0, ReDatas.Length);//璇诲彇鏁版嵁
- this.AddData(ReDatas);//杈撳嚭鏁版嵁
- }
- }
-
- //澶勭悊鎺ユ敹鍒扮殑鏁版嵁
- public void AddData(byte[] data)
- {
- //Thread.Sleep(100);
- StringBuilder sb = new StringBuilder();
- sb.Append(Encoding.ASCII.GetString(data));
-
- var str = sb.ToString();
- str = str.Replace("w", "").Replace("n", "").Replace("kg\r\n", ";");
-
-
- if (str != repeatData)
- {
- repeatData = str;
- string[] strArray = str.Split(';');
-
- for (int i = 0; i < strArray.Length; i++)
- {
- if (double.TryParse(strArray[i], out double ret))//鍒ゆ柇鏄惁鏄暟瀛�
- {
-
- Message += double.Parse(strArray[i]) + ";";
-
- //UpdateLabel(ret.ToString());
- }
- }
- }
- }
-
- //鑾峰彇鏁扮粍涓嚭鐜伴鐜囨渶楂樼殑鏁版嵁
- private string getMostStr(string message)
- {
- string[] strArray = message.Split(';');
- // 浣跨敤LINQ鏌ヨ鍑虹幇娆℃暟鏈�澶氱殑鍏冪礌
- var maxElement = strArray.GroupBy(x => x)
- .OrderByDescending(g => g.Count())
- .First()
- .Key;
-
-
- return maxElement;
- }
-
- //渚濇嵁绾跨▼锛屽皢鏁版嵁鍐欏叆鐣岄潰缁勪欢
- private void UpdateLabel(string text)
- {
- if (txtHWeightQyt.InvokeRequired)
- {
- // 鍦║I绾跨▼涓婅皟鐢� UpdateLabel
- txtHWeightQyt.Invoke(new Action<string>(UpdateLabel), text);
- }
- else
- {
- // 鐩存帴鏇存柊 txtHWeightQyt.Text
- txtHWeightQyt.Text = text;
- }
- }
-
- //鑾峰彇鏁版嵁鎸夐挳锛屽惎鍔ㄨ鏃跺櫒
- private void button4_Click(object sender, EventArgs e)
- {
- HGetWeight = 1;
- timer2.Enabled = true;
- }
-
- //璁℃椂鍣ㄤ簨浠�
- private void timer2_Tick(object sender, EventArgs e)
- {
-
- }
-
#endregion
@@ -1272,12 +1040,6 @@
this.txtHRemark.Tag = oBadReason.oModel.HItemID.ToString();
}
}
-
-
-
-
-
-
#endregion
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
index 4e33067..639d158 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
@@ -650,7 +650,6 @@
this.txtHWeightQyt.Name = "txtHWeightQyt";
this.txtHWeightQyt.Size = new System.Drawing.Size(190, 28);
this.txtHWeightQyt.TabIndex = 149;
- this.txtHWeightQyt.TextChanged += new System.EventHandler(this.txtHWeightQyt_TextChanged);
//
// label7
//
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 07bb27f..323e28d 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -2776,6 +2776,162 @@
}
}
#endregion
+
+ #region 婊炵暀鏃堕棿鎶ヨ〃
+ [Route("MaterOutEntryReport/Sc_RetentionTimeReport")]
+ [HttpGet]
+ public object Sc_RetentionTimeReport(string HBeginDate,string HEndDate,string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_RetentionTimeReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_RetentionTimeReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_RetentionTimeReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞环鏍煎姣旀姤琛�
+ [Route("MaterOutEntryReport/Sc_CompareOrderToSelloutReport")]
+ [HttpGet]
+ public object Sc_CompareOrderToSelloutReport(string HBeginDate, string HEndDate, string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_CompareOrderToSelloutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_CompareOrderToSelloutReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_CompareOrderToSelloutReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ 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 = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞帓鍚嶆姤琛�
+ [Route("MaterOutEntryReport/Xs_SellOutMoneyRangeReport")]
+ [HttpGet]
+ public object Xs_SellOutMoneyRangeReport(string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Xs_SellOutMoneyRangeReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SellOutMoneyRangeReport '" + sWhere + "'", "h_p_Xs_SellOutMoneyRangeReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
new file mode 100644
index 0000000..2d04bce
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -0,0 +1,307 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Gy_UnitConvertRateController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ const string ModCaption = "鍗曚綅鎹㈢畻";
+ public const string ModRightName = "Gy_UnitConvertRate";
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //鍒犻櫎
+ 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("Gy_UnitConvertRateController/GetGy_UnitConvertRateList_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRateList_Json(string sWhere, string HMaker, string OperationType)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺 1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ if (OperationType == "1")
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("select * from h_v_Gy_UnitConvertRateList where " + sWhere + " order by HItemID desc", "h_v_Gy_UnitConvertRateList");
+ 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("Gy_UnitConvertRateController/GetGy_UnitConvertRate_Delete_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRate_Delete_Json(Int64 HItemID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+ //鍒ゆ柇瀛樺湪鎬�
+ ds = oCn.RunProcReturn("select HNumber,HName from Gy_UnitConvertRate with(nolock) where HItemID= " + HItemID.ToString(), "Gy_UnitConvertRate");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ崟浣嶆崲绠楋紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCn.RunProc("Delete from Gy_UnitConvertRate where HItemID= " + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ DBUtility.ClsPub.Add_Log("", "鍒犻櫎鍗曚綅鎹㈢畻锛屼唬鐮侊細" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HNumber"]) + ",鍚嶇О锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HName"]), HMaker);
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍗曚綅鎹㈢畻鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍗曚綅鎹㈢畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍗曚綅鎹㈢畻鎵归噺鍚屾
+ /// <summary>
+ /// 浠庨噾铦朵簯鎵归噺鍚屾鍗曚綅鎹㈢畻鑷虫湰鍦拌〃
+ /// </summary>
+ [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRate_BatchSync_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRate_BatchSync_Json()
+ {
+ try
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ //绉佹湁浜戞ā寮忥紝閫氳繃璋冪敤瀛樺偍杩囩▼杩涜鍚屾
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "Y")
+ {
+ ds = oCn.RunProcReturn("exec h_p_IFCLD_ERPDataToLocal_UnitConvertRate", "h_p_IFCLD_ERPDataToLocal_UnitConvertRate");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏湁浜戞ā寮忥紝閫氳繃璋冪敤WEBAPI鏂瑰紡杩涜鍚屾
+ else if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N")
+ {
+ //鍒ゆ柇閲戣澏浜戞槸鍚︾櫥褰曟垚鍔�
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵归噺鍚屾澶辫触锛岄噾铦朵簯鐧诲叆涓嶆垚鍔燂紝璇风‘璁鐩橀厤缃枃浠舵墍璁剧疆閲戣澏浜戝搴旂綉鍧�銆佽处濂椼�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮佹槸鍚︽纭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var json = new
+ {
+ FormId = "BD_UNITCONVERTRATE",
+ FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
+ ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
+ ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+ FilterString = "",
+ OrderString = "",
+ TopRowCount = 0,
+ StartRow = 0,
+ Limit = 0
+ };
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.Query("BD_UNITCONVERTRATE", JsonConvert.SerializeObject(json));
+
+ //鍙嶅簭鍒楀寲
+ _result = _result.Replace("\"", "");
+ _result = _result.Replace("\n", "");
+ _result = _result.Replace(",[", "");
+ _result = _result.Replace("[", "");
+ string[] rows = _result.Split(new string[] { "]" }, StringSplitOptions.RemoveEmptyEntries); //浠�"]"鍒嗛殧姣忎竴琛屽苟绉婚櫎绌鸿
+ string[,] arr = new string[rows.Length, rows[0].Split(',').Length]; //鏍规嵁琛屽拰鍒楁暟鍒涘缓浜岀淮鏁扮粍
+ for (int i = 0; i < rows.Length; i++) //閬嶅巻姣忎竴琛�
+ {
+ string[] cols = rows[i].Split(','); //浠ラ�楀彿鍒嗛殧姣忎竴鍒�
+ for (int j = 0; j < cols.Length; j++) //閬嶅巻姣忎竴鍒�
+ {
+ arr[i, j] = cols[j]; //瀛樺叆浜岀淮鏁扮粍
+ }
+ }
+ //娓呯┖鍗曚綅鎹㈢畻琛ㄦ暟鎹�
+ oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //杈撳嚭浜岀淮鏁扮粍
+ for (int i = 0; i < arr.GetLength(0); i++)
+ {
+ var subData = new
+ {
+ HItemID = DBUtility.ClsPub.isLong(arr[i, 0]),
+ HNumber = "",
+ HName = "",
+ HShortNumber = "",
+ HParentID = 0,
+ HLevel = 1,
+ HEndFlag = 1,
+ HStopflag = arr[i, 5].ToString() == "B" ? 1 : 0,
+ HRemark = "CLD-ERP瀵煎叆",
+ HUseFlag = "宸蹭娇鐢�",
+ HUSEORGID = DBUtility.ClsPub.isLong(arr[i, 3]),
+ HCREATEORGID = DBUtility.ClsPub.isLong(arr[i, 4]),
+ HBILLNO = DBUtility.ClsPub.isStrNull(arr[i, 1]),
+ HMATERID = DBUtility.ClsPub.isLong(arr[i, 2]),
+ HCURRENTUNITID = DBUtility.ClsPub.isLong(arr[i, 6]),
+ HDESTUNITID = DBUtility.ClsPub.isLong(arr[i, 7]),
+ HCONVERTTYPE = DBUtility.ClsPub.isStrNull(arr[i, 8]),
+ HCONVERTNUMERATOR = DBUtility.ClsPub.isDoule(arr[i, 9]),
+ HCONVERTDENOMINATOR = DBUtility.ClsPub.isDoule(arr[i, 10]),
+ HFORBIDSTATUS = DBUtility.ClsPub.isStrNull(arr[i, 5]),
+ HUnitID = DBUtility.ClsPub.isLong(arr[i, 2] == "0" ? arr[i, 6] : "-1"),
+ HMakeEmp = DBUtility.ClsPub.isStrNull(arr[i, 11]),
+ HMakeTime = DBUtility.ClsPub.isDate(arr[i, 12]),
+ HCheckEmp = DBUtility.ClsPub.isStrNull(arr[i, 15]),
+ HCheckTime = DBUtility.ClsPub.isDate(arr[i, 16]),
+ HModifyEmp = DBUtility.ClsPub.isStrNull(arr[i, 13]),
+ HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
+ HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
+ HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+ };
+
+ //鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
+ oCn.RunProc("set identity_insert Gy_UnitConvertRate on", ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = $@"Insert into Gy_UnitConvertRate
+ (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
+ ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
+ ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
+ ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+ ,HMakeEmp,HMakeTime
+ ,HCheckEmp,HCheckTime
+ ,HModifyEmp,HModifyTime
+ ,HStopEmp,HStopTime)
+ Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
+ ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
+ ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
+ ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+ ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
+ ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
+ ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
+ ,'{subData.HStopEmp}',case when '{subData.HStopTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HStopTime}' end)";
+ oCn.RunProc(sql.Replace("\r\n", ""));
+ oCn.RunProc("set identity_insert Gy_UnitConvertRate off", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓嶆敮鎸佹壒閲忓悓姝ュ姛鑳斤紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ }
+}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index c42c0a8..9f88516 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -7443,6 +7443,65 @@
#endregion
#region 瀹㈡埛鏉＄爜鎵弿璁板綍鍗�
+ #region 瀹㈡埛鏉＄爜鎵弿璁板綍鍗� 鍒ゆ柇鍗曟嵁鍙锋槸鍚︿负缂撳瓨鍒楄〃涓殑鍗曟嵁鍙凤紝鏄� 鍒欐垚鍔熷苟杩斿洖鏁版嵁锛屽惁 鍒欏垽鏂け璐ャ��
+ [Route("WEBSController/Gy_getCusBarCodeBill_judgeHBillNoIsInTempList")]
+ [HttpGet]
+ public object Gy_getCusBarCodeBill_judgeHBillNoIsInTempList(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ //鍒ゆ柇淇敼鍚庣殑鍗曟嵁鍙凤紝涓庡師鍐呯爜锛屾槸鍚﹀瓨鍦ㄥ搴斿凡缁忎笂浼犵殑鍗曟嵁淇℃伅
+ string sql = "select * from Gy_getCusBarCodeBillMain " +
+ "where HInterID = " + HInterID + " " +
+ "and HBillNo = '" + HBillNo + "' " +
+ "and HBillType = '" + HBillType + "' " +
+ "and HMaker = '" + HMaker + "' " +
+ "and HOrgID = " + HStockOrgID;
+ DataSet ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBillMain");
+ if(ds!=null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触锛佸師鍥狅細淇敼鍗曟嵁鍙蜂笌鍐呯爜瀵瑰簲鐨勫崟鎹凡缁忔彁浜わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇淇敼鍚庣殑鍗曟嵁鍙凤紝涓庡師鍐呯爜锛屾槸鍚﹀瓨鍦ㄥ搴斿凡缁忎笂浼犵殑鍗曟嵁淇℃伅
+ string sql1 = "select top(1)* from Gy_getCusBarCodeBill_Temp " +
+ "where HBillNo = '" + HBillNo + "' " +
+ "and HBillType = '" + HBillType + "' " +
+ "and HMaker = '" + HMaker + "' " +
+ "and HOrgID = " + HStockOrgID;
+ DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
+ if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds1.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触锛佸師鍥狅細" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 瀹㈡埛鏉＄爜鎵弿璁板綍鍗� 鎵弿鏉＄爜
/// <summary>
/// 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮�
@@ -8056,12 +8115,12 @@
if (sWhere == null || sWhere == "")
{
- sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query order by 鍒跺崟鏃ユ湡 desc";
+ sql = "select * from h_v_Gy_getCusBarCodeBillList_Query order by 鍒跺崟鏃ユ湡 desc";
ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
}
else
{
- sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
+ sql = "select * from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc";
ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
}
@@ -8101,6 +8160,497 @@
}
}
#endregion
+
+ #region 瀹㈡埛鏉＄爜鎵弿璁板綍鍗� 缁存姢鍒楄〃-鏉＄爜鍒楄〃
+
+ /// <summary>
+ /// 杩斿洖缁勬墭鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_getCusBarCodeBill_rushedBarCodeList_CodeList")]
+ [HttpGet]
+ public object Gy_getCusBarCodeBill_rushedBarCodeList_CodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "select * from Gy_getCusBarCodeBill_Temp where HBillNo = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by HDate desc";
+ ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBill_Temp");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗�
+ #region 鎵爜楠岃瘉鍗� 鎵爜鐗╂枡鏉＄爜
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushBarCode")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID, string HBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_rushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HMaker + "'," + HStockOrgID + ",'" + HBarCode + "'";
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_rushBarCode");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛佸師鍥狅細鎵爜鏉＄爜閿欒锛岃瀵绘壘IT浜哄憳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 杩斿洖鎵弿鏉＄爜鍒楄〃淇℃伅
+ [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "select * from h_v_Gy_BarCodeConfirmBillTempList_singleBill " +
+ "where HInterID = " + HInterID + " and 鍗曟嵁鍙� = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by 鎵爜鏃堕棿 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillTempList_singleBill");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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("WEBSController/Gy_BarCodeConfirmBill_DeleteRushedBarCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_DeleteRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ string sql = "delete from Gy_BarCodeConfirmBillTempList " +
+ "where HInterID = " + HInterID + "" +
+ " and HBillNo = '" + HBillNo + "'" +
+ " and HBillType = '" + HBillType + "'" +
+ " and HStockOrgID = " + HStockOrgID + "" +
+ " and HBarCode = '" + HBarCode + "'";
+ oCn.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 杩斿洖缂撳瓨鍒楄〃淇℃伅
+ [Route("WEBSController/Gy_BarCodeConfirmBill_TempList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_TempList(string HBillType, string HMaker, long HStockOrgID)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_TempList '" + HBillType + "','" + HMaker + "'," + HStockOrgID;
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_TempList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁缂撳瓨璁板綍鏌ヨ澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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("WEBSController/Gy_BarCodeConfirmBill_DeleteTempListNote")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_DeleteTempListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒犻櫎鍓嶆帶鍒�============================================================================================================================
+ string sql_beforeDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql_beforeDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細鍒犻櫎鍓嶆帶鍒跺け璐ワ紝璇峰鎵剧綉缁滅鐞嗕汉鍛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=============================================================================================================================================
+
+ //寮�鍚簨鍔�
+ oCn.BeginTran();
+
+ string sql = "delete from Gy_BarCodeConfirmBillTempList where " +
+ " HInterID = " + HInterID + "" +
+ " and HBillNo = '" + HBillNo + "'" +
+ " and HBillType = '" + HBillType + "'" +
+ " and HStockOrgID = " + HStockOrgID + "";
+ oCn.RunProc(sql);
+
+ //鍒犻櫎鍚庢帶鍒�============================================================================================================================
+ string sql_afterDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql_afterDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細鍒犻櫎鍚庢帶鍒跺け璐ワ紝璇峰鎵剧綉缁滅鐞嗕汉鍛�";
+ objJsonResult.data = null;
+
+ oCn.RollBack();
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+
+ oCn.RollBack();
+ return objJsonResult;
+ }
+ //=============================================================================================================================================
+
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵爜楠岃瘉鍗� 缁存姢鍒楄〃
+
+ /// <summary>
+ /// 杩斿洖缁勬墭缂撳瓨鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/Gy_BarCodeConfirmBillList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBillList(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ string sql = "";
+
+ if (sWhere == null || sWhere == "")
+ {
+ sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query order by 鏃ユ湡 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query where 1=1 " + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
+ }
+
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "1";
+ 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("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "select * from Gy_BarCodeConfirmBillTempList where HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and HSourceBillType = '" + HSourceBillType + "' and HStockOrgID = " + HOrgID + " Order by HMakeDate desc";
+ ds = oCn.RunProcReturn(sql, "Gy_BarCodeConfirmBillTempList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList")]
+ [HttpGet]
+ public object Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
+ {
+ try
+ {
+ string sql = "exec h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList " + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillType + "'," + HOrgID;
+ ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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
#endregion
}
}
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 2cdb5c3..ae7824f 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -16,9 +16,17 @@
/// </summary>
public static string Login()
{
- var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
- var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
- var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
+ //浠嶤鐩橀厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
+ var useName = Pub_Class.ClsPub.sCLOUDUseName;
+ var pwd = Pub_Class.ClsPub.sCLOUDPsd;
+ var dbId = Pub_Class.ClsPub.sCLOUDAcc;
+ CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;
+
+ //鍘熶粠Config/kdapi.config妯″潡涓幏鍙� 20240712灞忚斀
+ //var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+ //var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+ //var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
HttpClient httpClient = new HttpClient();
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
@@ -215,6 +223,9 @@
return httpClient.SyncRequest();
}
+ /// <summary>
+ /// 鍗曟嵁鏌ヨ
+ /// </summary>
public static string Query(string formId, string content)
{
HttpClient httpClient = new HttpClient();
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index 2403f43..9250916 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>x86</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index d047fca..5979b7e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,10 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>12/05/2022 15:40:12</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -81,7 +84,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -115,7 +118,7 @@
<publishTime>07/12/2024 08:46:30</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>09/07/2014 18:39:38</publishTime>
@@ -214,8 +217,14 @@
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
<publishTime>09/19/2018 03:38:10</publishTime>
@@ -251,7 +260,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -306,58 +315,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/15/2024 12:55:43</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/15/2024 12:55:43</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/15/2024 12:55:43</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/15/2024 12:55:43</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/15/2024 12:55:44</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -366,7 +375,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -375,121 +384,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>04/15/2024 12:55:47</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/15/2024 12:55:45</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>06/25/2024 12:46:38</publishTime>
+ <publishTime>06/25/2024 13:29:13</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/15/2024 12:55:46</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>04/29/2024 08:30:03</publishTime>
+ <publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 9a55b72..2b3ce21 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index af8fee9..72fc43d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -573,6 +573,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_UnitConvertRateController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowProgressBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
--
Gitblit v1.9.1