From aee44f23c1bb37762b017ad6b1efc5bdd075fe8b Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期三, 01 十一月 2023 11:13:42 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 f7cae21..0b956a5 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"
@@ -258,6 +258,7 @@
var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
var HOrderCommitDate = list[i]["璁㈠崟浜よ揣鏈�"].ToString();
var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString();
if (HSourceID == "" || HSourceID == "0")
{
@@ -291,7 +292,7 @@
oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" +
$",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
- $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}'" +
+ $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty}" +
$" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
}
@@ -309,7 +310,7 @@
objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
, HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
, DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
- , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString())
+ , Math.Round(double.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()),1)
, list[i]);
if (objJsonResult.count == 1)
{
@@ -355,7 +356,7 @@
}
}
- public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY, Dictionary<string, string> dic)
+ public json AddBillSub(string HInterID, string HBillNo, DateTime date, double HQTY, Dictionary<string, string> dic)
{
//鑾峰彇琛ㄦ牸鏁版嵁
ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");
@@ -2617,11 +2618,11 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭�
[Route("JIT_DayPlanPlatFormBill/ReadyData")]
[HttpGet]
- public object ReadyData(string HICOMNum)
+ public object ReadyData(string SWhere)
{
try
{
- var list = HICOMNum.Split(',');
+ var list = SWhere.Split(',');
DataTable dt = new DataTable("date");
dt.Columns.Add("HICMOInterID", typeof(string));
dt.Columns.Add("HICMOEntryID", typeof(string));
@@ -2637,9 +2638,10 @@
{
string HICMOInterID = list[i].Split(';')[0].ToString();
string HICMOEntryID = list[i].Split(';')[1].ToString();
+ string HSourceID = list[i].Split(';')[2].ToString();
Thread.Sleep(100);
- ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID, "h_p_Sc_GetInfoByICMOBillNo");
+ ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID+","+ HSourceID, "h_p_Sc_GetInfoByICMOBillNo");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1