From 8db52b8517da26b8fc79f66241727b9076aa9677 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 07 十二月 2022 11:08:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockStatusBillController.cs | 50 ++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 10 ++
WebAPI/Controllers/基础资料/基础资料/Gy_RecConditionBillController.cs | 50 ++++++++++++
WebAPI/Controllers/基础资料/基础资料/Gy_TaxRateBillController.cs | 56 +++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 1
WebAPI/Controllers/基础资料/基础资料/Gy_PaymentConditionListBillController.cs | 50 ++++++++++++
6 files changed, 214 insertions(+), 3 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index b56d9e9..20d8bb9 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1176,6 +1176,11 @@
{
omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //是否为私有云模式
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_CloudMode")
+ {
+ omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//桌面条码模块
//有源单生成条码，生成条码数量可否超源单数量控制
@@ -2519,6 +2524,11 @@
{
omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //是否为私有云模式
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_CloudMode")
+ {
+ omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//桌面条码模块
//有源单生成条码，生成条码数量可否超源单数量控制
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index fea6760..1bc7ac6 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -316,6 +316,7 @@
public string WMS_OneScanMode; //一次扫码模式
public string WMS_UserByOrgRelation; //扫码枪用户登入时判断用户对应组织权限控制，Y为控制
public string WMS_MouldManagerCtl; //是否启用器具管理(Y,N)
+ public string WMS_CloudMode; //是否为私有云模式
//桌面条码模块
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_PaymentConditionListBillController.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_PaymentConditionListBillController.cs"
index 585b001..08405ee 100644
--- "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_PaymentConditionListBillController.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_PaymentConditionListBillController.cs"
@@ -341,5 +341,55 @@
}
}
#endregion
+
+ #region 浠樻鏉′欢 閲戣澏鍚屾
+ [Route("Gy_PaymentCondition/SaveGy_PaymentConditionListApi")]
+ [HttpPost]
+ public object SaveGy_PaymentConditionListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_PaymentCondition_Model> lsmain = new List<Model.ClsGy_PaymentCondition_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_PaymentCondition(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_PaymentCondition where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_PaymentCondition on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_PaymentCondition(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_PaymentCondition off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
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_RecConditionBillController.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_RecConditionBillController.cs"
index 3b04503..88a487c 100644
--- "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_RecConditionBillController.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_RecConditionBillController.cs"
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 鏀舵鏉′欢 閲戣澏鍚屾
+ [Route("Gy_RecCondition/SaveGy_RecConditionListApi")]
+ [HttpPost]
+ public object SaveGy_RecConditionListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_RecCondition_Model> lsmain = new List<Model.ClsGy_RecCondition_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_RecCondition(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_RecCondition where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_RecCondition on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_RecCondition(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_RecCondition off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
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_StockStatusBillController.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_StockStatusBillController.cs"
index 186748c..3951971 100644
--- "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_StockStatusBillController.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_StockStatusBillController.cs"
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 搴撳瓨鐘舵�� 閲戣澏鍚屾
+ [Route("Gy_StockStatus/SaveGy_StockStatusListApi")]
+ [HttpPost]
+ public object SaveGy_StockStatusListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_StockStatus_Model> lsmain = new List<Model.ClsGy_StockStatus_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_StockStatus(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_StockStatus where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_StockStatus on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_StockStatus(HItemID,HNumber,HName ,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_StockStatus off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
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_TaxRateBillController.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_TaxRateBillController.cs"
index 56dce91..69465ca 100644
--- "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_TaxRateBillController.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_TaxRateBillController.cs"
@@ -17,7 +17,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- #region 浠樻鏉′欢 鍒楄〃
+ #region 绋庣巼 鍒楄〃
[Route("Gy_TaxRateBill/Gy_TaxRateList")]
[HttpGet]
public object Gy_TaxRateList(string sWhere, string user, string Organization)
@@ -65,7 +65,7 @@
}
#endregion
- #region 浠樻鏉′欢 缂栬緫
+ #region 绋庣巼 缂栬緫
[Route("Gy_TaxRateBill/Gy_TaxRateEdit")]
[HttpPost]
public object Gy_TaxRateEdit([FromBody] JObject msg)
@@ -276,7 +276,7 @@
}
#endregion
- #region 浠樻鏉′欢 鍒犻櫎
+ #region 绋庣巼 鍒犻櫎
[Route("Gy_TaxRateBill/Delete")]
[HttpGet]
public object Delete(string HItemID, string user)
@@ -342,5 +342,55 @@
}
}
#endregion
+
+ #region 绋庣巼 閲戣澏鍚屾
+ [Route("Gy_TaxRate/SaveGy_TaxRateListApi")]
+ [HttpPost]
+ public object SaveGy_TaxRateListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["model"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ List<Model.ClsGy_TaxRate_Model> lsmain = new List<Model.ClsGy_TaxRate_Model>();
+ lsmain = oListModels.getObjectByJson_Gy_TaxRate(_value);
+ string sql = string.Empty;
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_TaxRate where HItemID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_TaxRate on";
+ oCN.RunProc(sql);
+
+ oCN.RunProc($@"insert into Gy_TaxRate(HItemID,HNumber,HName ,HTaxRate,HShortNumber ,HParentID ,HLevel
+ ,HEndFlag ,HStopflag ,HRemark ,HHelpCode ,HUseFlag
+ ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp
+ ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID)
+ values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}',{lsmain[0].HTaxRate},'{lsmain[0].HShortNumber}',{lsmain[0].HParentID},{lsmain[0].HLevel}
+ ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HUseFlag}'
+ ,'{lsmain[0].HMakeTime}','{lsmain[0].HMakeEmp}','{lsmain[0].HCheckEmp}','{lsmain[0].HCheckTime}','{lsmain[0].HModifyEmp}'
+ ,'{lsmain[0].HModifyTime}','{lsmain[0].HStopEmp}',null,{lsmain[0].HUSEORGID},{lsmain[0].HCREATEORGID})", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_TaxRate off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1