From 53dcf90a8fd45c769e419f82ea561aaeb8d1bbef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 31 五月 2024 13:13:13 +0800
Subject: [PATCH] 工序：新增/编辑 时,选着检验方案后,保存失败； 检验方案：回显分析方法、缺陷等级 、破坏性检验、重点检查； 工序检验单：选择抽样方案后关闭弹框； 产品器具清单：增加工序字段； 维修记录单维护：初始化日期； 维修验收单维护：列表 显示 验收项目 显示不对,编辑 时,子表 验收项目 回显 数据不对
---
DAL/ClsGy_MaterialMouldBillMain.cs | 10 ++++++----
Model/项目管理/ClsGy_MaterialMouldBillMain.cs | 1 +
WebAPI/Controllers/QC_ManagementController.cs | 6 ++++--
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 4 ++--
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/DAL/ClsGy_MaterialMouldBillMain.cs b/DAL/ClsGy_MaterialMouldBillMain.cs
index 8841048..51bb32b 100644
--- a/DAL/ClsGy_MaterialMouldBillMain.cs
+++ b/DAL/ClsGy_MaterialMouldBillMain.cs
@@ -53,7 +53,8 @@
"', HWorkCenterID = '" + omodel.HWorkCenterID +
"', HEquipID = '" + omodel.HEquipID +
"', HOrgID = '" + omodel.HOrgID +
- "' where HInterID = " + omodel.HInterID;
+ "', HProcID = " + omodel.HProcID +
+ " where HInterID = " + omodel.HInterID;
oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
@@ -126,7 +127,7 @@
//鎻掑叆涓昏〃
string mainSql = "insert into Gy_MaterialMouldBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
- ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID ) " +
+ ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID,HProcID) " +
"values(" +
"" + omodel.HYear.ToString() +
"," + omodel.HPeriod.ToString() +
@@ -143,8 +144,9 @@
",'" + omodel.HMaterID +
"','" + omodel.HWorkCenterID +
"','" + omodel.HEquipID +
- "','" + omodel.HOrgID +
- "')";
+ "','" + omodel.HOrgID +
+ "'," + omodel.HProcID +
+ ")";
oCn.RunProc(mainSql);
diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialMouldBillMain.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialMouldBillMain.cs"
index 4b3a76f..d76808e 100644
--- "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialMouldBillMain.cs"
+++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialMouldBillMain.cs"
@@ -13,5 +13,6 @@
public Int64 HWorkCenterID; //int 工作中心
public Int64 HEquipID; //int 设备ID
+ public Int64 HProcID; //工序ID
}
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index ab87089..72a832c 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -126,12 +126,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList order by hmainid desc ", "h_v_Gy_QCCheckProjectList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList");
}
else
{
string sql1 = "select * from h_v_Gy_QCCheckProjectList where 1=1";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere+ " order by 鏃ユ湡 desc ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList");
}
}
@@ -1066,6 +1066,8 @@
oItemSub.HRelationQty = 0;
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
+ oItemSub.HDestructInspect = Convert.ToInt32(oItemSub.HDestructInspect);
+ oItemSub.HKeyInspect = Convert.ToInt32(oItemSub.HKeyInspect);
oBill.DetailColl.Add(oItemSub);
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 859f876..e412f95 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -4596,7 +4596,7 @@
{
//ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- ds = oCN.RunProcReturn("select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit", "h_v_Sc_MouldRepairCheckBillList_Edit");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit", "h_v_Sc_MouldRepairCheckBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4607,7 +4607,7 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = "select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
+ string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
--
Gitblit v1.9.1