From f94f83b88bcfa267ebaed30af58fdbf2327c0491 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 17 七月 2024 11:34:44 +0800
Subject: [PATCH] 设备，器具报表（点检任务，保养任务，维修任务，故障登记跟踪）；设备，器具编辑页面添加源单字段信息；条码生成页面添加检验员字段
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index d66e65e..a1d9e86 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -835,6 +835,7 @@
long HEmpID = 0;
string HCusModel = ""; //瀹㈡埛鐗╂枡瑙勬牸
string HCusMaterName = ""; //瀹㈡埛鐗╂枡鍚嶇О
+ string HCheckEmpName = ""; //妫�楠屽憳鍚嶇О
DataSet Ds;
msg2 = msg2.Replace("\\", "");
@@ -858,6 +859,7 @@
HEmpID = ClsPub.isLong(ordrlist[j].HEmpID);
HCusModel = ClsPub.isStrNull(ordrlist[j].HCusModel);
HCusMaterName = ClsPub.isStrNull(ordrlist[j].HCusMaterName);
+ HCheckEmpName = ClsPub.isStrNull(ordrlist[j].HCheckEmpName);
//鏃ユ湡鑾峰彇鏂瑰紡
sDate = DateTime.Now.ToString();
//
@@ -870,6 +872,10 @@
sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate);
}
else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ else if (CampanyName == "涔濊彵")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
{
sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
}
@@ -1209,6 +1215,7 @@
barcode.HEmpID2 = ordrlist[j].HEmpID;
barcode.HCusModel2 = ordrlist[j].HCusModel;
barcode.HCusMaterName2 = ordrlist[j].HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist[j].HCheckEmpName;
ListRows.Add(barcode);
k = k + 1;
n = n + 1;
@@ -1260,6 +1267,7 @@
long HEmpID2 = 0;
string HCusModel2 = "";
string HCusMaterName2 = "";
+ string HCheckEmpName2 = "";
try
{
@@ -1317,6 +1325,7 @@
HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+ HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1325,7 +1334,7 @@
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
- ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName " +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1334,7 +1343,7 @@
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "'" + ")");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
//HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
--
Gitblit v1.9.1