From 6480e23ba58038f5522ec4f91cc4ede4a6732820 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 12 十二月 2022 16:51:30 +0800
Subject: [PATCH] 提交
---
WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs | 84 ++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 27 +++++++-
WebAPI/Models/基础资料/Warehouse.cs | 1
WebAPI/Models/基础资料/Gy_StockPlace.cs | 34 +++++++++++
5 files changed, 143 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
new file mode 100644
index 0000000..a70b248
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
@@ -0,0 +1,84 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Gy_ICBomBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ [Route("Gy_ICBomBill/Gy_ICBomBillaveApi")]
+ [HttpPost]
+ public object Gy_ICBomBillaveApi([FromBody] JObject oMain)
+ {
+ try
+ {
+ var model = oMain["model"].ToString();
+ var subModel = oMain["model"]["HENTRY"].ToString();
+ //鍙嶅簭鍒楀寲
+ model = "[" + model + "]";
+ List<Model.ClsGy_ICBomBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillMain>>(model);
+ List<Model.ClsGy_ICBomBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ICBomBillSub>>(subModel);
+ string sql = string.Empty;
+ oCN.BeginTran();
+ sql = $"delete Gy_ICBomBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Gy_ICBomBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ oCN.RunProc("Insert Into Gy_ICBomBillMain " +
+ "(HBillType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HMaterTypeID,HStatus" +
+ ",HMaterID,HParentID,HVersion,HPicNo,HPropertyID" +
+ ",HUnitID,HQty,HProdRate,HJump" +
+ ") " +
+ " values('" + mainList[0].HBillType + "'," + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'" +
+ "," + mainList[0].HYear.ToString() + "," + mainList[0].HPeriod.ToString() + ",'" + mainList[0].HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + mainList[0].HMaterTypeID.ToString() + "','" + mainList[0].HStatus +
+ "','" + mainList[0].HMaterID.ToString() + "'," + mainList[0].HParentID.ToString() + ",'" + mainList[0].HVersion + "','" + mainList[0].HPicNo + "'," + mainList[0].HPropertyID.ToString() +
+ "," + mainList[0].HUnitID.ToString() + "," + mainList[0].HQty.ToString() + "," + mainList[0].HProdRate.ToString() + ",'" + mainList[0].HJump + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_ICBomBillSub oSub in subList)
+ {
+ oCN.RunProc("Insert into Gy_ICBomBillSub " +
+ " (HInterID,HEntryID,HMaterID,HRemark2" +
+ ",HQty,HUnitID,HRemark3,HRelQty,HWasteRate" +
+ ",HProcID,HWhID,HRemark4,HChildType," +
+ "HCloseMan,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HRemark2 + "'" +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HRemark3 + "'," + oSub.HRelQty.ToString() + "," + oSub.HWasteRate.ToString() +
+ "," + oSub.HProcID.ToString() + "," + oSub.HWhID.ToString() + ",'" + oSub.HRemark4 + "','" + oSub.HChildType.ToString() + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ 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 = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 4cfa986..9003f13 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -407,11 +407,13 @@
{
try
{
- var _value = msg["model"].ToString();
+ var model = msg["model"].ToString();
+ var stockplaceModel = msg["model"]["HStockplaceEntry"].ToString();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鍙嶅簭鍒楀寲
- _value = "[" + _value.ToString() + "]";
- List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(_value);
+ model = "[" + model.ToString() + "]";
+ List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(model);//浠撳簱
+ List<Gy_StockPlace> stockplaceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_StockPlace>>(stockplaceModel);//浠撲綅
string sql = string.Empty;
//DataTable dt = DataHelper.ListToDataTable<Warehouse>(list);
//oCN.SqlBulkCopyByDatatable("Gy_Warehouse", dt);
@@ -423,11 +425,25 @@
oCN.RunProc(sql);
oCN.RunProc("Insert into Gy_Warehouse " +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HCREATEORGID) " +
" Values('" + list[0].HItemID + "','" + list[0].HNumber + "','" +list[0].HName + "','" + list[0].HHelpCode + "','" + list[0].HShortNumber + "'," + list[0].HParentID.ToString() +
- "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "','" + list[0].HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Warehouse off";
+ oCN.RunProc(sql);
+ sql = $"delete gy_stockplace where HSPGroupID in ({list[0].HItemID})";
+ oCN.RunProc(sql);
+ sql = "set identity_insert gy_stockplace on";
+ oCN.RunProc(sql);
+ foreach (var item in stockplaceList)
+ {
+ oCN.RunProc("Insert into gy_stockplace " +
+ " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HSPGroupID,HSPType,HSrcSPType,HDesSPType) " +
+ " Values('" + item.HItemID + "','" + item.HNumber + "','" + item.HName + "','" + item.HHelpCode + "','" + item.HShortNumber + "'," + item.HParentID.ToString() +
+ "," + item.HLevel.ToString() + "," + Convert.ToString(item.HEndFlag ? 1 : 0) + "," + Convert.ToString(item.HStopFlag ? 1 : 0) + ",'" + item.HRemark + "','" + item.HUSEORGID + "','" + item.HCREATEORGID + "','" + item.HSPGroupID + "','" + item.HSPType + "','" + item.HSrcSPType + "','" + item.HDesSPType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ sql = "set identity_insert gy_stockplace off";
oCN.RunProc(sql);
oCN.Commit();
@@ -439,6 +455,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
new file mode 100644
index 0000000..e6ec201
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_StockPlace
+ {
+ public bool HEndFlag { get; set; }
+ public string HHelpCode { get; set; }
+ public long HItemID { get; set; }
+ public long HLevel { get; set; }
+ public string HName { get; set; }
+ public string HNumber { get; set; }
+ public long HParentID { get; set; }
+ public string HRemark { get; set; }
+ public string HShortNumber { get; set; }
+ public bool HStopFlag { get; set; }
+ public string HUseFlag { get; set; }
+ public Int64 HEmpID { get; set; }
+ public string HAddress { get; set; }
+ public string HPhone { get; set; }
+ public Int64 HSPGroupID { get; set; }
+ public string HBarCode { get; set; }
+ public Int64 HUSEORGID { get; set; }
+ public Int64 HCREATEORGID { get; set; }
+ public string HMaker { get; set; }
+ public string HUpDater { get; set; }
+ public string HSPType { get; set; }
+ public string HSrcSPType { get; set; }
+ public string HDesSPType { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
index f0af683..dc7fb1c 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
@@ -24,6 +24,7 @@
public Int64 HSPGroupID { get; set; }
public string HBarCode { get; set; }
public Int64 HUSEORGID { get; set; }
+ public Int64 HCREATEORGID { get; set; }
public string HMaker { get; set; }
public string HUpDater { get; set; }
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e8bc19a..6804fd4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -325,6 +325,7 @@
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
@@ -629,6 +630,7 @@
<Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
--
Gitblit v1.9.1