diff --git a/.drone.yml b/.drone.yml index d802a25d..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 - - cmd.exe -k 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 @@ -93,5 +73,28 @@ steps: command_timeout: 10m script: - cd /d/BQ-JS/publish - - cmd.exe -k start.cmd + - 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/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs index 5df737fd..9571dc1d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs @@ -387,11 +387,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string LU { get; set; } [Display(Name = "零件名称")] public string PartDesc { get; set; } - /// - ///发票分组号 - /// - [Display(Name = "发票分组号")] - public string InvGroupNum { get; set; } + ///// + /////发票分组号 + ///// + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } /// ///单价 @@ -438,6 +438,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public DateTime EndDate { get; set; } + [Display(Name = "行号")] + public int LineCode { get; set; } + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index bb39cf6d..683fb095 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -178,7 +178,7 @@ namespace Win.Sfs.SettleAccount.Bases bj.LU = itm.LU; bj.LU = itm.PartCode; bj.PRICE = itm.PRICE; - bj.InvGroupNum = itm.InvGroupNum; + // bj.InvGroupNum = itm.InvGroupNum; bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 @@ -205,7 +205,7 @@ namespace Win.Sfs.SettleAccount.Bases RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, //Version = itm.Version, InvbillNum = itm.InvbillNum, - InvGroupNum = itm.InvGroupNum, + //InvGroupNum = itm.InvGroupNum, LU = itm.LU, // LU = itm.PartCode, PRICE = itm.PRICE, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index ac547d53..49eb2900 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -18,6 +18,7 @@ using Shouldly; using SqlSugar; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Data; using Volo.Abp.Domain.Entities; using Volo.Abp.Uow; using Win.Abp.Snowflakes; @@ -197,21 +198,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ bj.LU = itm.LU; bj.InvbillNum=itm.InvbillNum; bj.PRICE = itm.PRICE; - bj.InvGroupNum = itm.InvGroupNum; - bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); + // bj.InvGroupNum = itm.InvGroupNum; + bj.DeliveryIndexNumber =itm.GetProperty("DeliveryIndexNumber",""); bj.Qty = itm.Qty; bj.PRICE = itm.PRICE; bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2); bj.RealAmt = Math.Round(Math.Round(itm.PRICE * itm.Qty, 2) * 0.13m, 2); bj.TaxAmt = Math.Round(itm.PRICE * itm.Qty, 2) + Math.Round(Math.Round(itm.PRICE * itm.Qty, 2) * 0.13m, 2); bj.Extend1=itm.Extend1;//合同号 - bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码 - bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称 - bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号; - bj.PN = itm.ExtraProperties["PN"].ToSqlValue();// - bj.PO=itm.ExtraProperties["PO"].ToSqlValue(); - bj.ProductionGroup = itm.ExtraProperties["PartGroup"].ToSqlValue(); - + bj.VendorCode = itm.GetProperty("VendorCode","");//供应商代码 + bj.VendorName = itm.GetProperty("VendorName","");//供应商名称 + bj.DeliveryNumber = itm.GetProperty("DeliveryNumber","");//交货号; + bj.PN = itm.GetProperty("PN","");// + bj.PO= itm.GetProperty("PO",""); + bj.ProductionGroup = itm.GetProperty("PartGroup",""); + bj.LineCode = itm.LineCode; bj.BeginDate=itm.BeginDate; bj.EndDate = itm.EndDate; //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 @@ -238,7 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, //Version = itm.Version, InvbillNum = itm.InvbillNum, - InvGroupNum = itm.InvGroupNum, + //InvGroupNum = itm.InvGroupNum, LU = itm.LU, //PartCode = itm.PartCode, PO=itm.PO, @@ -250,16 +251,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ VendorCode = itm.VendorCode, VendorName = itm.VendorName, // PurchaseOrderNumber = itm.PurchaseOrderNumber, - DeliveryIndexNumber = itm.DeliveryIndexNumber, + DeliveryIndexNumber = itm.DeliveryIndexNumber , Extend1 = itm.Extend1, BeginDate = itm.BeginDate, EndDate = itm.EndDate, RealAmt=itm.RealAmt, TaxAmt=itm.TaxAmt, SettleDate = itm.SettleDate, - ProductionGroup=itm.ProductionGroup + ProductionGroup=itm.ProductionGroup, + LineCode=itm.LineCode + }; - entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList(); + entity.INVOICE_WAIT_DETAIL_BJ = bjquery.OrderBy(p=>p.LineCode).ToList();