From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:25 +0800
Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑; 1.生产资源 有异常; 删除有问题,删除后出来 异常数据( ); 其他信息 里的 几个字段 输入 字符时 报错,应提示; 2.工序 : 9999的 转工序 , 有个 转工序 字段,是否没显示出来; 其他信息 里的 几个字段 输入 字符时 报错,应提示; 3.工作中心: 其他信息 里的 几个字段 输入 字符时 报错,应提示; 4.生产班组: 刷新出来 异常数据; 其他信息 里的 几个字段 输入 字符时 报错,应提示; 5.基础资料的 一些 复选框 标题不对; 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑; 7.工艺路线查询;工序号,工序代码,工序,工艺参数,表体备注, 其他的放后面 子表 的 委外标记 放到最后面去; 并且 把 供应商代码和供应商 放出来(也放在最后几个); 8.部门有 很多异常数据; 选择的时候 出来了; 9.流转卡维护, 表头 很多没有用的列,单据号 日期 都没有显示; 转工序 是否要打印(跟客户确认); 10. 流转卡拆分时,一些 列的 排序;
---
WebAPI/Service/ProcessDal.cs | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Service/ProcessDal.cs b/WebAPI/Service/ProcessDal.cs
index cfb4099..9d29638 100644
--- a/WebAPI/Service/ProcessDal.cs
+++ b/WebAPI/Service/ProcessDal.cs
@@ -9,28 +9,50 @@
{
public class ProcessDal
{
- public static List<Models.M_StationBillMail> GetProcessList(string hName,int hLevel,string hNumber,string hBillSubType)
+ public static List<Models.M_Process> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit,ref int pageCount)
{
- var sqlBuilder = new StringBuilder();
- sqlBuilder.Append("select a.HItemID,a.HNumber,a.HName ,a.HLevel,a.HTypeFlow ,a.HTypeCount ,a.HBillSubType ");
- sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice ");
- sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice ");
- sqlBuilder.Append(",a.HAutoTrunFlag,a.HRemark ,a.HProcessID_K3 from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where 1=1 ");
+
+ var whereBuilder = new StringBuilder();
if (!string.IsNullOrEmpty(hName))
- sqlBuilder.Append(" and a.HName like '%@hName%'");
+ whereBuilder.Append($" and a.HName like '%{hName}%'");
if(!string.IsNullOrEmpty(hNumber))
- sqlBuilder.Append(" and a.HNumbe like '%@hNumber%'");
+ whereBuilder.Append($" and a.HNumber like '%{hNumber}%'");
if (!string.IsNullOrEmpty(hBillSubType))
- sqlBuilder.Append(" and a.HBillSubType like '%@hBillSubType%'");
+ whereBuilder.Append($" and a.HBillSubType like '%{hBillSubType}%'");
if(hLevel!=0)
- sqlBuilder.Append(" and a.HLevel=@hLevel");
- var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { hName, hLevel, hNumber, hBillSubType });
+ whereBuilder.Append($" and a.HLevel={hLevel}");
+ var sqlBuilder = new StringBuilder();
+ sqlBuilder.Append($"select top {limit} a.HItemID,a.HNumber,a.HName ,a.HLevel,a.HTypeFlow ,a.HTypeCount ,a.HBillSubType ");
+ sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice ");
+ sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice ");
+ sqlBuilder.Append($",a.HAutoTrunFlag,a.HRemark ,a.HProcessID_K3 from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where a.HItemID not in (select top {(page-1)*limit} a.HItemID from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where 1=1 { whereBuilder }) {whereBuilder}");
+ var countSql = $"select count(*) from gy_Process a where 1=1 {whereBuilder}";
+ pageCount = SqlPools.GetInstance("YqnConn").GetExecuteScalar(countSql);
+ var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_Process>(sqlBuilder.ToString());
return list;
}
- public static Models.M_StationBillMail GetProcessDetail(int hItemID)
+ public static Models.M_Process GetProcessDetail(int hItemID)
{
var sql = "select HNumber,HHelpCode,HName,HNumber,HDeptID,HProcMulID,HRemark,HSNo,HFixPrice,HOverFixPrice,HBillSubType,HStopflag, HTypeFlow, HTypeCount, HAutoTrunFlag, HItemID from Gy_Process where HItemID=@hItemID";
- var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sql, new { hItemID });
+ var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_Process>(sql, new { hItemID });
+ return model;
+ }
+ public static int DeleteProcess(int hItemID)
+ {
+ var sql = "delete Gy_Process where HItemID=@hItemID";
+ var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sql, new { hItemID });
+ return result;
+ }
+ public static Models.M_Department GetDepartmentModel(int hItemID)
+ {
+ var sql = "select HName,HNumber,HItemID from h_v_IF_Department where HItemID=@hItemID";
+ var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_Department>(sql, new { hItemID });
+ return model;
+ }
+ public static Models.M_ProcMul GetProcMulModel(int hItemID)
+ {
+ var sql = "Select HItemID,HNumber,HName from Gy_ProcMul where HItemID=@hItemID";
+ var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_ProcMul>(sql, new { hItemID });
return model;
}
}
--
Gitblit v1.9.1