From 765eb429bdcbffc29df0168966f94a9c5ae92fbd Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 23 十一月 2022 15:43:50 +0800
Subject: [PATCH] 代码上传
---
MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 107 +++++++++++++++++++++++++++--------------------------
MES/src/BLL/Demo.BillView/PRD/SalOrderSaveVal.cs | 4 +-
2 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index c1d3dd0..c10f07d 100644
--- a/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -712,7 +712,7 @@
if (yzfid == 0)
break;
}
-
+
//閫夊崟鏁版嵁 鍋氭柊澧�
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -872,6 +872,8 @@
},
(t) => { });
}
+
+ [Obsolete]
private void COMPLETEBOM()
{
// 鏄剧ず涓�涓繘搴︽樉绀虹晫闈細鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害
@@ -912,8 +914,8 @@
{
processView.Close();
this.View.SendDynamicFormAction(processView);
- this.View.ShowMessage(resuult);
}
+ this.View.ShowMessage(resuult);
}
},
(t) => { });
@@ -1286,10 +1288,10 @@
DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT);
LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
-// DBServiceHelper.Execute(Context, @"
-///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '鏈綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
-// DBServiceHelper.Execute(Context, @"
-///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
+ // DBServiceHelper.Execute(Context, @"
+ ///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '鏈綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
+ // DBServiceHelper.Execute(Context, @"
+ ///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
//閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
DBServiceHelper.Execute(Context, $"/*dialect*/ update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={fPrdOrgId} and FSTATUS = 1 ");
sw.Stop();//缁撴潫璁℃椂
@@ -1307,10 +1309,10 @@
//鏀舵枡閫氱煡鍗� 榻愬鍒嗘瀽
public string CompleteSetAnalysisByDataTableBom()
{
- LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
string sql = "";
try
{
+ LogService.Write("榻愬 bom ");
Stopwatch sw = new Stopwatch();
var fPrdOrgId = (this.Model.GetValue("FPRDOrgId") as DynamicObject)?["Id"].ToString();
string fProWorkShopId = "";
@@ -1326,6 +1328,7 @@
}
List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
string procSql = $"exec proc_jit_qtfx {fPrdOrgId},{fProWorkShopId},{Context.UserId}";
+ LogService.Write("榻愬 bom sql锛�" + procSql);
DataSet _ds = DBServiceHelper.ExecuteDataSet(Context, procSql);
DataTable resulTable = _ds.Tables[0];
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
@@ -1379,6 +1382,7 @@
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬昏鏁帮細" + BomList.Count);
//绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
+ //绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
foreach (var item in DatePlanList)
{
this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(75) / DatePlanList.Count) * i);
@@ -1419,43 +1423,46 @@
decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
//鎵惧埌棰嗙敤鏁伴噺
var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.FPRDMOENTYID && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
- if (_DayPlanPickedModel.FRemainPickedQty >= need)
+ if (_DayPlanPickedModel != null)
{
- //棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
- completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ if (_DayPlanPickedModel.FRemainPickedQty >= need)
{
- FHMainICMOInterIDr = _item.FPRDMOMAINID,
- FHMainICMOEntryID = _item.FPRDMOENTYID,
- FHICMOInterID = _item.FID.ToString(),
- FHICMOEntryID = _item.FEntryID.ToString(),
- FHMaterID = _item.FMATERIALID2,
- FErpClsID = _item.FErpClsID,
- FHStockOrgID = _item.FStockOrgId,
- FHPRDORGID = _item.FStockOrgId,
- FPRDBillNo = _item.FMOBillNO,
- FOwnerTypeId = "",
- FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
- FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
- FCompleteCount1 = planNeed, //榻愬鏁伴噺
- FLackCount = 0,//缂烘枡鏁伴噺
- FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
- FHLeftQty = jskcQty,//鍙敤鏁伴噺
- FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
- FOccupyPickedCount = planNeed,//鍗犵敤棰嗘枡鏁伴噺
- FComPlete = "榻愬",
- FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
- FWorkShop = _item.FHWorkShopID //杞﹂棿
- });
- //鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
- _DayPlanPickedModel.FRemainPickedQty -= need;
- //寰幆涓嬩竴涓墿鏂�
- continue;
- }
- else
- {
- need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
- FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
- _DayPlanPickedModel.FRemainPickedQty = 0;
+ //棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
+ completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.FPRDMOMAINID,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "",
+ FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
+ FCompleteCount1 = planNeed, //榻愬鏁伴噺
+ FLackCount = 0,//缂烘枡鏁伴噺
+ FHStockQty = jskcQty2,//鍗虫椂搴撳瓨
+ FHLeftQty = jskcQty,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FOccupyPickedCount = planNeed,//鍗犵敤棰嗘枡鏁伴噺
+ FComPlete = "榻愬",
+ FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
+ FWorkShop = _item.FHWorkShopID //杞﹂棿
+ });
+ //鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
+ _DayPlanPickedModel.FRemainPickedQty -= need;
+ //寰幆涓嬩竴涓墿鏂�
+ continue;
+ }
+ else
+ {
+ need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
+ FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
+ _DayPlanPickedModel.FRemainPickedQty = 0;
+ }
}
if (_pRD_WorkHouseCompar.Count > 0)
{
@@ -1541,7 +1548,6 @@
FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
FStock = Inventory.FSTOCKID,//浠撳簱
FWorkShop = _item.FHWorkShopID, //杞﹂棿
- FBILLNO = Inventory.FBILLNO,
FLot = Inventory.FLot
});
//鎵ｅ噺鎬诲簱瀛樻暟閲�
@@ -1554,7 +1560,7 @@
}
}
}
- //娌℃湁杞﹂棿浠撳簱鏁版嵁 鏃㈡病鏈夊彲鐢ㄥ簱瀛� 涓烘湭榻愬
+ //娌℃湁杞﹂棿浠撳簱鏁版嵁 鍗虫病鏈夊彲鐢ㄥ簱瀛� 涓烘湭榻愬
else
{
if (occupyDic.ContainsKey(_item.FHWorkShopID + _item.FMATERIALID2))
@@ -1667,12 +1673,7 @@
DBServiceHelper.Execute(Context, deletesql);
DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT);
LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
- //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
- // DBServiceHelper.Execute(Context, @"
- ///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '鏈綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
- // DBServiceHelper.Execute(Context, @"
- ///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�') and FID IN (" + fDayPlanFids + ") ");
- //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
DBServiceHelper.Execute(Context, $"/*dialect*/ update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={fPrdOrgId} and FSTATUS = 1 ");
sw.Stop();//缁撴潫璁℃椂
LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
@@ -1680,7 +1681,8 @@
}
catch (Exception ex)
{
- LogService.Write("鎿嶄綔澶辫触锛�" + ex.Message.ToString());
+ DBServiceHelper.Execute(Context, $"/*dialect*/ update T_PRD_QTFX set FSTATUS = 0 where FUSERID ={Context.UserId} and FSTATUS = 1 ");
+ LogService.Write("鎿嶄綔澶辫触锛�" + ex.Message.ToString() + ex.StackTrace);
return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
}
@@ -1998,7 +2000,6 @@
this.Model.SetValue("FOrderType", Convert.ToString(dt.Rows[i]["FOrderType"]), i);//璁㈠崟绫诲瀷
this.Model.SetValue("FStatus", Convert.ToString(dt.Rows[i]["FStatus"]), i);//璁㈠崟鐘舵��
//this.Model.SetValue("F_bsv_Text", Convert.ToString(dt.Rows[i]["F_DY"]) + Convert.ToString(dt.Rows[i]["F_GL"]) + Convert.ToString(dt.Rows[i]["F_DB"]), i);//鐢靛帇/鍔熺巼/搴曟澘
- this.Model.SetValue("FCompleteSetCount", "", i);//鎬婚綈濂楁暟閲�
this.Model.SetValue("FPriority", Convert.ToString(dt.Rows[i]["FPriority"]), i);//浼樺厛绾�
this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
this.Model.SetValue("FNoStockInQty", dt.Rows[i]["FNoStockInQty"].ToString(), i);//鏈叆搴撴暟閲�
@@ -2175,7 +2176,6 @@
this.Model.SetValue("FMOFBILLTYPE", Convert.ToString(dt.Rows[i]["FMOFBILLTYPE"]), i);//鐢熶骇璁㈠崟鍗曟嵁绫诲瀷
this.Model.SetValue("FOrderType", Convert.ToString(dt.Rows[i]["FOrderType"]), i);//璁㈠崟绫诲瀷
this.Model.SetValue("FStatus", Convert.ToString(dt.Rows[i]["FStatus"]), i);//璁㈠崟鐘舵��
- this.Model.SetValue("FCompleteSetCount", "", i);//鎬婚綈濂楁暟閲�
this.Model.SetValue("FPriority", Convert.ToString(dt.Rows[i]["FPriority"]), i);//浼樺厛绾�
this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
this.Model.SetValue("FNoStockInQty", dt.Rows[i]["FNoStockInQty"].ToString(), i);//鏈叆搴撴暟閲�
@@ -3644,6 +3644,7 @@
this.View.Model.SetValue("FDeliveryDate", Convert.ToString(item["FDeliveryDate"]), Convert.ToInt32(item["SEQ"]));//浜よ揣鏃ユ湡
this.View.Model.SetValue("FKpQty", Convert.ToString(item["FKpQty"]), Convert.ToInt32(item["SEQ"]));//鍙帓鏁伴噺
this.View.Model.SetValue("FResourcesId", Convert.ToString(item["FResourcesId_Id"]), Convert.ToInt32(item["SEQ"]));//鐢熶骇璧勬簮
+ this.View.Model.SetValue("FT0", Convert.ToString(item["FT0"]), Convert.ToInt32(item["SEQ"]));
}
}
else
diff --git a/MES/src/BLL/Demo.BillView/PRD/SalOrderSaveVal.cs b/MES/src/BLL/Demo.BillView/PRD/SalOrderSaveVal.cs
index 4f50b7b..887eb91 100644
--- a/MES/src/BLL/Demo.BillView/PRD/SalOrderSaveVal.cs
+++ b/MES/src/BLL/Demo.BillView/PRD/SalOrderSaveVal.cs
@@ -51,8 +51,8 @@
var FOrderQuantity = DBServiceHelper.ExecuteScalar<decimal>(Context, "select Fqty from t_prd_moentry where fentryid ="+ FPRDMOENTYID.ToString(), 0);
string sql = $"select convert(decimal(18,2),sum(FDayPlanQuantity)) from Sc_WorkBillSortBillMain where FPRDMOENTYID = {FPRDMOENTYID} and (FMoEntryId = 0 or FMoEntryId = FPRDMOENTYID ) and FID <>{FID}";
decimal FOrderCount = DBServiceHelper.ExecuteScalar<decimal>(Context, sql, 0);
- LogService.Write("sql:" + sql);
- LogService.Write("FOrderCount:" + FOrderCount);
+ //LogService.Write("sql:" + sql);
+ //LogService.Write("FOrderCount:" + FOrderCount);
bool isSave = FOrderCount + FDayPlanQuantity > FOrderQuantity;
if (isSave)
--
Gitblit v1.9.1