diff --git a/.drone.yml b/.drone.yml index 860f3393..0ce8222c 100644 --- a/.drone.yml +++ b/.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 - - # - 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 + - mkdir -p publish - 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 - - echo ok + - cmd.exe + - 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 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd index 1d3f772a..b85be9a6 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd +++ b/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 ) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh new file mode 100644 index 00000000..b85be9a6 --- /dev/null +++ b/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 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.cmd index d147d6c6..22032ba8 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.cmd +++ b/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 \ No newline at end of file +taskkill /im SettleAccount.HttpApi.Host.exe /f /t diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh new file mode 100644 index 00000000..22032ba8 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh @@ -0,0 +1,3 @@ +@echo off + +taskkill /im SettleAccount.HttpApi.Host.exe /f /t diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js index e20f7f03..7989251c 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js +++ b/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, }, }; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs index b1e1669e..8ecce0ef 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs +++ b/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 /// 厂内物料号 /// public string PartCode { get; set; } + /// + /// 生产码类型 + /// + public string ProductionCodeType { get; set; } } /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs index 39f4b8be..a3d4a496 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs +++ b/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 (jisSaDetails.Any()) - { - checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false)); - } - if (maiDanSaDetails.Any()) - { - checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false)); - } - } + //if (!checkList.Any()) + //{ + // //验证客户对应厂内零件号是否存在 + // if (jisSaDetails.Any()) + // { + // checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false)); + // } + // if (maiDanSaDetails.Any()) + // { + // checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false)); + // } + //} if (checkList.Count > 0) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs index b80129eb..3df5c8b0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs @@ -486,7 +486,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// 验证结算分组号是否已存在 - /// 验证导入的零件号在客户-厂内零件号关系表中是否存在 /// private async Task> CheckAsync(List hbpoSaDetails) { @@ -507,18 +506,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (!checkList.Any()) { - //验证客户对应厂内零件号是否存在 - //导入的零件号集合 - var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct(); - var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false); - var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct(); - - //不存在的客户零件号（差集） - var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes); - noExistSettleMaterialCodes.ForEach(t => - { - checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); - }); + ////验证客户对应厂内零件号是否存在 + ////导入的零件号集合 + //var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct(); + //var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false); + //var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct(); + + ////不存在的客户零件号（差集） + //var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes); + //noExistSettleMaterialCodes.ForEach(t => + //{ + // checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); + //}); } return checkList; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs index 769db98b..8897d78b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs @@ -382,7 +382,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// 验证结算分组号是否已存在 - /// 验证导入的零件号在客户-厂内零件号关系表中是否存在 + /// 只有备件验证导入的零件号在客户-厂内零件号关系表中是否存在 /// private async Task> CheckAsync(List pubSaDetails) { @@ -403,18 +403,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (!checkList.Any()) { - //验证客户对应厂内零件号是否存在 - //导入的零件号集合 - var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct(); - var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false); - var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct(); - - //不存在的客户零件号（差集） - var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes); - noExistSettleMaterialCodes.ForEach(t => + if (businessType == EnumBusinessType.BeiJian) { - checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); - }); + //验证客户对应厂内零件号是否存在 + //导入的零件号集合 + var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct(); + var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false); + var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct(); + + //不存在的客户零件号（差集） + var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes); + noExistSettleMaterialCodes.ForEach(t => + { + checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); + }); + } } return checkList; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs index a061e4ef..9f2d2bc8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs +++ b/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(); }