提交当前本机整理版本

插件库/Lskj.PubBomImport/FrmProgress.cs

@@ -3911,6 +3911,8 @@ namespace Lskj.PubBomImport
                 string suffix = Path.GetExtension(File);
                 string name = fileInfo.Name;
                 DateTime creationTime = fileInfo.CreationTime;
+                byte[] fileBytes = ConvertFileToBytes(File);
+                string fileStream = Convert.ToBase64String(fileBytes);
                 string userId = ERPInfo.Instance.UserId;
                 DateTime uploadTime = DateTime.Now;
                 string code = "";
@@ -4110,7 +4112,8 @@ namespace Lskj.PubBomImport
             catch (Exception ex)
             {
                 returnMsg = ex.Message;
-                throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}", ex);
+                throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}");
+                isUpload = false;
             }
             msg = returnMsg;
             outFileId = fileId;
@@ -4301,4 +4304,16 @@ namespace Lskj.PubBomImport
                                         SoureMode, SoureObj, autoPick, Billdocument_Id, custom_ProductDescrip, bomFlag, encapsulation, serialnumber,
                                         lsidx_id, workorderid, providerid, mx_ProductId, amountLoss, ProductSx, lstr1, lstr2, productidbak,
                                         cltype, parentbillno, lskjimport_errorFlag, clProductId, bom_workordername, bom_workordernameTm, isbcp,
-                                        tamount, 
+                                        tamount, xn_tig, historyVer, bombb, bombc
+                                    )
+                                    SELECT
+                                        ProductId, Famount, Amount, '{zzqdCode}', amountx, ProcedureID, WorkingProcedure, Bak, Ver,
+                                        SoureMode, SoureObj, autoPick, Billdocument_Id, custom_ProductDescrip, bomFlag, encapsulation, serialnumber,
+                                        lsidx_id, workorderid, providerid, mx_ProductId, amountLoss, ProductSx, lstr1, lstr2, productidbak,
+                                        cltype, parentbillno, lskjimport_errorFlag, clProductId, bom_workordername, bom_workordernameTm, isbcp,
+                                        tamount, xn_tig, historyVer, bombb, bombc
+                                    FROM bom_BillListTab WHERE Billdocument_Id = (select top 1 billdocument_id from bom_BillTab where productid = '{topProductId}') and bak like 'ZZQD%';";
+            SqlHelper.ExecuteNonQuery(sql);
+        }
+    }
+}