From e62c6b670ee27f5d4e01498d4acaf14a88fcf302 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 13:17:45 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index b00b34d..34b61fd 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -111,7 +111,7 @@
//鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
for (int i = 0; i < tb2.Rows.Count; i++)
{
- tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ tb2.Rows[i]["HVersion_Import"] = DateTime.Now.ToString("yyyy-MM-dd HH");
if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
@@ -1096,6 +1096,8 @@
var HSourceID = list[i]["HSourceID"].ToString();
var HYX = list[i]["浼樺厛绾�"].ToString();
var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ //鏇存柊鏃跺垹闄ゅ瓙琛ㄥ唴瀹�
+ oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID ={hmainid}");
//鏇存柊灏忔椂浜ц兘
if (HWorkQty != ""&& HWorkQty != "0")
{
--
Gitblit v1.9.1