From 80a908596cb1d1faac6b0f54f68182ad22303814 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 15 八月 2025 13:50:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 5d23593..05e50de 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -154,8 +154,8 @@
int HMouldID = list[0].HMouldID;//妯″叿id
double HMachineWorkTimes = list[0].HMachineWorkTimes;//璁惧宸ユ椂
int HIsTimeFlag = list[0].HIsTimeFlag;//鏄惁璁℃椂
- DateTime HRelBeginTime = list[0].HRelBeginTime;//寮�宸ユ椂闂�
- DateTime HRelEndTime = list[0].HRelEndTime;//瀹屽伐鏃堕棿
+ string HRelBeginTime = list[0].HRelBeginTime;//寮�宸ユ椂闂�
+ string HRelEndTime = list[0].HRelEndTime;//瀹屽伐鏃堕棿
LogService.Write($"1.瀛楁璧嬪�硷紝鐢ㄦ椂" + sw.Elapsed );
//鍗曟嵁瀹屾暣鎬у垽鏂�
@@ -475,9 +475,9 @@
",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
",HMouldID=" + HMouldID +
",HMachineWorkTimes=" + HMachineWorkTimes +
- ",HIsTimeFlag=" + HIsTimeFlag +
- ",HRelBeginTime='" + HRelBeginTime + "'" +
- ",HRelEndTime='" + HRelEndTime + "'" +
+ //",HIsTimeFlag=" + HIsTimeFlag +
+ //",HRelBeginTime='" + HRelBeginTime + "'" +
+ //",HRelEndTime='" + HRelEndTime + "'" +
" where HInterID=" + HInterID);
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
--
Gitblit v1.9.1