From 376bb6cf439eaa3b2867825fe22a14e381dd9213 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 14 八月 2024 17:55:48 +0800
Subject: [PATCH] 1.新增工序找设备(工位)接口 2.新增物料清单查询、新增、修改接口
---
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index 07182b6..726b5fc 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.Models;
using VueWebCoreApi.Models.UnitMaterial;
+using VueWebCoreApi.Models.WorkData;
using VueWebCoreApi.Tools;
namespace VueWebCoreApi.DLL.DAL
@@ -21,7 +22,7 @@
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
public static dynamic CompanyCode = AppSetting.GetAppSetting("CompanyCode");
public static dynamic CompanyName = AppSetting.GetAppSetting("CompanyName");
-
+
#region[缁勭粐鏋舵瀯绫诲瀷璧勬枡]
public static ToMessage TOrganTypeDate()
@@ -511,7 +512,7 @@
var data0 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data0.Rows.Count; j++)
{
- LocationData locat = new LocationData();
+ LocationData locat = new LocationData();
locat.value = data0.Rows[j]["code"].ToString();
locat.text = data0.Rows[j]["name"].ToString();
warhouse.children.Add(locat);
@@ -571,6 +572,68 @@
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭璁惧鍩虹璧勬枡]
+ public static ToMessage StepEqpData()
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鏌ユ壘宸ュ簭淇℃伅
+ sql = @"select '' as id,'' as wo_code,'' as seq,S.stepcode as step_code,T.stepname,T.flwtype,'0' as unprice,'0' as produceq_qty,
+ '0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty,'0' as delive_qty,'' as isbott,'' as isend
+ from TStep S
+ left join TStep T on S.stepcode=T.stepcode";
+ var parents = DapperHelper.selectdatalist<WorkRouteStepEqp>(sql);
+ //鑾峰彇宸ュ簭瀵瑰簲璁惧淇℃伅
+ for (int i = 0; i < parents.Count; i++)
+ {
+ if (parents[i].flwtype == "Z")
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲璁惧淇℃伅
+ sql = @"select R.eqp_code,E.name as eqp_name,'N' as enable,'0' as unprice,
+ '0' as produceq_qty, '0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty
+ from TFlw_Rteqp R
+ left join TEqpInfo E on R.eqp_code=E.code
+ where R.step_code=@step_code and R.style=@style";
+ dynamicParams.Add("@step_code", parents[i].step_code);
+ dynamicParams.Add("@style", "E"); //璁惧
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ else
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲澶栧崗渚涘簲鍟嗕俊鎭�
+ sql = @"select R.eqp_code,E.name as eqp_name,'N' as enable,'0' as unprice,
+ '0' as produceq_qty, '0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty
+ from TFlw_Rteqp R
+ inner join TCustomer E on R.eqp_code=E.code
+ where R.step_code=@step_code and R.style=@style";
+ dynamicParams.Add("@step_code", parents[i].step_code);
+ dynamicParams.Add("@style", parents[i].flwtype);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ }
+
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.count = parents.Count;
+ mes.data = parents;
+ mes.message = "鏌ヨ鎴愬姛!";
}
catch (Exception e)
{
@@ -689,7 +752,7 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"WITH RecursiveCTE AS (
+ sql = @"WITH RecursiveCTE AS (
SELECT code, name, idparent
FROM TMateriel_Class
WHERE code in(select distinct idinventoryclass from TMateriel_Info where status='0')
--
Gitblit v1.9.3