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

.drone.yml

@@ -16,7 +16,7 @@ steps:
       - chmod 755 ./build.sh
       - ./build.sh
       - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}\n">./publish/version.txt
-      - echo ${DRONE_COMMIT_MESSAGE}>./publish/version.txt
+      - echo ${DRONE_COMMIT_MESSAGE}>>./publish/version.txt
       - dotnet nuget locals global-packages --list
 
   - name: publish

README.md

@@ -4,6 +4,7 @@
 
 默认进行自动构建、发布到MinIO并自动部署到测试服务器
 
+1. 提交前确保先拉取更新
 1. 提交时确保编译通过，提交后检查CI服务器编译是否成功
 1. 不需要自动构建和部署的，在提交信息中添加 `[CI SKIP]`
 1. 针对特定问题的解决，提交信息中添加问题编号

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -94,6 +94,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="appsettings.Production.json.backup">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="start.cmd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Production.json.backup

@@ -0,0 +1,16 @@
+{
+  "ConnectionStrings": {
+    "Default": "Server=WIN-33SNP5V4K0L,1433;Database=BJABP;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
+    "SettleAccountService": "Server=WIN-33SNP5V4K0L,1433;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;",
+	"WMSBJBMPT": "Server=10.62.101.3,1433;Database=ExChangeCenter;User ID=sa;Password=Microsoft2008;Trusted_Connection=False;TrustServerCertificate=True;",
+  },
+  "AuthServer": {
+    "Authority": "http://localhost:16082"
+  },
+  "MinIO": {
+    "EndPoint": "localhost:16084",
+    "AccessKey": "g0GKnhRGEQHI0uiGBYre",
+    "SecretKey": "iKGlLz6UBzci3xrERw5Zz1gI77enT5u9agFemHPv",
+    "BucketName": "default"
+  }
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js

@@ -1,10 +1,13 @@
 import html from "html";
 
 export default {
-  template: html`<a href="../assets/导入模版.zip" target="blank">导入模板下载</a>
+  template: html`<a href="javascript:;" @click="download">导入模板下载</a>
     <br />
     <el-tree v-if="0" default-expand-all :data="list" :props="props" @node-click="handleNodeClick" /> `,
   setup() {
+    const download = () => {
+      window.open(`../assets/导入模版.zip?time=${Date.now()}`);
+    };
     const page = "page";
     const createRoute = (path, title, type = "group") => {
       return {
@@ -110,6 +113,7 @@ export default {
       }
     };
     return {
+      download,
       list,
       props,
       handleNodeClick,

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs

@@ -396,7 +396,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// <summary>
         ///单价
         /// </summary>
-        [Display(Name = "单价")]
+        [Display(Name = "价格")]
         public decimal PRICE { get; set; }
         /// <summary>
         ///数量
@@ -420,6 +420,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [Display(Name = "协议编号")]
         public string ContractID { get; set; }
+
+
+        [Display(Name = "备注")]
+        public string Remark { set; get; }
+
+
+
         [Display(Name = "商品组")]
         public string ProductionGroup { get; set; }
 
@@ -451,7 +458,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
     public class INVOICE_WAIT_DETAIL_BBAC_DTO
     {
-
         /// <summary>
         ///期间
         /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs

@@ -48,6 +48,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         public async Task<string> ExportAsync(RequestDto input)
         {
             string fileName = $"BBAC的EDI数据_{Guid.NewGuid()}.xlsx";
+
+
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false); ;
             var dtos = ObjectMapper.Map<List<BBAC_SE_EDI>, List<BBAC_SE_EDI_EXPORT_DTO>>(entities);
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -264,8 +264,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             };
                 entity.INVOICE_WAIT_DETAIL_BJ = bjquery.OrderBy(p=>p.LineCode).ToList();
 
-
-
             }
             else
             {
@@ -494,8 +492,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 {
                     _excel.Append(unsettle, "未结零件汇总");
                 }
-
-
             }
             if (first.BusinessType == EnumBusinessType.MaiDanJianHBPO)
             {
@@ -515,16 +511,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     _excel.Append(jitunsettle, "未结零件汇总");
                 }
             }
-
-
-
             //jis业务，发票分组对应关系，未结数据，调整数据
             if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO)
             {
                 foreach (var itm in entities)
                 {
                     var mgroup = m.Where(p => p.InvbillNum == itm.InvbillNum).ToList();
-                    var adjp = adj.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
+                    var adjp =   adj.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
                     var nolist = not.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
                     var lsC = nolist.Where(p => p.Extend1 == "可结算")
                         .GroupBy(p => new

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@@ -1840,12 +1840,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             adjlist.Add(detail);
                         }
                     }
-                    var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID })
+                    var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID,p.LU })
                         .Select(itm => new
                         {
                             PartCode = itm.Key.PartCode,
                             InvGroupNum = itm.Key.InvGroupNum,
-                            LU = itm.Key.PartCode,
+                            LU = itm.Key.LU,
                             ContactDocID = itm.Key.ContractDocID,
                             Price = itm.Key.Price,
                             Amt = Math.Round(itm.Sum(k => k.Qty) * itm.Key.Price, 2),