From c23b8434054d5de5ef8575e25c4441ede6c6ac2d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期日, 09 十月 2022 15:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 24 +++++++++++++++++++-----
APSM/装配智能排程/Sc_ICMOAutoSortBill.cs | 4 ++--
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 4 ++--
APSM/装配智能排程/Sc_ICMOAutoSortBill.designer.cs | 9 ++++++++-
APSM/Sc_ICMOSortBillFun.cs | 4 ++--
APSM/装配智能排程/Sc_ICMOAutoSortBill.resx | 12 ++++++------
6 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/APSM/Sc_ICMOSortBillFun.cs b/APSM/Sc_ICMOSortBillFun.cs
index 39d6cdb..31418ba 100644
--- a/APSM/Sc_ICMOSortBillFun.cs
+++ b/APSM/Sc_ICMOSortBillFun.cs
@@ -2002,7 +2002,7 @@
{
if (sLeftQty > 0)
{
- if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["日期"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag))
+ if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["日期"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag)) //表格的标题上 保存了日期；
{
//如果时间被 上道余量占用 则 跳过
b = false;
@@ -2044,7 +2044,7 @@
oClsGridValues.Add(oSub);
}
}
- else
+ else //卓力不需要考虑加班，下面的这一段不需要
{
if (sLeftQty > sWorkQty * DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[i]["最大剩余工时"]))
{
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
index 18e8fa9..ffc531e 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
@@ -692,7 +692,7 @@
//判断资源剩余工时，是否大于 生产周期
if (DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[j]["剩余工时"]) > sLeftProdTimes)
{
- if (iLeftQty > 0)
+ if (iLeftQty > 0) // 生产订单剩余数量
{
//在本资源上生产
//获取该生产资源的剩余工时进行排程。
@@ -705,7 +705,7 @@
dsSub = Sc_ICMOSortBillFun.GetWorkSourceTimeBySource(oCn, lSourceID);
if (dsSub == null || dsSub.Tables[0].Rows.Count == 0)
{
- continue;
+ continue;//如果没有剩余则 执行下一个生产订单
}
if (dsSub != null )//不加班排程
{
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
index f05e6a7..396a38b 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
@@ -107,6 +107,7 @@
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spc1)).BeginInit();
this.spc1.Panel1.SuspendLayout();
this.spc1.Panel2.SuspendLayout();
this.spc1.SuspendLayout();
@@ -866,12 +867,13 @@
this.grdSourceBill.Margin = new System.Windows.Forms.Padding(4);
this.grdSourceBill.Name = "grdSourceBill";
this.grdSourceBill.ReadOnly = true;
+ this.grdSourceBill.RowHeadersWidth = 51;
this.grdSourceBill.RowTemplate.Height = 23;
this.grdSourceBill.Size = new System.Drawing.Size(1571, 745);
this.grdSourceBill.TabIndex = 20;
this.grdSourceBill.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSourceBill_CellBeginEdit);
- this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit);
this.grdSourceBill.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellClick);
+ this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit);
this.grdSourceBill.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdSourceBill_EditingControlShowing);
this.grdSourceBill.KeyDown += new System.Windows.Forms.KeyEventHandler(this.grdSourceBill_KeyDown);
//
@@ -898,6 +900,7 @@
this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1571, 745);
this.grdMain.TabIndex = 21;
@@ -941,6 +944,7 @@
this.grdSource.Margin = new System.Windows.Forms.Padding(4);
this.grdSource.Name = "grdSource";
this.grdSource.ReadOnly = true;
+ this.grdSource.RowHeadersWidth = 51;
this.grdSource.RowTemplate.Height = 23;
this.grdSource.Size = new System.Drawing.Size(1571, 0);
this.grdSource.TabIndex = 0;
@@ -968,6 +972,7 @@
this.grdICMO.Margin = new System.Windows.Forms.Padding(4);
this.grdICMO.Name = "grdICMO";
this.grdICMO.ReadOnly = true;
+ this.grdICMO.RowHeadersWidth = 51;
this.grdICMO.RowTemplate.Height = 23;
this.grdICMO.Size = new System.Drawing.Size(1571, 0);
this.grdICMO.TabIndex = 1;
@@ -994,6 +999,7 @@
this.grdProcFlow.Margin = new System.Windows.Forms.Padding(4);
this.grdProcFlow.Name = "grdProcFlow";
this.grdProcFlow.ReadOnly = true;
+ this.grdProcFlow.RowHeadersWidth = 51;
this.grdProcFlow.RowTemplate.Height = 23;
this.grdProcFlow.Size = new System.Drawing.Size(1579, 7);
this.grdProcFlow.TabIndex = 2;
@@ -1022,6 +1028,7 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.spc1.Panel1.ResumeLayout(false);
this.spc1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.spc1)).EndInit();
this.spc1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
index 607f103..07005d2 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -4204,10 +4204,10 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>95, 17</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
\ No newline at end of file
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 1cdba47..8f3a078 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"
@@ -41,7 +41,7 @@
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).AddSeconds(-1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -187,6 +187,7 @@
var HOrderLev = list[i]["璁㈠崟绛夌骇"].ToString();
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
+ var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
if (HSourceID == "")
{
@@ -219,14 +220,14 @@
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
- "HMainSourceInterID,HMainSourceEntryID)values" +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)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},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})");
}
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)}'");
@@ -738,7 +739,7 @@
from
(
select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
---where a.HInterID IN ({0})
+where a.HInterID IN ({0})
group by HICMOEntryID_Sec
) a
join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
@@ -1159,10 +1160,23 @@
{
try
{
-
+ DataSet dt = new DataSet();
oCN.RunProc("exec h_p_ICMOBillList_PrimarySubTable");
ds = oCN.RunProcReturn($"select * from ##ICMOBillList where 婧愬崟涓诲唴鐮� in({hmainid}) and 婧愬崟瀛愬唴鐮� in({HEntryID})", "##ICMOBillList");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[i]["婧愬崟涓诲唴鐮�"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[i]["婧愬崟瀛愬唴鐮�"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
+ if (dt.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:"+ ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString()+",鏄庣粏琛屽彿:"+ ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index 5bb73e9..aaa2eef 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -292,13 +292,13 @@
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
" HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
- "HMainSourceInterID,HMainSourceEntryID,HProdORGID)values" +
+ "HMainSourceInterID,HMainSourceEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
$" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
- $" {HMainSourceInterID},{HMainSourceEntryID},{HProdORGID})");
+ $" {HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID})");
}
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
--
Gitblit v1.9.1