From 93d204c6d20a653582452620da7183aef72d26c5 Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Thu, 8 Aug 2024 15:35:35 +0800
Subject: [PATCH] ..

---
 .vs/ICSSoft.FromERP/v16/.suo           | Bin 252928 -> 226816 bytes
 ICSSoft.FromERP/ICSMOBOM.cs            | 157 ++++++++++++++-----------
 ICSSoft.FromERP/ICSSoft.FromERP.csproj |   1 +
 3 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index 0656a8c130b560ddf969f4b892a37b99240f41b8..936cdd9811ab88ab8d62c96a205f96960c7dfddf 100644
GIT binary patch
delta 8219
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

delta 14840
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
a|6pO=of|P{)-3s{uslRoJ#}|(`2PZM<(J+7

diff --git a/ICSSoft.FromERP/ICSMOBOM.cs b/ICSSoft.FromERP/ICSMOBOM.cs
index 9acecc1..3effdd0 100644
--- a/ICSSoft.FromERP/ICSMOBOM.cs
+++ b/ICSSoft.FromERP/ICSMOBOM.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using Quartz;
@@ -8,9 +9,9 @@ using Quartz;
 namespace ICSSoft.FromERP
 {
     /// <summary>
-    /// 备料表（工单BOM）
+    /// 工单备料表(锐腾)
     /// </summary>
-    public class ICSMOBOM : IJob
+    public class ICSMoBom : IJob
     {
         private static object key = new object();
         private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -35,82 +36,100 @@ namespace ICSSoft.FromERP
         {
             try
             {
-
                 string conStr = ICSHelper.GetConnectString();
                 string Namespace = this.GetType().Namespace;
-                string Class = this.GetType().Name;
-                #region SQL
-                string sql = @"SELECT  a.MoCode AS MOCODE ,
-                                        b.InvCode AS ITEMCODE,
-                                        b.SortSeq AS SEQ,
-                                        c.InvCode AS MOBITEMCODE,
-                                        CAST(c.AllocateId AS NVARCHAR(50)) AS MOBITEMECN,
-                                        d.cInvName AS MOBITEMNAME,
-                                        d.cInvStd AS MOBITEMDESC,
-                                        '1' AS MOBITEMSTATUS,
+                //string Class = this.GetType().Name;
+                DataTable dt = ICSHelper.GetERPDB(conStr);
+                foreach (DataRow dr in dt.Rows)
+                {
+                    string erpName = ICSHelper.GetConfigString()["ERPDB"];
+                    string TenantId = dr["TenantId"].ToString();//mes 组织
+                    string TenantCode = dr["TenantCode"].ToString();
+                    string ErpId = dr["ErpID"].ToString();      //erpID
+                    string Class = this.GetType().Name + TenantCode;
+                    erpName = string.Format(erpName, TenantId);
+                    #region SQL
+                    string sql = @"SELECT top 2000  A1.DocNo AS MOCODE ,
+                                        A5.Code AS ITEMCODE,
+                                        1 AS SEQ,
+                                        A4.Code AS MOBITEMCODE,
+                                        CAST(A3.ID AS NVARCHAR(50)) AS MOBITEMECN,
+                                        A4.Name AS MOBITEMNAME,
+                                        A4.SPECS AS MOBITEMDESC,
+                                        A1.DocState AS MOBITEMSTATUS,
                                         GETDATE()  AS MOBITEMEFFTIME,
                                         GETDATE()  AS MOBITEMINVTIME,
-                                        CASE WHEN d.bCutMantissa='1' AND d.bKCCutMantissa='1' THEN CEILING(c.Qty) ELSE c.Qty END AS MOBITEMQTY,
-                                        c.WhCode  AS MOBITEMLOCATION,
-                                        CASE WHEN c.WIPType='1' THEN '1' ELSE '0' END AS MOBOMITEMUOM,
-                                        '' AS MOFAC,
-                                        c.SortSeq AS MOBOMLINE,
-                                        CASE WHEN ISNULL(a.ModifyTime, a.CreateTime)>ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) THEN ISNULL(a.ModifyTime, a.CreateTime) ELSE ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) END as MTIME
-                                        into  #TempBOM
-                                        FROM {0}.dbo.mom_order a 
-                                        INNER JOIN {0}.dbo.mom_orderdetail b ON a.MoId = b.MoId
-                                        INNER JOIN {0}.dbo.mom_moallocate c ON b.MoDId = c.MoDId
-                                        INNER JOIN {0}.dbo.Inventory d ON c.InvCode = d.cInvCode
-                                        LEFT JOIN {0}.dbo.bom_parent e ON b.BomId = e.BomId
-                                        LEFT JOIN {0}.dbo.bom_bom f ON e.BomId = f.BomId
-                                        LEFT JOIN {0}.dbo.ComputationUnit unit ON d.cComUnitCode = unit.cComunitCode
-                                        WHERE  ISNULL (b.RelsUser,'') <> ''
-                                        and  CASE WHEN ISNULL(a.ModifyTime, a.CreateTime)>ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) THEN ISNULL(a.ModifyTime, a.CreateTime) ELSE ISNULL(b.CloseTime,ISNULL(b.RelsTime,ISNULL(a.ModifyTime, a.CreateTime))) END>=@LastTime
+                                        A3.ActualReqQty  AS MOBITEMQTY,
+                                        A3.IssueStyle  AS MOBITEMLOCATION,
+                                        c.code  AS MOFAC,
+                                        A6.Code AS MOBOMITEMUOM,
+                                        CAST(A3.DocLineNO  AS NVARCHAR(50)) AS MOBOMLINE,
+                                        A12.Code as WorkPoint,
+                                        ISNULL(A3.ModifiedOn,A3.CreatedOn) AS MTIME 
+                                        into  #TempPick
+                                        FROM {0}.dbo.MO_MO A1
+                                        INNER JOIN {0}.dbo.MO_MOPickList A3 ON A3.MO=A1.ID
+                                        LEFT JOIN {0}.dbo.CBO_ItemMaster A4 ON A3.ItemMaster=A4.ID
+                                        LEFT JOIN {0}.dbo.CBO_ItemMaster A5 ON A1.ItemMaster=A5.ID
+                                        LEFT JOIN {0}.dbo.Base_UOM A6 ON A3.IssueUOM=A6.ID
+                                        LEFT JOIN {0}.dbo.[Base_Organization] as A12 on (A1.[Org] = A12.[ID])  
+                                        LEFT JOIN {0}.dbo.CBO_Wh c on A3.SupplyWh=c.id and A1.org=c.org
+                                        WHERE   A3.IsPhantomPart!=1
+                                        and ISNULL(A3.ModifiedOn,A3.CreatedOn)>=@LastTime
+                                        and a12.id='{1}'  order  by ISNULL(A3.ModifiedOn,A3.CreatedOn) 
 
-                                        IF NOT EXISTS(SELECT * FROM #TempBOM)
+                                        IF NOT EXISTS(SELECT * FROM #TempPick)
                                         RETURN";
-                sql = ICSHelper.Time(Namespace, Class, WorkPoint, sql, "#TempBOM");
-                sql += "\r\n";
-                sql += @"--删除数据
-                                DELETE ICSMOBOM WHERE MOBITEMECN NOT IN (SELECT AllocateId FROM {0}.dbo.mom_moallocate) ";
-                Dictionary<string, string> values = new Dictionary<string, string>();
-                values.Add("MOCODE", "a.MOCODE");
-                values.Add("ITEMCODE", "a.ITEMCODE");
-                values.Add("SEQ", "a.SEQ");
-                values.Add("MOBITEMCODE", "a.MOBITEMCODE");
-                values.Add("MOBITEMNAME", "a.MOBITEMNAME");
-                values.Add("MOBITEMDESC", "a.MOBITEMDESC");
-                values.Add("MOBITEMSTATUS", "a.MOBITEMSTATUS");
-                values.Add("MOBITEMEFFTIME", "a.MOBITEMEFFTIME");
-                values.Add("MOBITEMINVTIME", "a.MOBITEMEFFTIME");
-                values.Add("MOBITEMQTY", "a.MOBITEMQTY");
-                values.Add("MOBOMITEMUOM", "a.MOBOMITEMUOM");//供应类型：1:入库到冲
-                values.Add("MOBOMLINE", "a.MOBOMLINE");
-                values.Add("MOBITEMLOCATION", "a.MOBITEMLOCATION");
-                values.Add("MTIME", "a.MTIME");
-                values.Add("MOFAC", "a.MOFAC");
-                //values.Add("WorkPoint", "a.WorkPoint");
-                //更新存在数据
-                sql += ICSHelper.UpdateSQL("b", values)
-                    + @" #TempBOM a
-                            INNER JOIN ICSMOBOM b ON a.MOBITEMECN=b.MOBITEMECN
+                    sql = string.Format(sql, erpName, ErpId);
+                    sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#TempPick");
+                    Dictionary<string, string> value = new Dictionary<string, string>();
+
+
+                    sql += "\r\n";
+                    sql += @"--删除数据
+                                DELETE ICSMOBOM WHERE Default1 NOT IN (SELECT ID FROM {0}.dbo.MO_MOPickList)  AND  ICSMOBOM.TenantId='{1}'";
+                    Dictionary<string, string> values = new Dictionary<string, string>();
+                    values.Add("MOCODE", "a.MOCODE");
+                    values.Add("ITEMCODE", "a.ITEMCODE");
+                    values.Add("MOBITEMCODE", "a.MOBITEMCODE");
+                    values.Add("MOBITEMNAME", "a.MOBITEMNAME");
+                    values.Add("MoBItemSpec", "a.MOBITEMDESC");
+                    values.Add("MOBITEMSTATUS", "a.MOBITEMSTATUS");
+                    values.Add("MOBITEMEFFTIME", "a.MOBITEMEFFTIME");
+                    values.Add("MOBITEMINVTIME", "a.MOBITEMEFFTIME");
+                    values.Add("MOBITEMQTY", "a.MOBITEMQTY");
+                    values.Add("MOBOMITEMUOM", "a.MOBOMITEMUOM");
+                    values.Add("MOBOMLINE", "a.MOBOMLINE");
+                    values.Add("MOBITEMLOCATION", "a.MOBITEMLOCATION");
+                    values.Add("LastModifierUserId", "'" + ConstWorkPoint.Muser + "'");
+                    values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'");
+                    values.Add("LastModificationTime", "a.Mtime");//操作时间
+                    values.Add("MOFAC", "a.MOFAC");
+                    //更新存在数据
+                    sql += ICSHelper.UpdateSQL("b", values)
+                        + @" #TempPick a
+                            INNER JOIN ICSMOBOM b ON a.MOBITEMECN=b.Default1 AND    B.TenantId='{1}'
                             ";
 
-                values.Add("MOBITEMECN", "a.MOBITEMECN");
-                values.Add("MUSER", "'" + ConstWorkPoint.Muser + "'");
-                values.Add("MUSERName", "'" + ConstWorkPoint.Musername + "'");
-                values.Add("WorkPoint", "'" + WorkPoint + "'");
-                sql += "\r\n";
-                //插入新增数据
-                sql += ICSHelper.InsertSQL("ICSMOBOM", values)
-                    + @"  #TempBOM a
-                            LEFT JOIN ICSMOBOM b ON a.MOBITEMECN=b.MOBITEMECN
-                            WHERE b.MOBITEMECN IS NULL
+                    values.Add("Default1", "a.MOBITEMECN");
+                    values.Add("CreationTime", "a.MTime");//操作人
+                    values.Add("CreatorUserId", "'" + ConstWorkPoint.Muser + "'");//操作人
+                    values.Add("CreatorUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称
+                    values.Add("TenantId", "'" + TenantId + "'");//站点
+
+                    sql += "\r\n";
+                    //插入新增数据
+                    sql += ICSHelper.InsertSQL("ICSMOBOM", values)
+                        + @"  #TempPick a
+                            LEFT JOIN ICSMOBOM b ON a.MOBITEMECN=b.Default1 AND  B.TenantId='{1}'
+                            WHERE b.Default1 IS NULL 
                             ";
-                sql += "DROP TABLE #TempBOM";
-                sql = string.Format(sql, WorkPoint);
-                ICSHelper.ExecuteDate(conStr, sql);
-                #endregion
+                    sql += "DROP TABLE #TempPick";
+                    sql = string.Format(sql, erpName, TenantId);
+                    //return;
+                    ICSHelper.ExecuteDate(conStr, sql);
+                    #endregion
+                }
             }
             catch (Exception ex)
             {
diff --git a/ICSSoft.FromERP/ICSSoft.FromERP.csproj b/ICSSoft.FromERP/ICSSoft.FromERP.csproj
index abe9feb..640371f 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP.csproj
+++ b/ICSSoft.FromERP/ICSSoft.FromERP.csproj
@@ -102,6 +102,7 @@
     <Compile Include="IcsMainCategoryCodeFromU8.cs" />
     <Compile Include="IcsMainCategoryCode.cs" />
     <Compile Include="ICSManufactureReceive.cs" />
+    <Compile Include="ICSMoBom.cs" />
     <Compile Include="ICSModel.cs" />
     <Compile Include="ICSMoFromU8.cs" />
     <Compile Include="ICSMOIssue.cs" />