From 7c0b78a6fd2af0973b25a1cd54db058704fef6a1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 16 一月 2024 09:42:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 914e073..b25d7cd 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -169,6 +169,7 @@
var HBillNo = "";
if (list[i]["鍗曟嵁鍙�"].ToString() == "" && list[i]["hmainid"].ToString() == "")
{
+ LogService.CustomWriteLog("2.01:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString();
var HOrderType = list[i]["璁㈠崟绫诲瀷"].ToString();
var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
@@ -178,7 +179,7 @@
var HProdORGID = list[i]["HProdORGID"].ToString();
var HMaterID = list[i]["HMaterID"].ToString();
var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
- var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
+ var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString().Replace("'", "''");
var HUnitID = list[i]["HUnitID"].ToString();
var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
//var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
@@ -194,6 +195,8 @@
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
+
+ LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
if (HSourceID == ""|| HSourceID == "0")
{
@@ -242,6 +245,7 @@
}
else
{
+ LogService.CustomWriteLog("2.0:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
HBillNo = list[i]["鍗曟嵁鍙�"].ToString();
HInterID = int.Parse(list[i]["hmainid"].ToString());
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
@@ -259,6 +263,8 @@
var HOrderCommitDate = list[i]["璁㈠崟浜よ揣鏈�"].ToString();
var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString();
+
+ LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));
if (HSourceID == "" || HSourceID == "0")
{
@@ -292,6 +298,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+ LogService.CustomWriteLog("2.2:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" +
$",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
@@ -303,6 +310,7 @@
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+ LogService.CustomWriteLog("2.3:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
for (int j = 0; j < SumDay; j++)
{
//涓昏〃瀛愯〃閮芥湁鏁版嵁
@@ -328,6 +336,8 @@
}
}
+ LogService.CustomWriteLog("2.4:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
+
if (TrueCount != SumCount)
{
objJsonResult.code = "0";
@@ -337,10 +347,14 @@
return objJsonResult;
}
}
-
+
+ LogService.CustomWriteLog("2.5:", DateTime.Now.ToString("yyyy-MM-dd"));
+
//鍚屾鏃ヨ鍒掑伐鍗�
oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");
+ LogService.CustomWriteLog("2.6:", DateTime.Now.ToString("yyyy-MM-dd"));
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = null;
--
Gitblit v1.9.1