From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/DLL/BLL/ProductModelBLL.cs | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 31 deletions(-)
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index e73f65c..b4e5e22 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Web;
using VueWebApi.DLL.DAL;
@@ -77,16 +78,16 @@
#endregion
#region[瀛樿揣妗ｆ鏌ヨ]
- public static ToMessage InventoryFileSelect(string partcode, string partname, string partspec, string stocktypecode, string materialtypecode, string storehousecode, int startNum, int endNum, string prop, string order)
+ public static ToMessage InventoryFileSelect(string stu_torgcode,string stu_torgtypecode, string partcode, string partname, string partspec, string stocktypecode, string materialtypecode, string storehousecode, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.InventoryFileSelect(partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode, startNum, endNum, prop, order);
+ return ProductModelDAL.InventoryFileSelect(stu_torgcode, stu_torgtypecode,partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode, startNum, endNum, prop, order);
}
#endregion
#region[瀛樿揣妗ｆ鏂板缂栬緫]
- public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty, string username, string operType)
+ public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
{
- return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, username, operType);
+ return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty, is_batchno, is_fifo, is_incheck, is_outcheck, username, operType);
}
#endregion
@@ -98,32 +99,70 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage InventoryFileAssociationRoute(string partcode)
+ public static ToMessage InventoryFileAssociationRoute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
- return ProductModelDAL.InventoryFileAssociationRoute(partcode);
+ return ProductModelDAL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
}
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
- public static ToMessage SaveInventoryFile(string partcode,string username, List<ObjectData> json)
+ public static ToMessage SaveInventoryFile(string stu_torgcode,string stu_torgtypecode,string partcode,string defaultroute_code, string username, List<PartRout> json)
{
- return ProductModelDAL.SaveInventoryFile(partcode, username, json);
+ return ProductModelDAL.SaveInventoryFile(stu_torgcode, stu_torgtypecode,partcode, defaultroute_code, username, json);
}
#endregion
- #region[宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛]
- public static ToMessage RouteSelect()
+ #region[鐗╂枡娓呭崟涓诲垪琛ㄦ煡璇
+ public static ToMessage BoIventorySelect(string parentpartcode, string parentpartname,string parentpartspec,string parttype, string status, string version, string createusername, string createopendate, string createclosedate, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.RouteSearch();
+ return ProductModelDAL.BoIventorySelect(parentpartcode, parentpartname, parentpartspec, parttype, status, version, createusername, createopendate, createclosedate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鏂板鏃惰幏鍙栨渶澶х増鏈彿]
+ public static ToMessage MaterielDetailedVsion(string parentpartcode)
+ {
+ return ProductModelDAL.MaterielDetailedVsion(parentpartcode);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鏂板/缂栬緫鎻愪氦]
+ public static ToMessage AddUpdateBoIventory(string bomid,string parentpartcode, string parentpartname, string parentpartspec, string status, string uomcode, string quantity, string startdate, string version, string username, string opertype, List<BomSub> objs)
+ {
+ return ProductModelDAL.AddUpdateBoIventory(bomid,parentpartcode, parentpartname, parentpartspec, status, uomcode, quantity, startdate, version, username, opertype, objs);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟缂栬緫鏄剧ず鍙婇瑙圿
+ public static ToMessage BoIventorySelectView(string bomid)
+ {
+ return ProductModelDAL.BoIventorySelectView(bomid);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鍒犻櫎]
+ public static ToMessage DeleteBoIventory(string bomid)
+ {
+ return ProductModelDAL.DeleteBoIventory(bomid);
+ }
+ #endregion
+
+
+
+
+ #region[宸ュ簭涓嬫媺鏌ヨ鎺ュ彛]
+ public static ToMessage StepSelect(string WorkShop)
+ {
+ return ProductModelDAL.StepSelect(WorkShop);
}
#endregion
#region[宸ヨ壓璺嚎鏌ヨ]
- public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage RouteSearch(string stu_torgcode,string stu_torgtypecode, string WorkShop,string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ return ProductModelDAL.RouteSearch(stu_torgcode,stu_torgtypecode,WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
}
#endregion
@@ -148,19 +187,33 @@
}
#endregion
+ #region[宸ヨ壓璺嚎鍏宠仈浜у搧鏌ヨ]
+ public static ToMessage RputeInventorySearch(string stu_torgcode, string stu_torgtypecode, string partcode, string partname, string partspec, string stocktypecode, string materialtypecode, string storehousecode)
+ {
+ return ProductModelDAL.RputeInventorySearch(stu_torgcode, stu_torgtypecode, partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鎵归噺鎸囧畾鐗╂枡淇濆瓨]
+ public static ToMessage RouteBatchPartSave(string stu_torgcode, string stu_torgtypecode, string username, string routecode, string[] rolebatchpartcode)
+ {
+ return ProductModelDAL.RouteBatchPartSave(stu_torgcode, stu_torgtypecode, username, routecode, rolebatchpartcode);
+ }
+ #endregion
+
#region[宸ュ簭鏌ヨ]
- public static ToMessage StepSearch(string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSearch(string stu_torgcode,string stu_torgtypecode,string WorkShop, string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
+ return ProductModelDAL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
}
#endregion
#region[宸ュ簭鏂板缂栬緫]
- public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
+ public static ToMessage AddUpdateStep(string stepid,string WorkShop, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
{
- return ProductModelDAL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, operType);
+ return ProductModelDAL.AddUpdateStep(stepid, WorkShop, stepcode, stepname, steptypecode, enable, description, username, operType);
}
#endregion
@@ -172,30 +225,30 @@
#endregion
#region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
- public static ToMessage StepAssociationEqp(string stepcode)
+ public static ToMessage StepAssociationEqp(string WorkShop, string stepcode)
{
- return ProductModelDAL.StepAssociationEqp(stepcode);
+ return ProductModelDAL.StepAssociationEqp(WorkShop,stepcode);
}
#endregion
#region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
- public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationEqp(string WorkShop,string stepcode, string username, List<ObjectData> json)
{
- return ProductModelDAL.SaveStepAssociationEqp(stepcode,username,json);
+ return ProductModelDAL.SaveStepAssociationEqp(WorkShop,stepcode, username,json);
}
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鏌ヨ]
- public static ToMessage StepAssociationDefect(string stepcode)
+ public static ToMessage StepAssociationDefect(string WorkShop, string stepcode)
{
- return ProductModelDAL.StepAssociationDefect(stepcode);
+ return ProductModelDAL.StepAssociationDefect(WorkShop,stepcode);
}
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鎻愪氦]
- public static ToMessage SaveStepAssociationDefect(string stepcode, string username, List<ObjectData> json)
+ public static ToMessage SaveStepAssociationDefect(string WorkShop, string stepcode, string username, List<ObjectData> json)
{
- return ProductModelDAL.SaveStepAssociationDefect(stepcode,username,json);
+ return ProductModelDAL.SaveStepAssociationDefect(WorkShop,stepcode, username,json);
}
#endregion
@@ -211,9 +264,9 @@
#endregion
#region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺妗哴
- public static ToMessage PartSelectRpute(string partcode)
+ public static ToMessage PartSelectRpute(string stu_torgcode,string stu_torgtypecode,string partcode)
{
- return ProductModelDAL.PartSelectRpute(partcode);
+ return ProductModelDAL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
}
#endregion
@@ -232,16 +285,16 @@
#endregion
#region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
- public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode,string steptype, int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.StepSelectEqpList(partcode, routecode, stepcode, startNum, endNum, prop, order);
+ return ProductModelDAL.StepSelectEqpList(partcode, routecode, stepcode, steptype, startNum, endNum, prop, order);
}
#endregion
#region[鑺傛媿宸ヤ环鏌ヨ]
- public static ToMessage BeatRateSearch(string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
+ public static ToMessage BeatRateSearch(string stu_torgcode,string stu_torgtypecode,string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ return ProductModelDAL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
}
#endregion
--
Gitblit v1.9.3