Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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,

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="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="directReopen" v-if="row.state===9"> 报废重开(红冲) </el-button> -->
           </template>
         </span>
       </template>

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 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 materialRelationships = luRePartCodes.Select(t => new MaterialRelationship(GuidGenerator.Create(), t.FactoryPartCode, "", t.LU, businessType));
-                        await _syncExtendManager.AddNewMaterialRelationshipsAsync(materialRelationships).ConfigureAwait(false);
-                    }
                 }
 
                 var dateTimeNow = DateTime.Now;