From d3eba0b9983d527a930f2d727610b8341db79e6c Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 06 三月 2026 11:17:20 +0800
Subject: [PATCH] 增加工序字段
---
Model/基础资料/基础资料/ClsGy_CostAverageTypeSub_Model.cs | 1
WebAPI/Controllers/ZWDBController.cs | 128 ++++++++++++++++++++++++++++++++++++++++++
DAL/基础资料/公用基础资料/ClsGy_CostAverageType_Ctl.cs | 10 ++-
WebAPI/WebAPI.csproj | 4
4 files changed, 137 insertions(+), 6 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostAverageType_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostAverageType_Ctl.cs"
index a7b8828..f3740ec 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostAverageType_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_CostAverageType_Ctl.cs"
@@ -46,7 +46,7 @@
string subSql = "insert into Gy_CostAverageTypeSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HWeight,HMaterTypeID" + ")" +
+ ",HWeight,HMaterTypeID,HProcID" + ")" +
" values(" +
HInterID + "," +
(oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
@@ -54,7 +54,8 @@
(oSub.HSourceEntryID != null && oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
(oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
(oSub.HWeight != null && oSub.HWeight != 0 ? oSub.HWeight.ToString() : "0") + "," +
- (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") +
+ (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") + ","+
+ (oSub.HProcID != null && oSub.HProcID != 0 ? oSub.HProcID.ToString() : "0") +
")";
oCn.RunProc(subSql);
@@ -112,7 +113,7 @@
string subSql = "insert into Gy_CostAverageTypeSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HWeight,HMaterTypeID" + ")" +
+ ",HWeight,HMaterTypeID,HProcID" + ")" +
" values(" +
oModel.HItemID + "," +
(oSub.HEntryID != null ? oSub.HEntryID.ToString() : "0") + "," +
@@ -120,7 +121,8 @@
(oSub.HSourceEntryID != null && oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
(oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
(oSub.HWeight != null && oSub.HWeight != 0 ? oSub.HWeight.ToString() : "0") + "," +
- (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") +
+ (oSub.HMaterTypeID != null && oSub.HMaterTypeID != 0 ? oSub.HMaterTypeID.ToString() : "0") + "," +
+ (oSub.HProcID != null && oSub.HProcID != 0 ? oSub.HProcID.ToString() : "0") +
")";
oCn.RunProc(subSql);
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_CostAverageTypeSub_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_CostAverageTypeSub_Model.cs"
index 16d8a0c..1fc2f64 100644
--- "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_CostAverageTypeSub_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_CostAverageTypeSub_Model.cs"
@@ -8,6 +8,7 @@
{
public int HWeight; //quanzhong
public int HMaterTypeID; //物料类型
+ public int HProcID; //物料类型
}
}
diff --git a/WebAPI/Controllers/ZWDBController.cs b/WebAPI/Controllers/ZWDBController.cs
new file mode 100644
index 0000000..6725600
--- /dev/null
+++ b/WebAPI/Controllers/ZWDBController.cs
@@ -0,0 +1,128 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Pub_Class;
+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 ZWDBController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ // GET: ZWDB
+ [Route("ZWDBController/GetLIST")]
+ public object GetLIST(string user,int OrgIDs)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ DataSet ds = oCn.RunProcReturn("select * from h_v_ZWDB where 1=1 order by HItemID desc", "h_v_ZWDB");
+ 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 ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ [Route("ZWDBController/insertTODOS")]
+ [HttpGet]
+ public object insertTODOS(string contents, string user)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ oCn.BeginTran();
+ if (contents == "" || contents == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCn.RunProc($"INSERT INTO [Gy_ZWDB] ( [HDate], [HMaker], [HMakeDate], [contents], [IsBan], [IsUsed], [IsEdit], [HUSEORGID]) VALUES ( '{DateTime.Now}', '{user}', '{DateTime.Now}', '{contents}', 0, 1, 1, 100038);");
+
+ oCn.Commit();
+ DataSet ds = oCn.RunProcReturn("select MAX(HItemID) HItemID from Gy_ZWDB ", "Gy_ZWDB");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ [Route("ZWDBController/deleteTODOS")]
+ [HttpGet]
+ public object deleteTODOS( string user,int HID)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ oCn.BeginTran();
+ if ( HID == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCn.RunProc($"UPDATE Gy_ZWDB set IsUsed=0 where HItemID='{HID}'");
+ oCn.Commit();
+ DataSet ds = oCn.RunProcReturn("select MAX(HItemID) HItemID from Gy_ZWDB ", "Gy_ZWDB");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e9faa2b..dd1b136 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -408,10 +408,8 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
- <Compile Include="App_Start\Startup.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
- <Compile Include="App_Start\WebSocketHub.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
@@ -524,6 +522,7 @@
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
+ <Compile Include="Controllers\ZWDBController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Sc_PackUnionBillMain_SettoPackingController.cs" />
@@ -1400,6 +1399,7 @@
<Folder Include="Views\Xt_CheckFlowBill\" />
<Folder Include="Views\Xt_CheckItem\" />
<Folder Include="Views\Xt_grdAlignment_WMES\" />
+ <Folder Include="Views\ZWDB\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
--
Gitblit v1.9.1