From 7cdf8be6367a3fc0e3874aed9d982f36d5952f5d Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期六, 08 十一月 2025 15:37:55 +0800
Subject: [PATCH] 条码交易，生产入库
---
WebApi/GS.QC/Service/FqcItemsManager.cs | 351 ---------------------------------------------------------
1 files changed, 4 insertions(+), 347 deletions(-)
diff --git a/WebApi/GS.QC/Service/FqcItemsManager.cs b/WebApi/GS.QC/Service/FqcItemsManager.cs
index 9d0d4a5..fa7c3d7 100644
--- a/WebApi/GS.QC/Service/FqcItemsManager.cs
+++ b/WebApi/GS.QC/Service/FqcItemsManager.cs
@@ -104,7 +104,7 @@
try
{
// 鏌ヨ涓昏〃鏁版嵁
- string sqlMain = $"SELECT A.*,B.Name as OrgName FROM MES_FQC_ITEMS A LEFT JOIN SYS_ORGANIZATION b ON A.OrgId = b.FID WHERE a.GUID='{guid}'";
+ string sqlMain = $"SELECT A.*,B.Name as OrgName,C.staff_name AS JY_NAME FROM MES_FQC_ITEMS A LEFT JOIN SYS_ORGANIZATION b ON A.OrgId = b.FID LEFT JOIN MES_STAFF C ON C.staff_no = A.JY_USER WHERE a.GUID='{guid}'";
var dsMain = DbHelperSQL.Query(sqlMain);
if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
@@ -239,8 +239,10 @@
+ m.RPB017 + _split
+ m.RPB018 + _split
+ m.RPB019 + _split
+ + m.RPB020 + _split
+ m.Remark + _split
- + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
+ + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString()) + _split
+ + m.Seq;
if (_sb1.Length > 0)
_sb1.Append("~");
_sb1.Append(_line);
@@ -470,350 +472,5 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
-
- /// <summary>
- /// IQC妫�楠屾姤琛�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetIQCMX([FromBody] dynamic model)
- {
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- };
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("report_iqcjd", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
-
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetIQCMXDetail([FromBody] dynamic model)
- {
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
-
- string yf = model.yf;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@yf", yf),
- new("@inQueryWhere", keyWhere)
- };
- try
- {
- var dsMain = DbHelperSQL.RunProcedure("report_iqcjdDetail", parameters, "0");
- if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
- {
-
- m.list = dsMain.Tables[0].TableToDynamicList();
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
- }
-
- /// <summary>
- /// IPQCSJ妫�楠屾姤琛�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetIPQCSJMX([FromBody] dynamic model)
- {
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- };
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("report_ipqcsjjd", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
-
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetIPQCSJMXDetail([FromBody] dynamic model)
- {
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
-
- string yf = model.yf;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@yf", yf),
- new("@inQueryWhere", keyWhere)
- };
- try
- {
- var dsMain = DbHelperSQL.RunProcedure("report_ipqcsjjdDetail", parameters, "0");
- if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
- {
-
- m.list = dsMain.Tables[0].TableToDynamicList();
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
- }
-
- /// <summary>
- /// IPQCXJ妫�楠屾姤琛�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetIPQCXJMX([FromBody] dynamic model)
- {
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- };
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("report_ipqcxjjd", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
-
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetIPQCXJMXDetail([FromBody] dynamic model)
- {
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
-
- string yf = model.yf;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@yf", yf),
- new("@inQueryWhere", keyWhere)
- };
- try
- {
- var dsMain = DbHelperSQL.RunProcedure("report_ipqcxjjdDetail", parameters, "0");
- if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
- {
-
- m.list = dsMain.Tables[0].TableToDynamicList();
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
- }
-
- /// <summary>
- /// FQC妫�楠屾姤琛�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetFQCMX([FromBody] dynamic model)
- {
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- };
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("report_fqcjd", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
- }
-
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetFQCMXDetail([FromBody] dynamic model)
- {
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
-
- string yf = model.yf;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
- new("@yf", yf),
- new("@inQueryWhere", keyWhere)
- };
- try
- {
- var dsMain = DbHelperSQL.RunProcedure("report_fqcjdDetail", parameters, "0");
- if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
- {
-
- m.list = dsMain.Tables[0].TableToDynamicList();
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
- }
-
}
}
--
Gitblit v1.9.3