提交修改过后的《物料审核后同步物料清单至同步记录》

Code/LQKJ.K3.MFG.PRD.App.ServicePlugIn/AfterReviewAddSynchronizationServerPlugin.cs

@@ -22,21 +22,36 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
             var Number = data[0]["Number"].ToString();
             var masterid = data[0]["msterID"].ToString();
             var selectOldNumber = selectOldumber(masterid);
-            if (string.IsNullOrWhiteSpace(selectOldNumber))
+            DateTime time= DateTime.Now;
+            time=time.AddMinutes(1);
+            if (string.IsNullOrWhiteSpace(selectOldNumber[0]) && Convert.ToDateTime(selectOldNumber[1])< time)
+            {
+                integrationMethod(data, Number, masterid, selectOldNumber);
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(selectOldNumber[0]))
             {
                 updateOldNumber(Number, masterid);
                 return;
             }
-            if (selectOldNumber == Number) return;
+            integrationMethod(data, Number, masterid, selectOldNumber);
+            base.EndOperationTransaction(e);
+
+        }
+
+        private void integrationMethod(DynamicObject[] data, string number, string masterid, List<string> selectOldNumber)
+        {
+            var oldNumber = selectOldNumber[0].ToString();
+                if (oldNumber == number)  return;
             List<string> list = new List<string>();
             string id = "ENG_BOM";
             string userId = base.Context.UserId.ToString();
             string operationName = base.FormOperation.OperationName.ToString();
             string operation = base.FormOperation.Operation;
-            var FidList = selectEngBomFid(Number);
+            var FidList = selectEngBomFid(number);
             foreach (var Fid in FidList)
             {
-               
+
                 string item = $@"/*dialect*/
                 insert
                 into
@@ -55,9 +70,9 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
                 list.Add(item);
             }
             DBUtils.ExecuteBatch(base.Context, list, list.Count);
-            updateOldNumber(Number, masterid);//生成同步记录后同步旧编码
-            base.EndOperationTransaction(e);    
+            updateOldNumber(number, masterid);//生成同步记录后同步旧编码
         }
+
         /// <summary>
         /// 使用修改后的物料编码查询物料清单
         /// </summary>
@@ -68,7 +83,12 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
         {
             var getSql = $@"
             select
+            q.FID
+            from
+            (
+            select
                 teb.FID
+				,max(teb.FFORBIDSTATUS) as FFORBIDSTATUS
             from 
                 T_ENG_BOM teb
             left join T_ENG_BOMCHILD tebHild on tebHild.FID=teb.FID
@@ -78,6 +98,9 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
 	            tbm.FNUMBER='{number}' or tbm1.FNUMBER='{number}'
             group by 
 	            teb.FID
+				)q
+				where 
+				q.FFORBIDSTATUS<>'B'
 ";
           var dt=DBServiceHelper.ExecuteDataSet(base.Context, getSql).Tables[0];
               List<string> list = new List<string>();
@@ -94,11 +117,13 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
         /// </summary>
         /// <param name="masterid"></param>
         /// <returns></returns>
-        private string selectOldumber(string masterid)
+        private List<string> selectOldumber(string masterid)
         {
+            List<string> list=new List<string>();
             string getSql = $@"/*dialect*/
             select
-                FOLDNUMBER 
+                 F_LQKJ_NumberYC 
+                ,FCREATEDATE
             from 
                 T_BD_MATERIAL  
             where
@@ -108,10 +133,15 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
            var dt= DBServiceHelper.ExecuteDataSet(Context, getSql).Tables[0];
             if (dt.Rows.Count==0)
             {
-                return "";
+                list.Add("");
+
+                return list;
             }
-            var oldNumber = dt.Rows[0]["FOLDNUMBER"].ToString();
-            return oldNumber;
+            var oldNumber = dt.Rows[0]["F_LQKJ_NumberYC"].ToString();
+            var creaTedate = dt.Rows[0]["FCREATEDATE"].ToString();
+            list.Add(oldNumber);
+            list.Add(creaTedate);
+            return list;
         }
 
         /// <summary>
@@ -125,7 +155,7 @@ namespace LQKJ.K3.MFG.PRD.App.ServicePlugIn
             update
                 T_BD_MATERIAL
             set
-                FOLDNUMBER='{number}'
+                F_LQKJ_NumberYC='{number}'
             where
 	            FMASTERID='{masterid}'
 ";

Code/LQKJ.K3.MFG.PRD.App.ServicePlugIn/LQKJ.K3.MFG.PRD.App.ServicePlugIn.csproj

@@ -23,7 +23,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>D:\Kingde\bin\</OutputPath>
+    <OutputPath>..\..\K3Cloud\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

Code/LQKJ.K3.MFG.PRD.BusinessPlugIn/LQKJ.K3.MFG.PRD.BusinessPlugIn.csproj

@@ -23,7 +23,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>D:\Kingde\bin\</OutputPath>
+    <OutputPath>..\..\K3Cloud\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

Code/app.pkgdef

@@ -38,43 +38,19 @@
   <Resources>
     <KDComponent xsi:type="ConentComponent">
       <Target>CompileAndPackage</Target>
-      <Name>LQKJ.K3.MES.AppServicePlugin.dll</Name>
-      <ComponentPath>..\K3Cloud\bin\LQKJ.K3.MES.AppServicePlugin.dll</ComponentPath>
-      <Type>ContentFile</Type>
-      <OpeType>AddOrUpdate</OpeType>
-      <IsSign>false</IsSign>
-      <IsIgnoreError>false</IsIgnoreError>
-      <OutputPath>Bin</OutputPath>
-      <CopyToPaths />
-      <Condition />
-    </KDComponent>
-    <KDComponent xsi:type="ConentComponent">
-      <Target>CompileAndPackage</Target>
-      <Name>LQKJ.WebApi.Stub.dll</Name>
-      <ComponentPath>..\K3Cloud\bin\LQKJ.WebApi.Stub.dll</ComponentPath>
+      <Name>LQKJ.K3.MFG.PRD.App.ServicePlugIn.dll</Name>
+      <ComponentPath>..\K3Cloud\LQKJ.K3.MFG.PRD.App.ServicePlugIn.dll</ComponentPath>
       <Type>ContentFile</Type>
       <OpeType>AddOrUpdate</OpeType>
       <IsSign>false</IsSign>
       <IsIgnoreError>false</IsIgnoreError>
       <OutputPath>Bin</OutputPath>
-      <CopyToPaths />
       <Condition />
     </KDComponent>
     <KDComponent xsi:type="ConentComponent">
       <Target>CompileAndPackage</Target>
       <Name>LQKJ.K3.MFG.PRD.BusinessPlugIn.dll</Name>
-      <ComponentPath>..\K3Cloud\bin\LQKJ.K3.MFG.PRD.BusinessPlugIn.dll</ComponentPath>
-      <Type>ContentFile</Type>
-      <OpeType>AddOrUpdate</OpeType>
-      <IsSign>false</IsSign>
-      <IsIgnoreError>false</IsIgnoreError>
-      <OutputPath>Bin</OutputPath>
-      <Condition />
-    </KDComponent>
-    <KDComponent xsi:type="ConentComponent">
-      <Target>CompileAndPackage</Target>
-      <Name>LQKJ.K3.MFG.PRD.App.ServicePlugIn.dll</Name>
-      <ComponentPath>..\K3Cloud\bin\LQKJ.K3.MFG.PRD.App.ServicePlugIn.dll</ComponentPath>
+      <ComponentPath>..\K3Cloud\LQKJ.K3.MFG.PRD.BusinessPlugIn.dll</ComponentPath>
       <Type>ContentFile</Type>
       <OpeType>AddOrUpdate</OpeType>
       <IsSign>false</IsSign>

DataModel_30/生产制造.pkgdef

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
@@ -70,9 +70,15 @@
     <BusinessObject Target="CompileAndPackage" Id="SUB_SUBREQORDER" Status="Updated" ComponentPath="WWGL_5dc6996b\SUB_SUBREQORDER.dym" Type="Meta">SUB_SUBREQORDER.dym</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="ebbb1aeb-4281-43b3-a0b2-c027ebf4e7a7.2052" Status="Updated" ComponentPath="WWGL_5dc6996b\ebbb1aeb-4281-43b3-a0b2-c027ebf4e7a7.2052.dymx" Type="LanguageRes">ebbb1aeb-4281-43b3-a0b2-c027ebf4e7a7.2052.dymx</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="SUB_SUBREQORDER.2052" Status="Updated" ComponentPath="WWGL_5dc6996b\SUB_SUBREQORDER.2052.dymx" Type="LanguageRes">SUB_SUBREQORDER.2052.dymx</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="161772a4-b0f4-4f02-a55b-95b394316cac" Status="Updated" ComponentPath="ENG_ac20e109\161772a4-b0f4-4f02-a55b-95b394316cac.dym" Type="Meta">161772a4-b0f4-4f02-a55b-95b394316cac.dym</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="254ada1a-1c93-4829-a700-cf55a52d165a" Status="Updated" ComponentPath="ENG_ac20e109\254ada1a-1c93-4829-a700-cf55a52d165a.dym" Type="Meta">254ada1a-1c93-4829-a700-cf55a52d165a.dym</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="66fe2147-e1b4-4025-b2e5-358cdf15eb34" Status="Updated" ComponentPath="ENG_ac20e109\66fe2147-e1b4-4025-b2e5-358cdf15eb34.dym" Type="Meta">66fe2147-e1b4-4025-b2e5-358cdf15eb34.dym</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="e99c74fa-e880-4496-bac4-788213d8ad08" Status="Updated" ComponentPath="ENG_ac20e109\e99c74fa-e880-4496-bac4-788213d8ad08.dym" Type="Meta">e99c74fa-e880-4496-bac4-788213d8ad08.dym</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="ENG_BOM" Status="Updated" ComponentPath="ENG_ac20e109\ENG_BOM.dym" Type="Meta">ENG_BOM.dym</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="161772a4-b0f4-4f02-a55b-95b394316cac.2052" Status="Updated" ComponentPath="ENG_ac20e109\161772a4-b0f4-4f02-a55b-95b394316cac.2052.dymx" Type="LanguageRes">161772a4-b0f4-4f02-a55b-95b394316cac.2052.dymx</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="254ada1a-1c93-4829-a700-cf55a52d165a.2052" Status="Updated" ComponentPath="ENG_ac20e109\254ada1a-1c93-4829-a700-cf55a52d165a.2052.dymx" Type="LanguageRes">254ada1a-1c93-4829-a700-cf55a52d165a.2052.dymx</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="66fe2147-e1b4-4025-b2e5-358cdf15eb34.2052" Status="Updated" ComponentPath="ENG_ac20e109\66fe2147-e1b4-4025-b2e5-358cdf15eb34.2052.dymx" Type="LanguageRes">66fe2147-e1b4-4025-b2e5-358cdf15eb34.2052.dymx</BusinessObject>
+    <BusinessObject Target="CompileAndPackage" Id="e99c74fa-e880-4496-bac4-788213d8ad08.2052" Status="Updated" ComponentPath="ENG_ac20e109\e99c74fa-e880-4496-bac4-788213d8ad08.2052.dymx" Type="LanguageRes">e99c74fa-e880-4496-bac4-788213d8ad08.2052.dymx</BusinessObject>
     <BusinessObject Target="CompileAndPackage" Id="ENG_BOM.2052" Status="Updated" ComponentPath="ENG_ac20e109\ENG_BOM.2052.dymx" Type="LanguageRes">ENG_BOM.2052.dymx</BusinessObject>
   </BusinessObjects>
   <ResourceObject>