From 04b4d4d975858a0d5e207b9df9f3bb46cc6c14fd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 17 十一月 2025 11:41:24 +0800
Subject: [PATCH] 添康排产页面直接修改排产数量；
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 2116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,960 insertions(+), 156 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 3a0a81b..5ead2e8 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"
@@ -8,7 +8,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Diagnostics;
-
+using System.Threading;
+using System.Globalization;
namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
{
public class JIT_DayPlanPlatFormBillController : ApiController
@@ -20,6 +21,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
public static string BillType = "4610";
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏌ヨ
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList")]
@@ -41,12 +43,61 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
- $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}','{omdelMian.HWorkShopID}'" +
+ $",'{omdelMian.HMastersDate}','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillListExtendMakeDate")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillListExtendMakeDate(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query_ExtendMakeDate '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
+ $",'{omdelMian.HMastersDate}','{ omdelMian.HMakeDate }','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_QueryExtendMakeDate");
+
+
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
@@ -95,6 +146,40 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鏍规嵁鐐瑰嚮琛屾爣棰樻椂闂存煡璇㈢己鏂欏垎鏋�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHDateTimeList")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHDateTimeList(string sWhere)
+ {
+ try
+ {
+ MaterialShorAnalysis Report = JsonConvert.DeserializeObject<MaterialShorAnalysis>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_MaterialShorAnalysisReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}' ", "h_p_JIT_PODemandPlanBill_ReportList");
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ //objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 淇濆瓨
@@ -126,12 +211,15 @@
public json AddBillMain(string msg1)
{
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string user = sArray[1].ToString();
try
{
+ Stopwatch sw = new Stopwatch();//璁℃椂鍣�
+ sw.Start();//寮�濮嬭鏃�
+
if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
{
objJsonResult.code = "0";
@@ -141,6 +229,7 @@
return objJsonResult;
}
+ LogService.CustomWriteLog("1:"+msg2, DateTime.Now.ToString("yyyy-MM-dd"));
//JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg2);
@@ -154,16 +243,21 @@
list.Add(dic);
}
+ LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd"));
int TrueCount = 0, SumCount = 0;
+ LogService.CustomWriteLog("list.Count:"+ list.Count, DateTime.Now.ToString("yyyy-MM-dd"));
+ string sReturn = "";
+ oSystemParameter.ShowBill(ref sReturn);
for (int i = 0; i < list.Count; i++)
- {
+ {
TrueCount = 0;
SumCount = 0;
long HInterID = 0;
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();
@@ -173,13 +267,14 @@
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();
var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString();
var HDayPlanSumQty = list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString();
var HPlanBeginDate = list[i]["璁″垝寮�濮嬫棩鏈�"].ToString();
+ var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
var HSeOrderBillNo = list[i]["閿�鍞鍗曞彿"].ToString();
var HICMOBillType = list[i]["鐢熶骇璁㈠崟鍗曟嵁绫诲瀷"].ToString();
var HSourceStockInQty = list[i]["浜х嚎鍏ュ簱鏁伴噺"].ToString();
@@ -188,18 +283,32 @@
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
-
- if (HSourceID == ""|| HSourceID == "0")
+ var HEmpID = list[i]["HEmpID"].ToString();
+ var HWorkQty = list[i]["灏忔椂浜ц兘"].ToString();
+ var HSourceName = list[i]["鐢熶骇璧勬簮"].ToString();
+ var HMouldID = "0";
+ if (oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
- objJsonResult.data = null;
- return objJsonResult;
+ HMouldID = list[i]["HMouldID"].ToString();
}
+ //var HWorkQty_ProdLine = list[i]["浜х嚎鎬讳骇鑳�"].ToString();
- ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
- $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
+ LogService.CustomWriteLog("2.05:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧"&& oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ if (HSourceID == "" || HSourceID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'')=''", "Sc_WorkBillSortBillMain");
+
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
@@ -213,39 +322,110 @@
HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- //涓昏〃
- oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ string sql = "";
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
- "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)values" +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
+ ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
$" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
$"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
- $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})");
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}')";
+ }
+ else
+ {
+ sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+ "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
+ " HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
+ " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
+ "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
+ ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName,HMouldID)values" +
+ $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+ $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
+ $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
+ $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
+ $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
+ $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}','{HMouldID}')";
+ }
+
+ //LogService.Write("sql:" + sql);
+ //涓昏〃
+ oCN.RunProc(sql);
}
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();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString();
var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
var HSourceID = list[i]["HSourceID"].ToString();
var HYX = list[i]["浼樺厛绾�"].ToString();
+ var HWorkQty = list[i]["灏忔椂浜ц兘"].ToString();
+ var HProdTimes = list[i]["鐢熶骇鍛ㄦ湡"].ToString();
+ var HReadyTimes = list[i]["寮�宸ヤ綑閲�"].ToString();
+ var HLastBeginDate = list[i]["鏈�杩熷紑宸ユ棩鏈�"].ToString();
+ var HLastEndDate = list[i]["鏈�杩熷畬宸ユ棩鏈�"].ToString();
+ var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
+ var HOrderCommitDate = list[i]["璁㈠崟浜よ揣鏈�"].ToString();
+ var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString();
+ var HSourceName = list[i]["鐢熶骇璧勬簮"].ToString();
+ var HWorkQty_ProdLine = list[i]["浜х嚎鎬讳骇鑳�"].ToString();
- if (HSourceID == "" || HSourceID == "0")
+ var HOrderType = list[i]["璁㈠崟绫诲瀷"].ToString();
+ var HWorkShopID = list[i]["HWorkShopID"].ToString();
+ var HProdORGID = list[i]["HProdORGID"].ToString();
+ var HMaterID = list[i]["HMaterID"].ToString();
+ var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
+ var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString().Replace("'", "''");
+ var HUnitID = list[i]["HUnitID"].ToString();
+ var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
+ var HDayPlanSumQty = list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString();
+ var HPlanBeginDate = list[i]["璁″垝寮�濮嬫棩鏈�"].ToString();
+ var HSeOrderBillNo = list[i]["閿�鍞鍗曞彿"].ToString();
+ var HICMOBillType = list[i]["鐢熶骇璁㈠崟鍗曟嵁绫诲瀷"].ToString();
+ var HSourceStockInQty = list[i]["浜х嚎鍏ュ簱鏁伴噺"].ToString();
+ var HLeftPlanQty = list[i]["鏈帓鏁伴噺"].ToString();
+ var HOrderLev = list[i]["璁㈠崟绛夌骇"].ToString();
+ var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
+ var HEmpID = list[i]["HEmpID"].ToString();
+ var HMouldID = "0";
+ if (oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
- objJsonResult.data = null;
- return objJsonResult;
+ HMouldID = list[i]["HMouldID"].ToString();
}
+
+ LogService.CustomWriteLog("2.1:"+i, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "涓夊崌") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ if (HSourceID == "" || HSourceID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
var str = 0;
if (!int.TryParse(HYX, out str))
{
@@ -256,61 +436,224 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
- $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
-
- if (ds.Tables[0].Rows.Count > 1)
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //鐪嬫湁鍑犲彴鐢熶骇璧勬簮鍗忓悓鐢熶骇
+ string[] HSourceNameArr = HSourceName.Split(new char[]{'&'});
- oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ if (HSourceNameArr.Length >= 2)
+ {
+ for (int s = 0; s < HSourceNameArr.Length; s++)
+ {
+ if (s == 0)
+ {
+ ds = oCN.RunProcReturn("select HItemID from Gy_Source with(nolock) where HName = '" + HSourceNameArr[s] + "'", "Gy_Source");
+
+ var HSourceID_Child = ds.Tables[0].Rows[0]["HItemID"];
+
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID_Child == "" ? 0.ToString() : HSourceID_Child)}" +
+ $",HYX={HYX},HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
+ $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}'" +
+ $",HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
+ $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select HItemID from Gy_Source with(nolock) where HName = '" + HSourceNameArr[s] + "'", "Gy_Source");
+
+ var HSourceID_Child = ds.Tables[0].Rows[0]["HItemID"];
+
+ //鏂板鍗忓悓鐢熶骇璧勬簮鐨勬帓浜ц褰�
+ ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID_Child}", "Sc_WorkBillSortBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鏂板鍗曟嵁鍙� id
+ var HBillNo_New = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ var HInterID_New = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+
+ string sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+ "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
+ " HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
+ " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
+ "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
+ ",HICMOInterID,HICMOEntryID,HPlanEndDate,HEmpID,HWorkQty,HSourceName,HWorkQty_ProdLine,HRemark)values" +
+ $"({HInterID_New},'{HBillNo_New}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+ $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
+ $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID_Child == "" ? 0.ToString() : HSourceID_Child)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
+ $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
+ $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
+ $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},'{HPlanEndDate}','{HEmpID}','{HWorkQty}','{HSourceName}','{HWorkQty_ProdLine}','{"鍗忓悓鐢熶骇"}')";
+
+ //LogService.Write("sql:" + sql);
+ //涓昏〃
+ oCN.RunProc(sql);
+
+ //鎻掑叆瀛愯〃鏁版嵁
+ for (int j = 0; j < 180; j++)
+ {
+ //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
+ //if (j == 180 - 1 && SumCount == 0 && HInterID_New != 0 && HBillNo_New != "")
+ //{
+ // objJsonResult = AddBillSub(HInterID_New.ToString(), HBillNo_New, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
+ //}
+
+
+ if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ {
+ ////淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(HInterID_New == 0 ? list[i]["hmainid"].ToString() : HInterID_New.ToString()
+ , HBillNo_New == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo_New
+ , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
+ , 0
+ , list[i]);
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ LogService.CustomWriteLog("绗�" + i + 1 + "琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�", DateTime.Now.ToString("yyyy-MM-dd"));
+ LogService.CustomWriteLog($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", DateTime.Now.ToString("yyyy-MM-dd"));
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ 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}'" +
+ $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}',HPlanEndDate='{HPlanEndDate}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
+ $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ }
+ }
+ else
+ {
+ ds = oCN.RunProcReturn($"select HInterID,HICMOBillNo from Sc_WorkBillSortBillMain with(nolock) where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'') = ''", "Sc_WorkBillSortBillMain");
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ LogService.CustomWriteLog("绗�" + i + 1 + "琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�", DateTime.Now.ToString("yyyy-MM-dd"));
+ LogService.CustomWriteLog($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID} and ISNULL(HDeleteMan,'')=''", DateTime.Now.ToString("yyyy-MM-dd"));
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ LogService.CustomWriteLog("2.2:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ 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}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine}" +
+ $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ }
+ else
+ {
+ 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}',HSplitQty={HSplitQty},HSourceName='{HSourceName}',HWorkQty_ProdLine={HWorkQty_ProdLine},HMouldID={HMouldID}" +
+ $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ }
+ }
}
oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["鍗曟嵁鍙�"].ToString(): HBillNo)}'");
- int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+ int SumDay = 0; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+ // 缁熻鎬诲ぉ鏁�
+ HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
+
+ foreach (var key in list[i].Keys)
+ {
+ if (DateTime.TryParseExact(key, "yyyy-M-d", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date))
+ {
+ uniqueDates.Add(date);
+ }
+ }
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ SumDay = 180;
+ }
+
+ SumDay = uniqueDates.Count;
+
+
+ LogService.CustomWriteLog("2.3:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
for (int j = 0; j < SumDay; j++)
{
//涓昏〃瀛愯〃閮芥湁鏁版嵁
- if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ if (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)>0)
{
SumCount += 1;
////淇濆瓨瀛愯〃
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)
{
TrueCount += 1;
}
}
//涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
- if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
+ if (j == SumDay-1 && SumCount == 0 && HInterID != 0 && HBillNo != "")
{
- objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+ //LogService.CustomWriteLog("3:"+ HInterID+","+ HBillNo, DateTime.Now.ToString("yyyy-MM-dd"));
+ objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
}
}
+
+ LogService.CustomWriteLog("2.4:" + i, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (TrueCount != SumCount)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
}
- if (TrueCount != SumCount)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = objJsonResult.Message;
- objJsonResult.data = null;
- 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"));
+ sw.Stop();//缁撴潫璁℃椂
+ LogService.Write($"========================1.鎺掍骇璁㈠崟鎬荤敤鏃讹細" + sw.Elapsed);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -328,33 +671,70 @@
}
}
- public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY)
+ 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");
+ string sReturn = "";
+ oSystemParameter.ShowBill(ref sReturn);
+ //鑾峰彇琛ㄦ牸鏁版嵁
+ ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBill_PC where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBill_PC");
int count = 0;
if (ds.Tables[0].Rows.Count > 0)
{
- //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
- for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
+ //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
- oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
- $" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
- count += 1;
+ if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY},HUseTimes={(dic["浜х嚎鎬讳骇鑳�"] == "0" ? 0 : HQTY / float.Parse(dic["浜х嚎鎬讳骇鑳�"].ToString()))}" +
+ $" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
+ count += 1;
+ }
}
}
+ else
+ {
+ //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY},HUseTimes={(dic["灏忔椂浜ц兘"] == "0" ? 0 : HQTY / float.Parse(dic["灏忔椂浜ц兘"].ToString()))}" +
+ $" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
+ count += 1;
+ }
+ }
+ }
}
-
+
if (count != 1)
{
- //鎻掑叆瀛愯〃
- oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
- "HMasterDate,HQty)" +
- $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
- $" '{date}', {HQTY})");
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
+ "HMasterDate,HQty,HUseTimes)" +
+ $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
+ $" '{date}', {HQTY},{ ((dic["浜х嚎鎬讳骇鑳�"] == "0.0000" ? 0 : dic["浜х嚎鎬讳骇鑳�"] == "0" ? 0 : HQTY / float.Parse(dic["浜х嚎鎬讳骇鑳�"].ToString())).ToString() == "闈炴暟瀛�" ? 0 : dic["浜х嚎鎬讳骇鑳�"] == "0.0000" ? 0 : dic["浜х嚎鎬讳骇鑳�"] == "0" ? 0 : HQTY / float.Parse(dic["浜х嚎鎬讳骇鑳�"].ToString())) })");
+ }
+ else
+ {
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
+ "HMasterDate,HQty,HUseTimes)" +
+ $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
+ $" '{date}', {HQTY},{ ((dic["灏忔椂浜ц兘"] == "0.0000" ? 0 : dic["灏忔椂浜ц兘"] == "0" ? 0 : HQTY / float.Parse(dic["灏忔椂浜ц兘"].ToString())).ToString() == "闈炴暟瀛�" ? 0 : dic["灏忔椂浜ц兘"] == "0.0000" ? 0 : dic["灏忔椂浜ц兘"] == "0" ? 0 : HQTY / float.Parse(dic["灏忔椂浜ц兘"].ToString())) })");
+ }
+ }
+
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //鎶婃帓浜ц鍗曞畬宸ユ棩鏈熷弽鍐欏埌閲戣澏閿�鍞鍗曚笂
+ string sql = "exec h_p_JIT_UpdateEndDateToERP " + HInterID + ",'" + HBillNo + "'";
+ oCN.RunProc(sql);
}
objJsonResult.code = "1";
@@ -702,9 +1082,9 @@
}
#endregion
- [Route("JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis")]
- [HttpGet]
- public object JIT_CompleteSetAnalysis(string sWhere, string user)
+ #region 榻愬鍒嗘瀽 鍘熻皟鐢ㄦ柟娉�
+
+ public object JIT_CompleteSetAnalysis_Old(string sWhere, string user)
{
try
{
@@ -712,9 +1092,22 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
ds = oCN.RunProcReturn(sql, "JIT_qtfx");
- LogService.Write("榻愬鍒嗘瀽sql:" + sql);
+ //LogService.Write("榻愬鍒嗘瀽sql:" + sql);
List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
DataTable resulTable = ds.Tables[0];
+
+ if (ds.Tables[0].Rows.Count < 1 || ds == null)
+ {
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
{
//閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
@@ -751,27 +1144,15 @@
fDayPlanFids = string.Join(",", fidList);
fDayPlanFEntryids = string.Join(",", fentryidList);
}
- LogService.Write("鏃ヨ鍒掑伐鍗昳ds" + fDayPlanFids);
+ //LogService.Write("鏃ヨ鍒掑伐鍗昳ds" + fDayPlanFids);
sw.Start();//寮�濮嬭鏃�
//鑾峰彇褰撳墠鍗虫椂搴撳瓨 搴撳瓨鏁伴噺+搴撳瓨缁勭粐+鐗╂枡+璐т富+浠撳簱
+ //鍘熸煡璇㈠嵆鏃跺簱瀛樻柟寮忥細select * from h_v_jit_InventoryList
ds = oCN.RunProcReturn(@"
-select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber ,a.FLOT HLOT,a.FID HInventoryFID
-from
-(
-select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
-join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
-join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
-join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
-) T1
-JOIN AIS20210811135644..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
-LEFT JOIN AIS20210811135644..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
-LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20210811135644..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
-join AIS20210811135644..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
-where a.FBASEQTY>0
-", "SC_WORKBILLSORTBILLMAIN");
+exec h_p_jit_Inventory_UsableList
+", "h_p_jit_Inventory_UsableList");
ListInventory = ds.ToModelList<PRD_Inventory>();
//杞﹂棿 浠撳簱瀵圭収鍒楄〃
ds = oCN.RunProcReturn(@"
@@ -783,38 +1164,26 @@
//鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
var DatePlanList = BomList.GroupBy(p => new { p.HMasterDate, p.HICMOEntryID_Sec }).Select(x => new PRD_PPBOM { HMasterDate = x.Key.HMasterDate, HICMOEntryID_Sec = x.Key.HICMOEntryID_Sec }).ToList();
//鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
- string LLsql = string.Format(@"
-select max(t1.FCXStockInQty)FCXStockInQty,FPRDMOENTYID,max(dwyl)dwyl,sum(FPickedQty)FPickedQty,sum(FRemainPickedQty)FRemainPickedQty,FMATERIALID from
-(
-select a.FCXStockInQty, FPRDMOENTYID,convert( decimal(18,2),FMustQty/FQty ) as dwyl,FPickedQty,T2.FMATERIALID,
-case when convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty))< 0 then 0
-else convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty)) end as FRemainPickedQty
- from
-(
-select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
-where a.HInterID IN ({0})
-group by HICMOEntryID_Sec
-) a
-join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
-LEFT JOIN AIS20210811135644..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID
-) t1
-group by FPRDMOENTYID,FMATERIALID
-", fDayPlanFids);
+ string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
+ //LogService.Write("LLsql:" + LLsql);
ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
+ //LogService.Write(JsonConvert.SerializeObject(ds));
DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
+ //LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
//CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
//绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
+ int o = 0;
foreach (var item in DatePlanList)
{
+ o++;
+ //LogService.Write("寰幆:" + o);
//鏃ヨ鍒掔敤鏂欐竻鍗曟槑缁� 姣忎竴澶╃殑瀹為檯鐢ㄦ枡鎯呭喌
var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList();
//姣忎竴涓墿鏂欒繘琛屽簱瀛樿绠�
@@ -850,8 +1219,9 @@
decimal planNeed = _item.PlanCount; //涓嶅弬涓庤绠� 鐢ㄤ簬璁板綍
decimal need = _item.PlanCount;//鍙備笌璁＄畻
decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
- //鎵惧埌棰嗙敤鏁伴噺
+ //鎵惧埌棰嗙敤鏁伴噺
var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.HICMOEntryID_Sec && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
+
if (_DayPlanPickedModel.FRemainPickedQty >= need)
{
//棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
@@ -882,19 +1252,24 @@
});
//鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
_DayPlanPickedModel.FRemainPickedQty -= need;
+ //LogService.Write($"h" + need);
//寰幆涓嬩竴涓墿鏂�
continue;
}
else
{
+ //LogService.Write($"kxs" + need);
need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
+ //LogService.Write($"i1" + need);
FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
_DayPlanPickedModel.FRemainPickedQty = 0;
+ //LogService.Write($"i" + need);
}
if (_pRD_WorkHouseCompar.Count > 0)
{
//缂烘枡鏁伴噺 闇�姹傛暟閲� - 瀹為檯搴撳瓨 >0 ? 涓�涓墿鏂欎笉绠″崰鐢ㄥ灏戞潯 搴撳瓨+璐т富 鏁版嵁 缂烘枡鏁伴噺鏄悓涓�涓暟閲�
decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0;
+ //LogService.Write($"j" + _fLackCount);
//LogHelper.Info("缁勭粐锛�" + _item.FStockOrgId + " ,鍙婃椂搴撳瓨" + jskcQty);
//鎬诲簱瀛樹负0浜� 鐩存帴缁欏嚭 缂烘枡鏁伴噺
if (jskcQty == 0)
@@ -927,6 +1302,8 @@
//缁堟璇ョ墿鏂欒绠� 杩涘叆涓嬩竴涓�
continue;
}
+
+ //LogService.Write($"k" + 2);
foreach (var WorkHouse in _pRD_WorkHouseCompar)
{
//搴撳瓨鏁版嵁鍖归厤
@@ -1027,7 +1404,7 @@
//Thread.Sleep(6000);
i++;
}
- LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ //LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
List<string> sqlList = new List<string>();
DataTable insertDT = new DataTable();
insertDT.TableName = "JIT_MOMaterReadysBill";
@@ -1117,7 +1494,7 @@
$", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
$",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
}
- LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
+ //LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
string updatesql = string.Format(@"
update Sc_WorkBillSortBillSub set HComplete = '鏈綈濂�' where HEntryID IN
@@ -1136,7 +1513,7 @@
//閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
sw.Stop();//缁撴潫璁℃椂
- LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -1154,6 +1531,103 @@
return objJsonResult;
}
}
+
+ #endregion
+
+ #region 榻愬鍒嗘瀽璋冪敤鏂规硶 20250402
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis")]
+ [HttpGet]
+ public object JIT_CompleteSetAnalysis(string sWhere, string user)
+ {
+ try
+ {
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉"
+ || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒"
+ || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧"
+ || oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ objJsonResult = (json)JIT_CompleteSetAnalysis_Old(sWhere, user);
+ }
+ else
+ {
+ objJsonResult = (json)JIT_CompleteSetAnalysis_New(sWhere, user);
+ }
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("榻愬鍒嗘瀽鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 榻愬鍒嗘瀽 鏂拌皟鐢ㄦ柟娉�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_CompleteSetAnalysis_New(string sWhere, string user)
+ {
+ try
+ {
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+ string HWorkShopID = omdelMian.HWorkShopID.ToString();
+ var HStockOrgID = omdelMian.HProdORGID;
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_CompleteSetAnalysis " + HWorkShopID.ToString() + ",'" + user + "'," + HStockOrgID.ToString(), "h_p_JIT_CompleteSetAnalysis");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "榻愬鍒嗘瀽鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); //杩愮畻鎴愬姛
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "榻愬鍒嗘瀽澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#endregion
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鎻愭枡杩愮畻
@@ -1223,6 +1697,8 @@
/// 搴撳瓨缁勭粐
/// </summary>
public long FStockOrgId { get; set; }
+ //搴撳瓨缁勭粐鍚嶇О
+ public string FStockOrgName { get; set; }
/// <summary>
/// jit鐗╂枡鍒嗙被
/// </summary>
@@ -1296,6 +1772,10 @@
/// 閲囪喘缁勭粐
/// </summary>
public long FStockOrgId { get; set; }
+ /// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
/// <summary>
/// 缁勭粐缂栫爜
/// </summary>
@@ -1437,6 +1917,10 @@
/// </summary>
public long FStockOrgId { get; set; }
/// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
+ /// <summary>
/// 缁勭粐缂栫爜
/// </summary>
public string FORGNumber { get; set; }
@@ -1500,15 +1984,101 @@
[Route("JIT_DayPlanPlatFormBill/JIT_TLYS")]
[HttpGet]
- public object JIT_TLYS(string sWhere, string user)
+ public object JIT_TLYS(string sWhere, string user,string HTLType)
{
try
{
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
- DataSet DaSet = oCN.RunProcReturn($"select * from JIT_MOMaterReadysBill where HWorkShopID={omdelMian.HWorkShopID} and HProdORGID={omdelMian.HProdORGID}", "JIT_MOMaterReadysBill");
+ string fProWorkShopId = omdelMian.HWorkShopID.ToString();
+ var fPrdOrgId = omdelMian.HProdORGID;
+ string sqlName = "";//AIS20210811135644
+ string WMS_CampanyName = ""; //瀹㈡埛鍚嶇О
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉")
+ {
+ sqlName = "AIS20230129011339";
+ WMS_CampanyName = "甯呭▉";
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ sqlName = "AIS20210820164804";
+ WMS_CampanyName = "鍑礉濂堢壒";
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+ {
+ sqlName = "AIS20240809105013";
+ WMS_CampanyName = "娣诲悍绉戞妧";
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ sqlName = "AIS20250102123554";
+ WMS_CampanyName = "瀹濆伐";
+ }
+ else
+ {
+ sqlName = "AIS20210811135644";
+ }
- if (DaSet.Tables[0].Rows.Count == 0)
+ if (WMS_CampanyName == "瀹濆伐" || WMS_CampanyName == "娣诲悍绉戞妧" || WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ objJsonResult = (json)JIT_MOMaterLack(fProWorkShopId, fPrdOrgId, user);
+ }
+ else if (HTLType == "缂烘枡")
+ {
+ if (WMS_CampanyName == "甯呭▉" /*|| WMS_CampanyName == "鍑礉濂堢壒" || WMS_CampanyName == "娣诲悍绉戞妧"*/)
+ {
+ objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
+ }
+ else
+ {
+ objJsonResult = (json)JIT_MOMaterReady(fProWorkShopId, fPrdOrgId, user);
+ }
+ }
+ else if (HTLType == "鐢熶骇鐢ㄦ枡娓呭崟")
+ {
+ objJsonResult = (json)JIT_PPBOM(fProWorkShopId, fPrdOrgId, user, sqlName);
+ }
+
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErr;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閫氳繃缂烘枡鎯呭喌绠楁彁鏂�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_QL(string HWorkShopID,int? HProdORGID,string user,string sqlName) {
+ try
+ {
+
+ oCN.BeginTran();
+
+ DataSet DaSet = oCN.RunProcReturn($"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},1", "JIT_MOMaterReadysBill");
+
+ if (DaSet.Tables[0].Rows[0][0].ToString() != "1")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1517,12 +2087,462 @@
return objJsonResult;
}
- string fProWorkShopId = omdelMian.HWorkShopID.ToString();
- var fPrdOrgId = omdelMian.HProdORGID;
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
+ //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺
+ // string sql = string.Format(@"
+ // /*dialect*/
+ //exec [鎻愭枡璁″垝棰勫鐞哴
+ //");
+ // DBServiceHelper.Execute(Context, sql);
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
+ //閲囪喘璁㈠崟鏁版嵁
+ string sql = $@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},2";
+ DataSet ds = oCN.RunProcReturn(sql, "t_PUR_POOrderEntry");
+ List<PurchaseInventory> PurchaseInventory = ds.ToModelList<PurchaseInventory>();
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
+ sql = string.Format($@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},3");
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
+ ds = oCN.RunProcReturn( sql, "JIT_MOMaterReadysBill");
+ List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
+ //鐗╂枡+搴撳瓨缁勭粐鍒嗙被
+ var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FNumber,p.FStockOrgName, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FNumber=x.Key.FNumber, FStockOrgId = x.Key.FStockOrgId , FStockOrgName =x.Key.FStockOrgName }).ToList();
+ //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
+ List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
+ //sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
+ List<string> sqlList = new List<string>();
- LogService.Write($"鎻愭枡璁″垝閲嶇畻 杞﹂棿锛歿fProWorkShopId}锛岀粍缁囷細{fPrdOrgId}");
+ //LogService.Write("1");
+ string Error = "";
+ foreach (var item in MaterialIDList)
+ {
+ //褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
+ List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
+ if (_PurchaseInventory.Count == 0)
+ {
+ Error+="[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FNumber + " 搴撳瓨缁勭粐锛�" + item.FStockOrgName + " ";
+ continue;
+ }
+
+ //LogService.Write("1.1");
+
+ ////LogHelper.Info(item.FMATERIALID.ToString());
+ //褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
+ List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
+ decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//鏈�灏忚捣璁㈤噺
+ double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//鎻愬墠鏈�
+ //double FFIXLEADTIME = 3;//鎻愬墠鏈�(2022-1-26 鎻愬墠鏈熸敼涓�3澶� 涔冩案鍒氬弽棣�)
+ string FJITmaterialGroup = _DayPlanPpbom.FirstOrDefault().FJITmaterialGroup;//jit鐗╂枡鍒嗙被
+ string FJITMaterielDemand = _DayPlanPpbom.FirstOrDefault().FJITMaterielDemand; //JIT鐗╂枡闇�姹備緵璐у懆鏈�
+ string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT瀹夊叏搴撳瓨
+ decimal NeedQty = 0;
+ DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//绗竴涓璐ц捣濮嬫棩鏈�
+ int i = 0;
+ //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
+
+ //LogService.Write("1.2");
+
+ List<int> FEntryIdList = new List<int>();
+ foreach (var _item in _DayPlanPpbom)
+ {
+ i++;
+ _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
+ if (_PurchaseInventory.Count == 0)
+ {
+ break;
+ }
+
+ //LogService.Write("1.2.1");
+
+ if (NeedQty == 0)
+ {
+ DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
+ }
+ FEntryIdList.Add(_item.FENTRYID);
+ NeedQty += _item.NeedQty;
+ //LogService.Write(FJITmaterialGroup);
+ //LogService.Write(FEntryIdList.Count);
+ //LogService.Write(Convert.ToDouble(FJITMaterielDemand));
+ //LogService.Write(_DayPlanPpbom.Count);
+ //LogService.Write(i);
+ if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToDouble(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //璁㈠崟涓撶敤涓�х被
+ {
+ continue;
+ }
+
+ //LogService.Write("1.2.2");
+
+ foreach (var Purchase in _PurchaseInventory)
+ {
+ if (Purchase.FQTY >= NeedQty)
+ {
+ foreach (int id in FEntryIdList)
+ {
+ var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = DayPlanPpbomls.FID,
+ FHMASTERDATE = DATE,
+ FQty = DayPlanPpbomls.NeedQty,
+ FBILLNO = DayPlanPpbomls.FBILLNO,
+ FENTRYID = DayPlanPpbomls.FENTRYID,
+ FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ FNumber = DayPlanPpbomls.FNumber,
+ OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ FFIXLEADTIME = FFIXLEADTIME,
+ FErpClsID = DayPlanPpbomls.FErpClsID,
+
+ PurchseFID = Purchase.FID,
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO
+ });
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ DayPlanPpbomls.NeedQty = 0;
+ }
+
+ //LogService.Write("1.2.3");
+
+ FEntryIdList.Clear();
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ ls.FQTY -= NeedQty;
+ break;
+ }
+ else
+ {
+ //鏇存柊鎬婚渶姹傛暟閲�
+ NeedQty = NeedQty - Purchase.FQTY;
+ //閲囪喘璁㈠崟鏁伴噺
+ decimal _NeedQty = Purchase.FQTY;
+ List<int> mmm = new List<int>();
+ foreach (int id in FEntryIdList)
+ {
+ var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
+
+ if (Qty > _NeedQty)
+ Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
+
+ _NeedQty = _NeedQty - Qty;
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = DayPlanPpbomls.FID,
+ FHMASTERDATE = DATE,
+ FQty = Qty,
+ FBILLNO = DayPlanPpbomls.FBILLNO,
+ FENTRYID = DayPlanPpbomls.FENTRYID,
+ FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ FNumber = DayPlanPpbomls.FNumber,
+ OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ FFIXLEADTIME = FFIXLEADTIME,
+ FErpClsID = DayPlanPpbomls.FErpClsID,
+
+ PurchseFID = Purchase.FID,
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO
+ });
+ //鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗�
+ DayPlanPpbomls.NeedQty -= Qty;
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}");
+ //鏇存柊Model
+ var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ ls.FQTY -= Qty;
+ if (_NeedQty <= 0)
+ {
+ foreach (var mm in mmm)
+ {
+ FEntryIdList.Remove(mm);
+ }
+ break;
+ }
+ mmm.Add(id);
+ }
+ }
+ }
+
+ //LogService.Write("1.2.4");
+
+ NeedQty = 0;
+
+ }
+ }
+
+ //var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
+ var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
+ //LogHelper.Info($"鎻愭枡璁″垝锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{PODemandPlanTemp.Count}");
+ int tlmmm = 0;
+ JArray FinalyResult = new JArray();
+
+ //LogService.Write("2");
+
+ foreach (var item in PODemandPlanList)
+ {
+ tlmmm++;
+
+ DateTime date = item.FHMASTERDATE;
+ string PurchseFNUMBER = item.PurchseFNUMBER;
+ //JObject model = new JObject();
+ //model.Add("FHDate", date);
+ //model.Add("FDeliveryDate", date.AddDays(-3));//渚涘簲鍟嗛璁″彂璐ф棩鏈�
+ //model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
+ //model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
+
+ var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
+ var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
+ string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//鍒跺崟浜�
+ string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//淇敼浜�
+
+
+ var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join "+ sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "' and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //閲囪喘缁勭粐
+
+ var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
+ inner join " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
+ where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Supplier");
+ long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //渚涘簲鍟�
+
+ long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
+
+ //涓昏〃
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
+ ",HBillSubType,HDate,HBillStatus,HMaker,HMakeDate" +
+ ",HSubORGID ,HAddress,HPURCHASEORGID,HSupplierID ,HSettleCurrId" +
+ ",HRemark,HExplanation,HUpDater,HUpDateDate)" +
+ $"values({HInterID}, '{HBillNo}', {DateTime.Now.Year}, {DateTime.Now.Month}, '4608'" +
+ $", '4608','{date}',1, '{HMaker}',GETDATE()," +
+ $"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
+ $",'','','{HUpDater}',getdate())");
+
+ JArray Fentity = new JArray();
+ List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
+ //LogService.Write("娴嬭瘯listmodel锛�" + _PODemandPlanList[0].FORGNumber.ToString());
+ int i = 0;
+ foreach (var _item in _PODemandPlanList)
+ {
+ i++;
+ //if (!model.ToString().Contains("FHPURCHASEORGID"))
+ // model.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });
+ //JObject FentityModel = new JObject();
+ //FentityModel.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
+ //FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = _item.FNumber });//鐗╂枡
+ //FentityModel.Add("FHQty", _item.FQty);//鏁伴噺
+ //FentityModel.Add("FHSourceInterID", _item.FID);//鏃ヨ鍒掑伐鍗旻ID
+ //FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//鏃ヨ鍒掑伐鍗旻ENTRYID
+ //FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//鏃ヨ鍒掑伐鍗曞崟鍙�
+ //FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨�
+ //FentityModel.Add("FDayPlanDate", _item.OLDDATE);//鏃ヨ鍒掑伐鍗曠被鍨�
+ //FentityModel.Add("FHRelationQty", _item.PurchseFqty);//鍏宠仈鏁伴噺
+ //FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//鎻愬墠鏈�
+ //FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
+ //FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 閲囪喘璁㈠崟鍐呯爜锛欶HPOOrderInterID
+ //FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
+ //FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
+ //FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
+ //FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
+ //Fentity.Add(FentityModel);
+
+
+ var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
+ inner join " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ where FNUMBER='" + _item.FNumber + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Material");
+ string HMaterID = "0"; //鐗╂枡
+ string HMaterModel = ""; //鐗╂枡浠ｇ爜
+ string HMaterName = ""; //鐗╂枡鍚嶇О
+ if (dataSet.Tables[0].Rows.Count != 0)
+ {
+ HMaterID = dataSet.Tables[0].Rows[0]["HItemID"].ToString(); //鐗╂枡
+ HMaterModel = dataSet.Tables[0].Rows[0]["HNumber"].ToString(); //鐗╂枡浠ｇ爜
+ HMaterName = dataSet.Tables[0].Rows[0]["HName"].ToString(); //鐗╂枡鍚嶇О
+ }
+
+ decimal HQty = _item.FQty; //鏁伴噺
+ long HSourceInterID = _item.FID; //鏃ヨ鍒掑伐鍗旻ID
+ long HSourceEntryID = _item.FENTRYID;//鏃ヨ鍒掑伐鍗旻ENTRYID
+ string HSourceBillNo = _item.FBILLNO; //鐢熶骇璁㈠崟鍙�
+ string HSourceBillType = ""; //鏃ヨ鍒掑伐鍗曠被鍨�
+ DateTime HDayPlanDate = _item.OLDDATE; // 宸ュ崟鐢熶骇鏃ユ湡
+ decimal HRelationQty = _item.PurchseFqty; // 鍏宠仈鏁伴噺
+ double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
+
+ dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + _item.FORGNumber + "' and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // 閲囪喘缁勭粐
+ long HPOOrderInterID = _item.PurchseFID; // 閲囪喘璁㈠崟鍐呯爜
+ long HPOOrderEntryID = _item.PurchseFentryID; // 閲囪喘璁㈠崟瀛愬唴鐮�
+ string HPOOrderBillNo = _item.PurchseFBillNo; // 閲囪喘璁㈠崟鍙�
+ string HErpClsID = _item.FErpClsID; // 鐗╂枡灞炴��
+ long HUnitID = 10101; // 璁￠噺鍗曚綅 鍏堟寜鐓ф湰鍦版潵 榛樿 Pcs
+ string HSeOrderBillNo = _item.FXQD; // 閿�鍞鍗曞彿 闇�姹傚崟鍙�
+ string HOrderEmpID = _item.FCREATORID; // 閲囪喘鍛�
+ DateTime HPOOrderBillDate = _item.FDate; // 閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+ DateTime HPOOrderBillDeliveryDate = _item.FDeliveryDate; // 閲囪喘璁㈠崟浜よ揣鏃ユ湡
+ string HPOOrderBillRemark = _item.F_QIMB_NOTE; // 閲囪喘璁㈠崟鎽樿
+ string HPOOrderBillNote = _item.FNOTE; // 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FWORKSHOPNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
+ HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 鐢熶骇杞﹂棿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
+ string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 閲囪喘閮ㄩ棬
+
+ decimal HPURCHASEQTY = _item.FPURCHASEQTY; // 閲囪喘璁㈠崟鏁伴噺
+ decimal HJoinQty = _item.FJOINQTY; // 閲囪喘璁㈠崟鍏宠仈鏁伴噺
+
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
+ ", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
+ ", HPURCHASEORGID, HStatus, HFixleadTime, HDayPlanBillNo, HSourceInterID" +
+ ", HSourceEntryID, HSourceBillNo, HSourceBillType, HWorkShopID, HDayPlanDate" +
+ ", HRelationQty1, HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HPOOrderBillSEQ" +
+ ", HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo, HPurchaseDeptID, HCloseTypeSub" +
+ ", HCloseMan, HEntryCloseDate, HSendQty, HReciveQty, HCloseStatus" +
+ ", HRemoveQty, HSeOrderBillNo, HUnReciveQty, HPOOrderBillDate, HPOOrderBillDeliveryDate" +
+ ", HPOOrderBillRemark, HPOOrderBillNote)" +
+ $"values({HInterID}, {i}, '', {(HMaterID == null ? "0" : HMaterID)}, '{HMaterName}'" +
+ $", '{HMaterModel}', {HUnitID}, '{HErpClsID}', {HQty}, ''" +
+ $", {HPURCHASEORGIDSub}, '', {HFixleadTime}, '{HDayPlanBillNo}', {HSourceInterID}" +
+ $", {HSourceEntryID}, '{HSourceBillNo}', '{HSourceBillType}', {HWorkShopID}, '{HDayPlanDate}'" +
+ $", {HRelationQty}, {HPOOrderInterID},{HPOOrderEntryID}, '{HPOOrderBillNo}',0" +
+ $",0,0, '',{HPurchaseDeptID}, '0'" +
+ $", '','',0,0, '0'" +
+ $",0, '{HSeOrderBillNo}',0, '{HPOOrderBillDate}', '{HPOOrderBillDeliveryDate}'" +
+ $", '{HPOOrderBillRemark}', '{HPOOrderBillNote}')");
+
+ }
+ //model.Add("FEntity", Fentity);
+ //FinalyResult.Add(model);
+ // if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
+ // {
+ // //LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
+ // JObject jsonRoot = new JObject()
+ // {
+ // ["Creator"] = "",
+ // ["NeedUpDateFields"] = new JArray(),
+ // ["NeedReturnFields"] = new JArray(),
+ // ["IsDeleteEntry"] = "false",
+ // ["SubSystemId"] = "",
+ // ["IsVerifyBaseDataField"] = "false",
+ // ["Model"] = FinalyResult
+ // };
+ // CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ // var result = cloudClient.BatchSave("paez_PODemandPlan", jsonRoot.ToString());
+ // JObject saveObj = JObject.Parse(result);
+ // string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ // if (saveIsSuc != "TRUE")
+ // {
+ // //LogHelper.Error(jsonRoot.ToString());
+ // }
+ // FinalyResult = new JArray();
+ // }
+ // tlmmm++;
+ }
+
+ //LogService.Write("3");
+ if (Error != "")
+ {
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩愮畻鎴愬姛!" + Error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (tlmmm == PODemandPlanList.Count && tlmmm != 0)
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩愮畻鎴愬姛!" + Error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩愮畻澶辫触!" + Error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ////sw.Stop();//缁撴潫璁℃椂
+ //////LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
+ //DBServiceHelper.ExecuteBatch(Context, sqlList);
+
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "鎻愭枡杩愮畻鎴愬姛锛�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ /// <summary>
+ /// 閫氳繃鐢熶骇鐢ㄦ枡娓呭崟 绠楃己鏂欐儏鍐�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_PPBOM(string fProWorkShopId,int? fPrdOrgId,string user,string sqlName) {
+
+ try
+ {
Stopwatch sw = new Stopwatch();
-
sw.Start();//寮�濮嬭鏃�
//鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 骞朵笖鏌ヨ鍑洪渶瑕佽繘琛岃繍绠楃殑鏁版嵁
@@ -1545,32 +2565,13 @@
//t2.FXQD t2.FSTOCKINQTY,t2.FReceiveQty 鏈湴娌℃湁杩欎簺瀛楁
string sql = string.Format(@"
- /*dialect*/
-select t4.FSTOCKINQTY,t4.FReceiveQty,t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount)FQTY
-,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FCloseStatus,FMRPCLOSESTATUS,FPURCHASEDEPTID,t7.FNUMBER as FPURCHASEDEPTNUMBER
-,t1.FCREATORID,t8.FName ,t1.FDate,tD.FDeliveryDate,t2.FNOTE,(t4.FReceiveQty - t4.FSTOCKINQTY) as FReceiveNotInQty,'' FXQD,T2.FQTY AS FPURCHASEQTY,FJOINQTY,
-isnull((select top 1 HLeadTime + HLeadTime_Sec from Cg_PODemandPlanConfigBillMain a
-join Cg_PODemandPlanConfigBillSub b on a.HInterID =b.HInterID
-left join Xt_ORGANIZATIONS o on a.HOrgID=o.HItemID
-left join Gy_Supplier s on b.HSupplierID=s.HItemID
- where o.HNumber = t5.FNUMBER and s.HNumber = t3.FNUMBER), 0)FFIXLEADTIME
-from AIS20210811135644..t_PUR_POOrder t1
-join AIS20210811135644..t_PUR_POOrderEntry t2 on t1.FID = t2.FID
-join AIS20210811135644..t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
-join AIS20210811135644..T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
-join AIS20210811135644..T_PUR_POORDERENTRY_D tD on t2.FENTRYID = tD.FENTRYID
-join AIS20210811135644..T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
-join AIS20210811135644..T_SEC_user t8 on t1.FCREATORID = t8.FuserId
-join AIS20210811135644..T_BD_DEPARTMENT T7 ON t1.FPURCHASEDEPTID = T7.FDEPTID
-where t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount>0
-and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
-and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
-and FPurchaseOrgId = '{0}'
-", fPrdOrgId);
+select * from h_v_jit_POOrderList where FQTY>0 and FCloseStatus in('A')
+and FMRPCLOSESTATUS in('A') and FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142') and FStockOrgId = '{0}'", fPrdOrgId);
- ds = oCN.RunProcReturn(sql, "PurchaseInventoryList");
+ ds = oCN.RunProcReturn(sql, "h_v_jit_POOrderList");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count == 0)
+ {
oCN.RollBack();//鍥炴粴浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1830,29 +2831,29 @@
foreach (var item in PODemandPlanList)
{
tlmmm++;
-
+
DateTime date = item.FHMASTERDATE;
long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
- var dataSup= oCN.RunProcReturn(@"select * from Gy_Supplier p
- inner join AIS20210811135644..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
- where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='"+ fPrdOrgId + "'", "Gy_Supplier");
+ var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
+ inner join " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
+ where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Supplier");
long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //渚涘簲鍟�
var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//鍒跺崟浜�
string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//淇敼浜�
- var dataOrg= oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
- inner join AIS20210811135644..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //閲囪喘缁勭粐
string PurchseFNUMBER = item.PurchseFNUMBER;
- string FWorkshopNumber = item.FWORKSHOPNUMBER;
+ string FWorkshopNumber = item.FWORKSHOPNUMBER;
string FCreatorID = item.FCREATORID;
- var HInterID= DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
+ var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);
//涓昏〃
oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
@@ -1864,7 +2865,6 @@
$"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
$",'','','{HUpDater}',getdate())");
- JArray Fentity = new JArray();
List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER && x.FWORKSHOPNUMBER == FWorkshopNumber && x.FCREATORID == FCreatorID).ToList();
int i = 0;
foreach (var _item in _PODemandPlanList)
@@ -1872,7 +2872,7 @@
i++;
var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
- inner join AIS20210811135644..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ inner join " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
where FNUMBER='" + _item.FNumber + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Material");
string HMaterID = "0"; //鐗╂枡
string HMaterModel = ""; //鐗╂枡浠ｇ爜
@@ -1894,7 +2894,7 @@
double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
- inner join AIS20210811135644..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
where FNUMBER='" + _item.FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // 閲囪喘缁勭粐
long HPOOrderInterID = _item.PurchseFID; // 閲囪喘璁㈠崟鍐呯爜
@@ -1910,13 +2910,13 @@
string HPOOrderBillNote = _item.FNOTE; // 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
- dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
- inner join AIS20210811135644..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
where FNUMBER='" + _item.FWORKSHOPNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
string HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 鐢熶骇杞﹂棿
dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
- inner join AIS20210811135644..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 閲囪喘閮ㄩ棬
@@ -1962,7 +2962,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
}
catch (Exception e)
{
@@ -1975,6 +2974,145 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 閫氳繃娆犳枡琛� 绠楁彁鏂� 瀹濆伐
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_MOMaterLack(string HWorkShopID, int? HProdORGID, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_PODemandPlanBill_MOMaterLack " + HWorkShopID.ToString() + ",'" + user + "'," + HProdORGID.ToString(), "h_p_JIT_PODemandPlanBill_MOMaterLack");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愭枡杩愮畻鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); //杩愮畻鎴愬姛
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愭枡杩愮畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閫氳繃榻愬琛� 绠楁彁鏂�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_MOMaterReady(string HWorkShopID, int? HProdORGID, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_PODemandPlanBill_MOMaterReady " + HWorkShopID.ToString() + ",'" + user + "'," + HProdORGID.ToString(), "h_p_JIT_PODemandPlanBill_MOMaterReady");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愭枡杩愮畻鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); //杩愮畻鎴愬姛
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愭枡杩愮畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑕佹枡杩愮畻
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_YLYS")]
+ [HttpGet]
+ public object JIT_YLYS(string sWhere, string user)
+ {
+ try
+ {
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+ string HWorkShopID = omdelMian.HWorkShopID.ToString();
+ var HStockOrgID = omdelMian.HProdORGID;
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_WorkDemandPlanBill_MOMaterReady " + HWorkShopID.ToString() + ",'" + user + "'," + HStockOrgID.ToString(), "h_p_JIT_WorkDemandPlanBill_MOMaterReady");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑕佹枡杩愮畻鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); //杩愮畻鎴愬姛
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑕佹枡杩愮畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#endregion
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
@@ -2035,6 +3173,58 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾宸ュ崟
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedOrder")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHLockedOrder(string HInterIDs)
+ {
+ try
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HLockOrder = 1 where HInterID in ({HInterIDs})");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑙ｉ攣宸ュ崟
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockOrder")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHUnlockOrder(string HInterIDs)
+ {
+ try
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HLockOrder = 0 where HInterID in ({HInterIDs})");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鐢熶骇璁㈠崟鏌ヨ
[Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillList")]
[HttpGet]
@@ -2056,7 +3246,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString() + ",鏄庣粏琛屽彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + dt.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString() + ",鏄庣粏琛屽彿:" + dt.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2112,5 +3302,619 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭�
+ [Route("JIT_DayPlanPlatFormBill/ReadyData")]
+ [HttpGet]
+ public object ReadyData(string SWhere)
+ {
+ try
+ {
+ var list = SWhere.Split(',');
+ DataTable dt = new DataTable("date");
+ dt.Columns.Add("HICMOInterID", typeof(string));
+ dt.Columns.Add("HICMOEntryID", typeof(string));
+ dt.Columns.Add("灏忔椂浜ц兘", typeof(string));
+ dt.Columns.Add("鐢熶骇鍛ㄦ湡", typeof(decimal));
+ dt.Columns.Add("寮�宸ヤ綑閲�", typeof(decimal));
+ dt.Columns.Add("鏈�杩熷紑宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("鏈�杩熷畬宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("璁㈠崟闇�姹傛暟閲�", typeof(decimal));
+ dt.Columns.Add("璁㈠崟浜よ揣鏈�", typeof(DateTime));
+
+ for (int i = 0; i < list.Length; i++)
+ {
+ 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+","+ HSourceID, "h_p_Sc_GetInfoByICMOBillNo");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ DataRow dr = dt.NewRow();
+ dr["灏忔椂浜ц兘"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["浜ц兘"]);
+ dr["鐢熶骇鍛ㄦ湡"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["鐢熶骇鍛ㄦ湡"]);
+ dr["寮�宸ヤ綑閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["寮�宸ヤ綑閲�"]);
+ dr["鏈�杩熷紑宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷紑宸ユ棩鏈�"]);
+ dr["鏈�杩熷畬宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷畬宸ユ棩鏈�"]);
+ dr["璁㈠崟闇�姹傛暟閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟"]);
+ dr["璁㈠崟浜よ揣鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["璁㈠崟浜よ揣鏈�"]);
+ dr["HICMOInterID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOInterID"]);
+ dr["HICMOEntryID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ dt.Rows.Add(dr);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭�(涓夊崌)
+ [Route("JIT_DayPlanPlatFormBill/ReadyData_SS")]
+ [HttpGet]
+ public object ReadyData_SS(string SWhere)
+ {
+ try
+ {
+ var list = SWhere.Split(',');
+ DataTable dt = new DataTable("date");
+ dt.Columns.Add("HICMOInterID", typeof(string));
+ dt.Columns.Add("HICMOEntryID", typeof(string));
+ dt.Columns.Add("灏忔椂浜ц兘", typeof(string));
+ dt.Columns.Add("鐢熶骇鍛ㄦ湡", typeof(decimal));
+ dt.Columns.Add("寮�宸ヤ綑閲�", typeof(decimal));
+ dt.Columns.Add("鏈�杩熷紑宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("鏈�杩熷畬宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("璁㈠崟闇�姹傛暟閲�", typeof(decimal));
+ dt.Columns.Add("璁㈠崟浜よ揣鏈�", typeof(DateTime));
+ dt.Columns.Add("HSourceID", typeof(decimal));
+ dt.Columns.Add("鐢熶骇璧勬簮", typeof(string));
+
+ for (int i = 0; i < list.Length; i++)
+ {
+ 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 + "," + HSourceID, "h_p_Sc_GetInfoByICMOBillNo");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ DataRow dr = dt.NewRow();
+ dr["HSourceID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HSourceID"]);
+ dr["鐢熶骇璧勬簮"] = ds.Tables[0].Rows[0]["鐢熶骇璧勬簮"].ToString();
+ dr["灏忔椂浜ц兘"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["浜ц兘"]);
+ dr["鐢熶骇鍛ㄦ湡"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["鐢熶骇鍛ㄦ湡"]);
+ dr["寮�宸ヤ綑閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["寮�宸ヤ綑閲�"]);
+ dr["鏈�杩熷紑宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷紑宸ユ棩鏈�"]);
+ dr["鏈�杩熷畬宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷畬宸ユ棩鏈�"]);
+ dr["璁㈠崟闇�姹傛暟閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟"]);
+ dr["璁㈠崟浜よ揣鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["璁㈠崟浜よ揣鏈�"]);
+ dr["HICMOInterID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOInterID"]);
+ dr["HICMOEntryID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ dt.Rows.Add(dr);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂烘枡鍒嗘瀽鎶ヨ〃
+ public class MaterialShorAnalysis
+ {
+ public int? HORGID;
+ public DateTime HBEGINDATE;
+ public DateTime HENDDATE;
+ }
+ [Route("JIT_DayPlanPlatFormBill/MaterialShorAnalysisReport")]
+ [HttpGet]
+ public object MaterialShorAnalysisReport(string sWhere)
+ {
+ try
+ {
+ MaterialShorAnalysis Report = JsonConvert.DeserializeObject<MaterialShorAnalysis>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_MaterialShorAnalysisReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}' ", "h_p_JIT_PODemandPlanBill_ReportList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鐗╂枡ID鑾峰彇宸ヨ壓璺嚎 鍒楄〃
+ [Route("JIT_DayPlanPlatFormBill/GetRoutingListByMater")]
+ [HttpGet]
+ public object GetRoutingListByMater(int HMaterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ int IsHavingPermissions = 1;
+
+ //鍒ゆ柇鏄惁鏈夊伐鑹鸿矾绾跨紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ IsHavingPermissions = 0;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_JIT_GetRoutingList_Mater where HMaterID = " + HMaterID , "h_v_JIT_GetRoutingList_Mater");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鐗╂枡娌℃湁缁存姢宸ヨ壓璺嚎锛佽鑱旂郴璁″垝閮ㄨ繘琛岀淮鎶�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.IsHavingPermissions = IsHavingPermissions;
+ return objJsonResult;
+ }
+ else
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ objJsonResult.IsHavingPermissions = IsHavingPermissions;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏍规嵁杞﹂棿娣诲姞鏈帓浜х敓浜ц鍗�
+ [Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept")]
+ [HttpGet]
+ public object JIT_ICMOBillListByDept(string HDeptID)
+ {
+ try
+ {
+ //鑾峰彇鏄剧ず绯荤粺鍙傛暟
+ string sReturn = "";
+ oSystemParameter.ShowBill(ref sReturn);
+
+ //鏌ヨ閫夋嫨杞﹂棿涓湭鎺掍骇杩囩殑鐢熶骇璁㈠崟淇℃伅锛堟坊搴风鎶�--鐢熶骇璁㈠崟鐘舵�佷负涓嬭揪锛�
+ ds = oCN.RunProcReturn($"exec h_p_JIT_ICMOBillListByDept '{HDeptID}'", "h_p_JIT_ICMOBillListByDept");
+
+ if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //鏁版嵁琛ㄦ牸娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 180; j++)
+ {
+ ds.Tables[0].Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+ }
+ else
+ {
+ //鏁版嵁琛ㄦ牸娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 31; j++)
+ {
+ ds.Tables[0].Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鏁版嵁锛屽綋鍓嶆墍閫夎溅闂翠笅鏆傛棤鏈帓浜т笖璁㈠崟鐘舵�佷负涓嬭揪鐨勭敓浜ц鍗曚俊鎭紒";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鐩戝惉鍗曞厓鏍兼暟鎹慨鏀规煇涓�澶╃殑鎺掍骇鏁伴噺
+ [Route("JIT_DayPlanPlatFormBill/UpdateDayPlanQty")]
+ [HttpGet]
+ public object UpdateDayPlanQty(int HWorkBillSortInterID, string HMasterDate, string HQty, string HSumWorkQty)
+ {
+ try
+ {
+ string sql = $"exec h_p_JIT_UpdateDayPlanQty {HWorkBillSortInterID},'{HMasterDate}','{HQty}','{HSumWorkQty}'";
+
+ //鏇存柊鎴栨柊澧炶鍗曟煇涓�澶╃殑鎺掍骇鏁伴噺
+ oCN.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎺掍骇鏁伴噺淇敼鎴愬姛锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎺掍骇鏁伴噺淇敼澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏍规嵁杞﹂棿娣诲姞鏈帓浜х敓浜ц鍗曪紙浜ゆ湡鍥炲鎶撳彇锛�
+ [Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept_Reply")]
+ [HttpGet]
+ public object JIT_ICMOBillListByDept_Reply(string HDeptID)
+ {
+ try
+ {
+ //鑾峰彇鏄剧ず绯荤粺鍙傛暟
+ string sReturn = "";
+ oSystemParameter.ShowBill(ref sReturn);
+
+ //鏌ヨ閫夋嫨杞﹂棿涓湭鎺掍骇杩囩殑鐢熶骇璁㈠崟淇℃伅锛堟坊搴风鎶�--鐢熶骇璁㈠崟鐘舵�佷负涓嬭揪锛�
+ ds = oCN.RunProcReturn($"exec h_p_JIT_ICMOBillListByDept_Reply '{HDeptID}'", "h_p_JIT_ICMOBillListByDept_Reply");
+
+ if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //鏁版嵁琛ㄦ牸娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 180; j++)
+ {
+ ds.Tables[0].Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+ }
+ else
+ {
+ //鏁版嵁琛ㄦ牸娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 31; j++)
+ {
+ ds.Tables[0].Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鏁版嵁锛屽綋鍓嶆墍閫夎溅闂翠笅鏆傛棤鏈帓浜т笖璁㈠崟鐘舵�佷负涓嬭揪鐨勭敓浜ц鍗曚俊鎭紒";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鑾峰彇瀹屽伐鏃ユ湡
+ [Route("JIT_DayPlanPlatFormBill/GetICMOCompletionDate")]
+ [HttpGet]
+ public object GetICMOCompletionDate(string HDeptID)
+ {
+ try
+ {
+ //鏇存柊鏃ヨ鍒掑伐鍗曠殑瀹屽伐鏃ユ湡
+ oCN.RunProc($"exec h_p_JIT_GetICMOCompletionDate '{HDeptID}'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇瀹屽伐鏃ユ湡鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鑾峰彇鏈�鏃╁紑宸ユ棩鏈�
+ [Route("JIT_DayPlanPlatFormBill/GetICMOEarlyDate")]
+ [HttpGet]
+ public object GetICMOEarlyDate(string HDeptID)
+ {
+ try
+ {
+ //鏇存柊鐢熶骇璁㈠崟鐨勬渶鏃╁紑宸ユ棩鏈�
+ oCN.RunProc($"exec h_p_JIT_GetICMOEarlyDate '{HDeptID}'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鏈�鏃╁紑宸ユ棩鏈熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫氳繃鐗╂枡鍖归厤浜у搧鍣ㄥ叿娓呭崟
+ [Route("JIT_DayPlanPlatFormBill/GetMouldByMater")]
+ [HttpGet]
+ public object GetMouldByMater(string HMaterID,string HSourceID,string HPCDate)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialMouldByMater " + HMaterID + "," + HSourceID + ",'" + HPCDate + "'", "h_p_Gy_MaterialMouldByMater");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫氳繃璧勬簮鍖归厤璧勬簮鍣ㄥ叿娓呭崟
+ [Route("JIT_DayPlanPlatFormBill/GetMouldBySource")]
+ [HttpGet]
+ public object GetMouldBySource(string HSourceID, string HMouldID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceMouldBillMainList where HSourceID = " + HSourceID + " and HMouldID = " + HMouldID, "h_v_Gy_SourceMouldBillMainList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎺掍骇鍚庡皢鍣ㄥ叿鍗犵敤鏃堕棿鍐欏叆鏁版嵁搴�
+ [Route("JIT_DayPlanPlatFormBill/AddMouldOccupancyTime")]
+ [HttpGet]
+ public object AddMouldOccupancyTime(string HMouldID, string HSourceID, string HICMOInterID, string HICMOEntryID, string HICMOBillNo, string HMouldPCTime)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_JIT_AddMouldOccupancyTime " + HMouldID + "," + HSourceID + "," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HMouldPCTime + "'", "h_p_JIT_AddMouldOccupancyTime");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫氳繃涓昏祫婧愬尮閰嶅瓙璧勬簮
+ [Route("JIT_DayPlanPlatFormBill/GetChildSource")]
+ [HttpGet]
+ public object GetChildSource(string HSourceID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select HItemID 瀛愯祫婧怚D,HNumber 瀛愯祫婧愪唬鐮�,HName 瀛愯祫婧愬悕绉�,HCubicleQty 瀛愯祫婧愬伐浣嶆暟 from Gy_Source with(nolock) where HParentID = " + HSourceID + " order by HName asc", "Gy_Source");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒ゆ柇鐗╂枡鏄惁鍙互鏀惧湪鍚屼竴璧勬簮涓婁竴璧风敓浜�
+ [Route("JIT_DayPlanPlatFormBill/GetSourceByMater")]
+ [HttpGet]
+ public object GetSourceByMater(string HMaterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ICMOGetWorkSource_TK " + HMaterID + ",'',''", "h_p_Sc_ICMOGetWorkSource_TK");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭璐熻嵎鍒嗘瀽姹囨�绘姤琛� 鏌ヨ
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("JIT_DayPlanPlatFormBill/JIT_FuHeFenXiReport")]
+ [HttpGet]
+ public object JIT_FuHeFenXiReport(string sWhere, string user)
+ {
+ try
+ {
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("JIT_FuHeFenXiReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> columnNameList = new List<object>();
+ string sql = "exec h_p_JIT_FuHeFenXiReport '" + sWhere + "','" + user + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_JIT_FuHeFenXiReport");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1