From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删除； 生产资源新增模块增加 负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表） 网格选中行， 背景行 浅蓝色 显示；（优先改 生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）
---
WebAPI/Service/YqnDal.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Service/YqnDal.cs b/WebAPI/Service/YqnDal.cs
index 3576bf2..06fe816 100644
--- a/WebAPI/Service/YqnDal.cs
+++ b/WebAPI/Service/YqnDal.cs
@@ -19,7 +19,7 @@
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' ");
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
sqlBuilder.Append(" and HProcID=@hProcID");
var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo,hProcID });
return model;
@@ -34,7 +34,7 @@
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') ");
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
sqlBuilder.Append(" and HProcID=@hProcID");
var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo, hProcID });
return model;
@@ -47,7 +47,7 @@
public static List<Models.M_StationBillMail> GetStationInBillMailList(string icBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
- sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HICMOBillNo=@icBillNo");
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HProcExchBillNo=@icBillNo");
var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
return list;
}
@@ -59,7 +59,7 @@
public static List<Models.M_StationBillMail> GetStationOutBillMailList(string icBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
- sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HICMOBillNo=@icBillNo");
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HProcExchBillNo=@icBillNo");
var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
return list;
}
--
Gitblit v1.9.1