From dfbc0389d6b9b2bd8e92e976248b9992a03979f4 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 08 九月 2021 13:23:26 +0800
Subject: [PATCH] 提料生成送货单 下推数量 =提料计划数量 - 已生成送货单数量
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 460 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 337 insertions(+), 123 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index eef07d7..feda2e4 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -5,69 +5,47 @@
using Kingdee.BOS.Orm.DataEntity;
using Kingdee.BOS.ServiceHelper.Excel;
using Kingdee.BOS.Util;
+using Kingdee.BOS.ServiceHelper;
+
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using Newtonsoft.Json.Linq;
-using Kingdee.BOS.WebApi.Client;
-using ZD.Cloud.WebApi;
-using Kingdee.BOS.Core;
-using Kingdee.BOS.Core.DynamicForm;
-using Kingdee.BOS.KDThread;
-using Kingdee.BOS.ServiceHelper;
-using Demo.TimedTaskPlugIn.PRD;
using ZD.Cloud.Logger;
-
+using Demo.Model.Model;
+using System.Linq;
+using ZD.Share.Common;
+using ZD.Cloud.WebApi;
+using Demo.Utility;
namespace Demo.BillView.PRD
{
-
[Description("鐢熶骇鏃ヨ鍒掑鍏�")]
[HotUpdate]
public class Pro_ScDayImport : AbstractDynamicFormPlugIn
{
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
private string fileFullPath = string.Empty;
- //public override void BarItemClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.BarItemClickEventArgs e)
+
+ //public override void OnLoad(EventArgs e)
//{
- // base.BarItemClick(e);
- // if (e.BarItemKey.ToUpper().Equals("TBIMPORT"))
- // {
- // }
-
- // if (e.BarItemKey.ToUpper().Equals("TBWJSC"))
- // {
- // //Control updateControl = this.View.GetControl("fileFullPath");
- // //// 涓婁紶鍦板潃
- // //string uploadUrl = "FileUpLoadServices/FileService.svc/upload2attachment/";
- // //updateControl.SetCustomPropertyValue("ExtandUrl", uploadUrl);
- // //// 涓嬭浇鍦板潃
- // //string downloadUrl = "FileUpLoadServices/download.aspx";
- // //updateControl.SetCustomPropertyValue("ExDownLoadUrl", downloadUrl);
-
- // ImportData(fileFullPath);
- // }
-
+ // base.OnLoad(e);
+ // throw new Exception("1");
//}
- public override void AfterBarItemClick(AfterBarItemClickEventArgs e)
+ public override void BarItemClick(BarItemClickEventArgs e)
{
- base.AfterBarItemClick(e);
+ LogHelper.Info("瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳锛�");
if (e.BarItemKey.ToUpper().Equals("TBIMPORT"))
{
+ LogHelper.Info("瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳锛�");
ImportData();
+ //WriteImportLog();
+ //this.View.ShowErrMessage("娴嬭瘯瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳");
}
if (e.BarItemKey.ToUpper().Equals("TBWJSC"))
{
- //Control updateControl = this.View.GetControl("fileFullPath");
- //// 涓婁紶鍦板潃
- //string uploadUrl = "FileUpLoadServices/FileService.svc/upload2attachment/";
- //updateControl.SetCustomPropertyValue("ExtandUrl", uploadUrl);
- //// 涓嬭浇鍦板潃
- //string downloadUrl = "FileUpLoadServices/download.aspx";
- //updateControl.SetCustomPropertyValue("ExDownLoadUrl", downloadUrl);
-
+ LogHelper.Info("鏂囦欢涓婁紶鍔熻兘鐐瑰嚮鎸夐挳锛�");
ImportDataSC(fileFullPath);
}
}
@@ -103,52 +81,92 @@
{
if (!string.IsNullOrEmpty(fileFullPath))
{
- DataSet ds = helper.ReadFromFile(fileFullPath, 1);
+ NpoiHelper np = new NpoiHelper();
+ DataSet ds = np.ReadExcel(fileFullPath, 1);
DataTable dt = ds.Tables[0];
-
+ RemoveEmpty(dt);//鍘婚櫎绌鸿
+ dt.Rows.RemoveAt(0);//鍘婚櫎鏍囬琛�
+ //DataSet ds = helper.ReadFromFile(fileFullPath, 1);
+ //DataTable dt = ds.Tables[0];
+ LogHelper.Info("瀵煎叆鍔熻兘锛歞t琛屾暟锛�" + dt.Rows.Count);
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
if (dt.Rows.Count > 0)
{
- //Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
- //DynamicObjectCollection rows = this.Model.GetEntityDataObject(entity);
- this.Model.DeleteEntryData("FEntity");
-
+ //楠岃瘉瀵煎叆妯℃澘
+ string ErrorResult = "";
+ string error = "";
for (int i = 0; i < dt.Rows.Count; i++)
{
- //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
- string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
+ error = "";
+ if (dt.Rows[i][1].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;";
+ if (dt.Rows[i][2].ToString() == "")
+ error += "鐢熶骇璁㈠崟鏄庣粏琛屽彿涓嶈兘涓虹┖;";
+ if (dt.Rows[i][3].ToString() == "")
+ error += "鐢熶骇杞﹂棿涓嶈兘涓虹┖;";
+ if (dt.Rows[i][5].ToString() == "")
+ error += "浜у搧浠ｇ爜涓嶈兘涓虹┖;";
+ if (dt.Rows[i][13].ToString() == "")
+ error += "浜よ揣鏃ユ湡涓嶈兘涓虹┖;";
+ if (dt.Rows[i][14].ToString() == "")
+ error += "璁㈠崟绛夌骇涓嶈兘涓虹┖;";
+
+ if (error.Length > 0)
+ ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n";
+ }
+ if (ErrorResult.Length > 0)
+ {
+ this.View.ShowErrMessage(ErrorResult);
+ return;
+ }
+ this.Model.DeleteEntryData("FEntity");
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏(2.28+鐢熶骇璁㈠崟鏄庣粏琛屽彿楠岃瘉)
+ string sql = string.Format(@"/*dialect*/
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID
-WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}'", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString());
+join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
+WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}' and FSEQ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][2].ToString());
DataTable _dt = new DataTable();
_dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FMoFBillType = "";
if (_dt.Rows.Count > 0)
{
FLOT = _dt.Rows[0]["FLOT"].ToString();
FQTY = _dt.Rows[0]["FQTY"].ToString();
FBILLNO = _dt.Rows[0]["FBILLNO"].ToString();
+ FMoFBillType = _dt.Rows[0]["FMoFBillType"].ToString();
}
- //鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙�
+ //鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 + 鐢熶骇璁㈠崟琛屽彿 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙� 鍜� 鍏抽棴鏁伴噺锛�6.18鏇达級
string fDayPlanID = "";
string fDayPlanBillNo = "";
- sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
+ string fCloseCount = "";
+ string fQtyLS = "";
+ sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID,a.FCloseCount,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = a.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
left join T_ENG_WORKCENTER c on a.FHSourceID=c.fid
- where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and isnull(c.FNUMBER,'') ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString());
+ where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and a.FSRCBILLENTRYSEQ ='{3}' and (isnull(c.FNUMBER,'') ='{2}' or (select count(*) from T_ENG_WORKCENTER where isnull(c.FNUMBER,'') ='{2}')=0)", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString(), dt.Rows[i][2].ToString());
+ //LogHelper.Error(sql);
DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dayPlanDt.Rows.Count > 0)
{
fDayPlanID = dayPlanDt.Rows[0]["FID"].ToString();
fDayPlanBillNo = dayPlanDt.Rows[0]["FBILLNO"].ToString();
+ fCloseCount = dayPlanDt.Rows[0]["FCloseCount"].ToString();
+ fQtyLS = dayPlanDt.Rows[0]["FQTYLS"].ToString();
}
- //DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
+ this.Model.SetValue("FMoFBillType", FMoFBillType, i);
this.Model.SetValue("FSalOrderNo", dt.Rows[i][0].ToString(), i);
this.Model.SetValue("FSCOrderNo", dt.Rows[i][1].ToString(), i);
- this.Model.SetItemValueByNumber("FORGID", dt.Rows[i][2].ToString(), i);
+ this.Model.SetItemValueByNumber("FORGID", "100", i);
this.Model.SetItemValueByNumber("FProductWorkShopId", dt.Rows[i][3].ToString(), i);
this.Model.SetItemValueByNumber("FResourcesId", dt.Rows[i][4].ToString(), i);
// this.Model.SetValue("FMatrailId", dt.Rows[i][5].ToString(), i);
@@ -156,11 +174,15 @@
this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);
this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);
this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
- this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].ToString()), i);
+ this.Model.SetValue("FDeliveryDate", dt.Rows[i][13].ToString(), i);
this.Model.SetValue("FOrderLevel", OrderType(dt.Rows[i][14].ToString()), i);
this.Model.SetValue("FOrderQuantity", FQTY, i);
this.Model.SetValue("FDayPlanID", fDayPlanID, i);//鏃ヨ鍒掑伐鍗旾D
this.Model.SetValue("FDayPlanBillNo", fDayPlanBillNo, i);//鏃ュ伐鍗曠紪鍙�
+ this.Model.SetValue("FSRCBILLENTRYSEQ", dt.Rows[i][2].ToString(), i);//鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ this.Model.SetValue("FCloseCount", fCloseCount, i);//鍏抽棴鏁伴噺
+ this.Model.SetValue("FQTYLS", fQtyLS, i);//鍘嗗彶閬楃暀
+
for (int j = 0; j <= 60; j++)
{
this.Model.SetValue("FT" + "" + j + "", dt.Rows[i][15 + j].ToString(), i);
@@ -178,8 +200,6 @@
}
}
-
-
}
/// <summary>
/// 璁㈠崟鐘舵�佺瓑绾�
@@ -225,13 +245,14 @@
{
try
{
- LogService.WriteAsync("娴嬭瘯");
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
string sql;
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
//鑾峰彇鍗曟嵁浣撲俊鎭�
Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ LogHelper.Info("瀵煎叆鍔熻兘鍒楄〃琛屾暟锛�" + entityDataObjoct.Count);
List<string> sqlList = new List<string>();
foreach (DynamicObject current in entityDataObjoct)
{
@@ -240,7 +261,8 @@
for (int i = 0; i <= 60; i++)
{
JObject jsonFPOOrderEntry = new JObject();
- sql = string.Format($"update SC_WORKBILLSORTBILLSub set FHQTY ='{Convert.ToString(current["FT" + "" + i + ""])}' where FID ={Convert.ToString(current["FDayPlanID"])} and FHMASTERDATE ={date.AddDays(i).ToShortDateString()} and FHLOCKEDSUB = 0");
+ //閲嶅瀵煎叆鐨勬洿鏂版帀璁″垝鏁伴噺浠ュ強鏇存柊榻愬鐘舵�佷负绌�
+ sql = string.Format($"update SC_WORKBILLSORTBILLSub set FHQTY ='{Convert.ToString(current["FT" + "" + i + ""])}',FCOMPLETE='' where FID ={Convert.ToString(current["FDayPlanID"])} and FHMASTERDATE ={date.AddDays(i).ToShortDateString()} and FHLOCKEDSUB = 0");
sqlList.Add(sql);
}
}
@@ -248,15 +270,31 @@
string _result = "";
foreach (DynamicObject current in entityDataObjoct)
{
- //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
- WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]));
+ WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
DataTable dt = new DataTable();
dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
- _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + "瀵瑰簲鐨勭墿鏂�" + (current["FMatrailId"] as DynamicObject)["Number"] + "涓嶅瓨鍦�";
-
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + ",鐢熶骇璁㈠崟鏄庣粏琛屽彿锛�" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "瀵瑰簲鐨勭墿鏂�" + (current["FMatrailId"] as DynamicObject)["Number"] + "涓嶅瓨鍦�";
+ }
+ if (_result != "")
+ {
+ this.View.ShowErrMessage(_result);
+ return;
+ }
+ //鏍￠獙鐢熶骇鐢ㄦ枡娓呭崟鏄惁瀹℃牳
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"/*dialect*/SELECT FBILLNO FROM T_PRD_PPBOM T1
+WHERE T1.FMOBILLNO = '{0}' AND T1.FMATERIALID = '{1}' AND T1.FMOENTRYSEQ = '{2}' and FDOCUMENTSTATUS <>'C'
+", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ DataTable dt = new DataTable();
+ dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count > 0)
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + ",鐢熶骇璁㈠崟鏄庣粏琛屽彿锛�" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "鐗╂枡" + (current["FMatrailId"] as DynamicObject)["Number"] + "瀵瑰簲鐨勭敓浜х敤鏂欐竻鍗曪細" + dt.Rows[0][0] + "鏈鏍�";
}
if (_result != "")
{
@@ -265,7 +303,8 @@
}
foreach (DynamicObject current in entityDataObjoct)
{
- if (Convert.ToInt32(current["FNoScheduled"]) < 0)
+ //鏈帓鏁伴噺= 鎬绘暟 - 鏃ヨ鍒� 瓒呭嚭鏃ヨ鍒掍负璐� - 鍘嗗彶鏁伴噺 + 鍏抽棴鏁伴噺 < 0 琛ㄧず瓒呭嚭浜嗘�昏鍒掓暟閲�
+ if (Convert.ToInt32(current["FNoScheduled"]) - Convert.ToInt32(current["FQTYLS"]) + Convert.ToInt32(current["FCloseCount"]) < 0)
_result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
}
if (_result != "")
@@ -275,12 +314,19 @@
}
foreach (DynamicObject current in entityDataObjoct)
{
- if (string.IsNullOrEmpty(Convert.ToString(current["FSalOrderNo"])) || string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
+ if (string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
continue;
- //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
- sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
- LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
- WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]));
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"
+/*dialect*/
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber,tBom.FNUMBER as FBomNumber FROM T_PRD_MO T1
+ LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
+ LEFT JOIN T_ENG_BOM tBom on t2.FBOMID = tBom.FID
+ join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
+ join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
+ WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
DataTable dt = new DataTable();
dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -290,6 +336,11 @@
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FHUnitID = "";//鍗曚綅
+ string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+ string FPlanEndDate = "";//缁撴潫鏃ユ湡
+ string FMoFBillType = "";//
+ string FBomNumber = "";//Bom 鐗堟湰
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -297,6 +348,11 @@
FLOT = dt.Rows[0]["FLOT"].ToString();
FQTY = dt.Rows[0]["FQTY"].ToString();
FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
+ FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+ FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+ FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
+ FMoFBillType = dt.Rows[0]["FMoFBillType"].ToString();
+ FBomNumber = dt.Rows[0]["FBomNumber"].ToString();
}
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -306,21 +362,29 @@
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
- jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
- jsonModel.Add("FSCOrderNo", current["FSCOrderNo"].ToString()); //鐢熶骇璁㈠崟鍙稦SCOrderNo
- jsonModel.Add("FHSeOrderBillNo", current["FSalOrderNo"].ToString());//閿�鍞鍗曞彿
+ jsonModel.Add("FPreparatDate", FPlanBeginDate);//缂栧埗鏃ユ湡(鏀逛负璁″垝寮�濮嬫棩鏈�)
+ jsonModel.Add("FMoFBillType", FMoFBillType);//
+ jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
+ jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
jsonModel.Add("FHOrderLev", current["FOrderLevel"].ToString());//璁㈠崟绛夌骇
- jsonModel.Add("FSalOrderCount", current["FOrderLevel"].ToString());//閿�鍞鍗曟暟閲�
- jsonModel.Add("FHOrderCommitDate", current["FDeliveryDate"].ToString());//浜よ揣鏈烪OrderCommitDate
- //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
+ jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
+ jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
+ jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
+ jsonModel.Add("FBOMID", new JObject() { ["Fnumber"] = FBomNumber });//BOM鐗堟湰
+ jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
+ //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
- jsonModel.Add("FOrderQuantity", current["FOrderQuantity"].ToString()); ;//鐢熶骇璁㈠崟鏁伴噺
- jsonModel.Add("FDayPlanQuantity", current["FDayPlanQuantity"].ToString()); ;//鏃ヨ鍒掓暟閲�
- jsonModel.Add("FNoScheduled", current["FNoScheduled"].ToString()); ;//鏈帓鏁伴噺
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
+ jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
+ jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
JObject jsonFHMaterID = new JObject();
jsonFHMaterID.Add("FNumber", (current["FMatrailId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHMaterID", jsonFHMaterID);//FHMaterID 鐗╂枡
@@ -346,11 +410,47 @@
JArray Entry = new JArray();
if (Convert.ToString(current["FDayPlanID"]) != "0")
{
- sql = $"select max(FHMASTERDATE)FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} ";
- DateTime EndDate = DBServiceHelper.ExecuteScalar<DateTime>(Context, sql, DateTime.Now);
+ sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} ";
+ List<DayPlanModel> dayPlanModel = new List<DayPlanModel>();
+ dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>();
for (int i = 0; i <= 60; i++)
{
- if (EndDate >= date.AddDays(i))
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
+ JObject jsonFPOOrderEntry = new JObject();
+ jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
+ jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
+ jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
+ List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList();
+ if (_dayPlanModel.Count > 0)
+ {
+ jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿
+ }
+ Entry.Add(jsonFPOOrderEntry);
+ }
+ jsonModel.Add("FEntity", Entry);
+ jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"]));
+ jsonRoot.Add("Model", jsonModel);
+ var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ if (saveIsSuc == "TRUE")
+ {
+ string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
+ string FDayPlanID = saveObj["Result"]["Id"].ToString();
+ this.View.ShowMessage("瀵煎叆鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏� 鏂板寮傚父锛�" + saveObj.ToString());
+ this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
+ }
+ }
+ else
+ {
+ for (int i = 0; i <= 60; i++)
+ {
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
continue;
JObject jsonFPOOrderEntry = new JObject();
jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
@@ -358,18 +458,11 @@
jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
Entry.Add(jsonFPOOrderEntry);
}
- }
- jsonModel.Add("FEntity", Entry);
- //鏃ヨ鍒掑伐鍗曚笉涓虹┖鏃秛pdate
- if (Convert.ToString(current["FDayPlanID"]) != "0")
- {
- jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//婧愬崟缂栧彿
+ jsonModel.Add("FEntity", Entry);
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- LogService.WriteAsync(jsonRoot);
if (saveIsSuc == "TRUE")
{
string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
@@ -380,39 +473,8 @@
}
else
{
- //LogService.WriteAsync(saveIsSuc);
- LogService.WriteAsync(jsonRoot);
- LogHelper.Error(jsonRoot.ToString());
- this.View.ShowErrMessage(jsonRoot.ToString());
- }
- }
- else
- {
- jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
- var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
- JObject saveObj = JObject.Parse(result);
- string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- LogService.WriteAsync(jsonRoot);
- if (saveIsSuc == "TRUE")
- {
- string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
- string FDayPlanID = saveObj["Result"]["Id"].ToString();
-
- this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"]) - 1);//
- this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);//
- this.View.ShowMessage("瀵煎叆鎴愬姛");
-
- }
- else
- {
- // LogService.WriteAsync(saveIsSuc);
- LogService.WriteAsync(jsonRoot);
- LogHelper.Error(jsonRoot.ToString());
-
- this.View.ShowErrMessage(jsonRoot.ToString());
-
-
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏� 鏂板寮傚父锛�" + saveObj.ToString());
+ this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
}
this.View.UpdateView();
@@ -420,7 +482,7 @@
}
catch (Exception ex)
{
-
+ LogHelper.Error(ex.ToString());
this.View.ShowErrMessage(ex.ToString());
}
@@ -472,6 +534,158 @@
}
return string.Empty;
}
- }
+ public void WriteImportLog()
+ {
+ try
+ {
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ string sql;
+ DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
+ //鑾峰彇鍗曟嵁浣撲俊鎭�
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ if (string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
+ continue;
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"
+/*dialect*/
+SELECT T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1
+ LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
+ join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
+ WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ DataTable dt = new DataTable();
+ dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count == 0)
+ continue;
+ string FID = "";//FID 婧愬崟涓诲唴鐮�
+ string FENTRYID = "";//FENTRYID 婧愬崟瀛愬唴鐮�
+ string FLOT = "";//FLOT 鎵规
+ string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
+ string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FHUnitID = "";//鍗曚綅
+ string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+ string FPlanEndDate = "";//缁撴潫鏃ユ湡
+ if (dt.Rows.Count > 0)
+ {
+ FID = dt.Rows[0]["FID"].ToString();
+ FENTRYID = dt.Rows[0]["FENTRYID"].ToString();
+ FLOT = dt.Rows[0]["FLOT"].ToString();
+ FQTY = dt.Rows[0]["FQTY"].ToString();
+ FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
+ FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+ FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+ FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
+ }
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "false");
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
+ jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
+ jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
+ jsonModel.Add("FHOrderLev", current["FOrderLevel"].ToString());//璁㈠崟绛夌骇
+ jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
+ jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
+ jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
+ jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
+ //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
+ jsonModel.Add("FBatch", FLOT);//鎵规
+ jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
+ jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
+ jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
+ jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
+ jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
+ JObject jsonFHMaterID = new JObject();
+ jsonFHMaterID.Add("FNumber", (current["FMatrailId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHMaterID", jsonFHMaterID);//FHMaterID 鐗╂枡
+ if (Convert.ToString(current["FORGID_Id"]) != "0")
+ {
+ JObject jsonFHPRDORGID = new JObject();
+ jsonFHPRDORGID.Add("FNumber", (current["FORGID"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 鐢熶骇缁勭粐
+ }
+ if (Convert.ToString(current["FResourcesId_Id"]) != "0")
+ {
+ JObject jsonFProductWorkShopId = new JObject();
+ jsonFProductWorkShopId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHSourceID", jsonFProductWorkShopId);//FHSourceID 鐢熶骇杞﹂棿
+ }
+ if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
+ {
+ JObject jsonFResourcesId = new JObject();
+ jsonFResourcesId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID 鐢熶骇璧勬簮
+ }
+ JArray Entry = new JArray();
+
+ for (int i = 0; i <= 60; i++)
+ {
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
+ JObject jsonFPOOrderEntry = new JObject();
+ jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
+ jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
+ jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
+ Entry.Add(jsonFPOOrderEntry);
+ }
+ jsonModel.Add("FEntity", Entry);
+ jsonRoot.Add("Model", jsonModel);
+ var result = cloudClient.Save("paez_Sc_WorkBillAutoSortBill_Log", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ if (saveIsSuc != "TRUE")
+ {
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏ヨ褰曟棩蹇楋紝鏂板寮傚父json锛�" + jsonRoot.ToString());
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏ヨ褰曟棩蹇楄烦鍑�:" + ex.Message.ToString());
+ }
+ }
+
+ /// <summary>
+ /// dt鍘荤┖琛�
+ /// </summary>
+ /// <param name="dt"></param>
+ public void RemoveEmpty(DataTable dt)
+ {
+ List<DataRow> removelist = new List<DataRow>();
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ bool IsNull = true;
+ for (int j = 0; j < dt.Columns.Count; j++)
+ {
+ if (!string.IsNullOrEmpty(dt.Rows[i][j].ToString().Trim()))
+ {
+ IsNull = false;
+ }
+ }
+ if (IsNull)
+ {
+ removelist.Add(dt.Rows[i]);
+ }
+ }
+ for (int i = 0; i < removelist.Count; i++)
+ {
+ dt.Rows.Remove(removelist[i]);
+ }
+ }
+ }
}
--
Gitblit v1.9.1