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底层方法）
---
DAL/基础资料/其他基础资料/ClsGy_MatePriceSup_Ctl.cs | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
index 8ac0595..32c854b 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_MatePriceSup_Ctl.cs"
@@ -11,6 +11,7 @@
//鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
public string HOldNumber;
public List<Model.ClsGy_MatePriceSup_Model> DetailColl = new List<Model.ClsGy_MatePriceSup_Model>();
+ public Model.ClsGy_MatePriceSup_Model oModel = new Model.ClsGy_MatePriceSup_Model();
@@ -58,17 +59,26 @@
try
{
oCn.BeginTran();
- //鎻掑叆瀛愯〃
- foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
- {
- oCn.RunProc("Insert into Gy_MatePriceSup " +
- " (HInterID,HEntryID,HMaterID,HRelationID" +
+ //鎻掑叆琛�
+ //foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
+ //{
+ // oCn.RunProc("Insert into Gy_MatePriceSup " +
+ // " (HInterID,HEntryID,HMaterID,HRelationID" +
+ // ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
+ // ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
+ // " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
+ // "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
+ // "," + oSub.HPrice.ToString() + ",'" + "GETDATE()" + "','" + "GETDATE()" + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
+ //}
+ oCn.RunProc("Insert into " + MvarItemKey + " " +
+ " (HInterID,HEntryID,HMaterID,HRelationID" +
",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
- ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
- " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
- "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
- "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
- }
+ ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate) " +
+ " values(" + oModel.HInterID.ToString() + "," + oModel.HEntryID.ToString() + "," + oModel.HMaterID.ToString() + "," + oModel.HRelationID.ToString() +
+ "," + oModel.HUnitID.ToString() + "," + oModel.HBeginQty.ToString() + "," + oModel.HEndQty.ToString() + "," + oModel.HCurID.ToString() + ",'" + oModel.HType + "'" +
+ "," + oModel.HPrice.ToString() + ",'" + oModel.HBeginDate + "','" + oModel.HEndDate + "'," + oModel.HUsed + ",'" + oModel.HRemark + "','" + oModel.HMaker + "','" + oModel.HMakeDate + "') ");
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
return true;
}
@@ -85,18 +95,25 @@
try
{
oCn.BeginTran();
- DeleteByID(sItemID); //鍒犻櫎璁板綍
- //鎻掑叆琛�
- foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
- {
- oCn.RunProc("Insert into Gy_MatePriceSup " +
- " (HInterID,HEntryID,HMaterID,HRelationID" +
- ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
- ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
- " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
- "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
- "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
- }
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HPrice='" + oModel.HPrice + "'" +
+ ",HRemark='" + oModel.HRemark + "'" +
+ ",HMaterID=" + oModel.HMaterID.ToString() +
+ ",HUnitID=" + oModel.HUnitID.ToString() +
+ ",HCurID=" + oModel.HCurID.ToString() +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //DeleteByID(sItemID); //鍒犻櫎璁板綍
+ ////鎻掑叆琛�
+ //foreach (Model.ClsGy_MatePriceSup_Model oSub in DetailColl)
+ //{
+ // oCn.RunProc("Insert into Gy_MatePriceSup " +
+ // " (HInterID,HEntryID,HMaterID,HRelationID" +
+ // ",HUnitID,HBeginQty,HEndQty,HCurID,HType" +
+ // ",HPrice,HBeginDate,HEndDate,HUsed,HRemark,HMaker,HMakeDate)" +
+ // " values(" + oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() +
+ // "," + oSub.HUnitID.ToString() + "," + oSub.HBeginQty.ToString() + "," + oSub.HEndQty.ToString() + "," + oSub.HCurID.ToString() + ",'" + oSub.HType + "'" +
+ // "," + oSub.HPrice.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
+ //}
oCn.Commit();
return true;
}
@@ -190,6 +207,7 @@
{
MvarItemKey = "Gy_MatePriceSup";
MvarReportTitle = "閲囪喘浠锋牸璧勬枡璁剧疆";
+ oModel = new Model.ClsGy_MatePriceSup_Model();
}
}
}
--
Gitblit v1.9.1