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

.drone.yml

@@ -40,35 +40,15 @@ steps:
       password: Microsoft@2022
       command_timeout: 10m
       script:
+        - mkdir -p /d/BQ-JS/publish
         - cd /d/BQ-JS/publish
-        - ./stop.cmd
+        - cmd.exe
+        - stop.sh
+        - exit
         - sleep 3s
         - cd ..
         - rm -rf publish
-        - mkdir publish
+        - mkdir -p publish
-
-  # - name: deploy-scp
-  #   image: appleboy/drone-scp
-  #   settings:
-  #     host: dev.ccwin-in.com
-  #     port: 16085
-  #     username: Administrator
-  #     password: Microsoft@2022
-  #     source: build/publish
-  #     target: /d/BQ-JS/publish
-  #     timeout: 1800s
-  #     command_timeout: 30m
-
-  # - name: deploy-sftp
-  #   image: axute/drone-sftp
-  #   settings:
-  #     host: dev.ccwin-in.com
-  #     port: 16085
-  #     username: Administrator
-  #     password: Microsoft@2022
-  #     source: build/publish
-  #     target: /d/BQ-JS/publish
-  #     strip_components: 2
 
   - name: deploy-ftp
     image: cschlosser/drone-ftps
@@ -81,6 +61,7 @@ steps:
       PLUGIN_SRC_DIR: /build/publish
       PLUGIN_DEST_DIR: /publish
       PLUGIN_SECURE: false
+      PLUGIN_CHMOD: false
 
   - name: start
     image: appleboy/drone-ssh
@@ -92,5 +73,28 @@ steps:
       command_timeout: 10m
       script:
         - cd /d/BQ-JS/publish
-        - ./start.cmd
+        - cmd.exe
-        - echo ok
+        - start.sh
+
+  # - name: deploy-scp
+  #   image: appleboy/drone-scp
+  #   settings:
+  #     host: dev.ccwin-in.com
+  #     port: 16085
+  #     username: Administrator
+  #     password: Microsoft@2022
+  #     source: build/publish
+  #     target: /d/BQ-JS/publish
+  #     timeout: 1800s
+  #     command_timeout: 30m
+
+  # - name: deploy-sftp
+  #   image: axute/drone-sftp
+  #   settings:
+  #     host: dev.ccwin-in.com
+  #     port: 16085
+  #     username: Administrator
+  #     password: Microsoft@2022
+  #     source: build/publish
+  #     target: /d/BQ-JS/publish
+  #     strip_components: 2

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd

@@ -3,7 +3,7 @@
 tasklist|find /i "SettleAccount.HttpApi.Host.exe"
 
 if %errorlevel% == 0 (
-　　exit
+    exit
 )
 
 

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh

@@ -0,0 +1,14 @@
+@echo off
+
+tasklist|find /i "SettleAccount.HttpApi.Host.exe"
+
+if %errorlevel% == 0 (
+    exit
+)
+
+
+cd /d %~dp0
+
+%1 start mshta vbscript:createobject("wscript.shell").run("""%~0"" ::",0)(window.close)&&exit
+
+start /b SettleAccount.HttpApi.Host.exe --urls http://*:16082

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.cmd

@@ -1,3 +1,3 @@
-@ECHO OFF
+@echo off
 
 taskkill /im SettleAccount.HttpApi.Host.exe /f /t

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh

@@ -0,0 +1,3 @@
+@echo off
+
+taskkill /im SettleAccount.HttpApi.Host.exe /f /t

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js

@@ -37,6 +37,10 @@ const schema = {
       title: "生产号",
       type: "string",
     },
+    productionCodeType: {
+      title: "生产码类型",
+      type: "string",
+    },
     extraProperties,
   },
 };

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

@@ -96,6 +96,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// 厂内物料号
         /// </summary>
         public string PartCode { get; set; }
+        /// <summary>
+        /// 生产码类型
+        /// </summary>
+        public string ProductionCodeType { get; set; }
     }
 
     /// <summary>

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

@@ -176,18 +176,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
             }
 
-            if (!checkList.Any())
+            //if (!checkList.Any())
-            {
+            //{
-                //验证客户对应厂内零件号是否存在
+            //    //验证客户对应厂内零件号是否存在
-                if (jisSaDetails.Any())
+            //    if (jisSaDetails.Any())
-                {
+            //    {
-                    checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false));
+            //        checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false));
-                }
+            //    }
-                if (maiDanSaDetails.Any())
+            //    if (maiDanSaDetails.Any())
-                {
+            //    {
-                    checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false));
+            //        checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false));
-                }
+            //    }
-            }
+            //}
 
             if (checkList.Count > 0)
             {

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

@@ -486,7 +486,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// </summary>
         /// <remarks>
         /// 验证结算分组号是否已存在
-        /// 验证导入的零件号在客户-厂内零件号关系表中是否存在
         /// </remarks>
         private async Task<List<ErrorExportDto>> CheckAsync(List<HBPO_SA_DETAIL> hbpoSaDetails)
         {
@@ -507,18 +506,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
             if (!checkList.Any())
             {
-                //验证客户对应厂内零件号是否存在
+                ////验证客户对应厂内零件号是否存在
-                //导入的零件号集合
+                ////导入的零件号集合
-                var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct();
+                //var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct();
-                var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+                //var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
-                var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
+                //var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
-
+
-                //不存在的客户零件号（差集）
+                ////不存在的客户零件号（差集）
-                var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
+                //var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
-                noExistSettleMaterialCodes.ForEach(t =>
+                //noExistSettleMaterialCodes.ForEach(t =>
-                {
+                //{
-                    checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
+                //    checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
-                });
+                //});
             }
 
             return checkList;

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

@@ -382,7 +382,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// </summary>
         /// <remarks>
         /// 验证结算分组号是否已存在
-        /// 验证导入的零件号在客户-厂内零件号关系表中是否存在
+        /// 只有备件验证导入的零件号在客户-厂内零件号关系表中是否存在
         /// </remarks>
         private async Task<List<ErrorExportDto>> CheckAsync(List<PUB_SA_DETAIL> pubSaDetails)
         {
@@ -402,6 +402,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
 
             if (!checkList.Any())
+            {
+                if (businessType == EnumBusinessType.BeiJian)
                 {
                     //验证客户对应厂内零件号是否存在
                     //导入的零件号集合
@@ -416,6 +418,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
                     });
                 }
+            }
 
             return checkList;
             #endregion

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -996,7 +996,9 @@ namespace Win.Sfs.SettleAccount
                     { "Total", d.Total},
                     { "ProtocolNumber", d.ProtocolNumber},
                     { "Remark", d.Remark},
-                    { "CommodityGroup", d.CommodityGroup}
+                    { "CommodityGroup", d.CommodityGroup},
+                    { "PO", d.Extend3},
+                    { "SettleDate", d.SettleDate}
                 }));
             CreateMap<YinDuJianImportDto, PUB_SA_DETAIL>();
         }