From d171b8eb5cfea00ec1f92531e1d6e8b7c28cb288 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 11 Jul 2024 17:16:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E4=B9=9F=E8=83=BD=E6=AD=A3=E5=B8=B8=E5=BD=95=E5=85=A5=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E9=9B=B6=E4=BB=B6=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Syncs/JitSeSyncAppService.cs  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs
index dcc402b3..ec00c68e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs
@@ -120,16 +120,24 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
             var businessType = SeSyncConfigInfo.BusinessType;
             if (seDetails.Any())
             {
-                if (businessType != EnumBusinessType.BeiJian)
+                //if (businessType != EnumBusinessType.BeiJian)
+                //{
+                //    //备件以外其他业务添加客户零件号与厂内零件号关系
+                //    //客户零件号和厂内零件号
+                //    var luRePartCodes = seDetails.Where(t => !string.IsNullOrEmpty(t.LU) && !string.IsNullOrEmpty(t.FactoryPartCode)).Select(t => new { t.LU, t.FactoryPartCode }).Distinct().ToList();
+                //    if (luRePartCodes.Any())
+                //    {
+                //        var materialRelationships = luRePartCodes.Select(t => new MaterialRelationship(GuidGenerator.Create(), t.FactoryPartCode, "", t.LU, businessType));
+                //        await _syncExtendManager.AddNewMaterialRelationshipsAsync(materialRelationships).ConfigureAwait(false);
+                //    }
+                //}
+
+                //客户零件号和厂内零件号
+                var luRePartCodes = seDetails.Where(t => !string.IsNullOrEmpty(t.LU) && !string.IsNullOrEmpty(t.FactoryPartCode)).Select(t => new { t.LU, t.FactoryPartCode }).Distinct().ToList();
+                if (luRePartCodes.Any())
                 {
-                    //备件以外其他业务添加客户零件号与厂内零件号关系
-                    //客户零件号和厂内零件号
-                    var luRePartCodes = seDetails.Where(t => !string.IsNullOrEmpty(t.LU) && !string.IsNullOrEmpty(t.FactoryPartCode)).Select(t => new { t.LU, t.FactoryPartCode }).Distinct().ToList();
-                    if (luRePartCodes.Any())
-                    {
-                        var materialRelationships = luRePartCodes.Select(t => new MaterialRelationship(GuidGenerator.Create(), t.FactoryPartCode, "", t.LU, businessType));
-                        await _syncExtendManager.AddNewMaterialRelationshipsAsync(materialRelationships).ConfigureAwait(false);
-                    }
+                    var materialRelationships = luRePartCodes.Select(t => new MaterialRelationship(GuidGenerator.Create(), t.FactoryPartCode, "", t.LU, businessType));
+                    await _syncExtendManager.AddNewMaterialRelationshipsAsync(materialRelationships).ConfigureAwait(false);
                 }
 
                 var dateTimeNow = DateTime.Now;

From 55672412dac6a4069d10e117860e9eeabb007f9e Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 12 Jul 2024 09:29:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/settle/commerce.js                         | 2 +-
 .../host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
index 51b20227..2ae408e4 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
@@ -46,7 +46,7 @@ const schema = {
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "number",
+      type: "string",
     },
     businessType,
     state,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
index a2cbc734..8b81e2f3 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js
@@ -51,8 +51,8 @@ export default {
         <span class="dialog-footer">
           <el-button type="primary" @click="show=false"> 返回 </el-button>
           <template v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1">
-            <el-button type="primary" @click="showSetupDialog" v-if="row.state===3 || row.state===9"> 报废重开</el-button>
-            <el-button type="primary" @click="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button>
+            <!-- <el-button type="primary" @click="showSetupDialog" v-if="row.state===3 || row.state===9"> 报废重开</el-button>
+            <el-button type="primary" @click="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button> -->
           </template>
         </span>
       </template>