From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
WebAPI/DLL/工资管理/ClsGy_GroupEmpBill.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs" "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
index dddb1cf..98fa388 100644
--- "a/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
+++ "b/WebAPI/DLL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsGy_GroupEmpBill.cs"
@@ -45,7 +45,7 @@
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" + omodel.HMaker+ "'" +
",HUpDateDate=getdate()" +
//========================================
",HGroupID=" + omodel.HGroupID.ToString() +
@@ -81,7 +81,7 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
string sql = string.Format(@"Insert Into Gy_GroupEmpListMain(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HGroupID,HMaker,HMakeDate) values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupID.ToString() + "','" + DBUtility.ClsPub.CurUserName + "',getdate())");
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupID.ToString() + "','" + omodel.HMaker + "',getdate())");
oCn.RunProc(sql);
//鎻掑叆瀛愯〃
foreach (Models.ClsGy_GroupEmpListSub oSub in DetailColl)
--
Gitblit v1.9.1