Browse Source

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

master
mahao 1 year ago
parent
commit
d487f4c8e3
  1. 55
      .drone.yml
  2. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd
  3. 14
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh
  4. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.cmd
  5. 3
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh
  6. 14
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
  7. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
  8. 29
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

55
.drone.yml

@ -40,35 +40,15 @@ steps:
password: Microsoft@2022 password: Microsoft@2022
command_timeout: 10m command_timeout: 10m
script: script:
- mkdir -p /d/BQ-JS/publish
- cd /d/BQ-JS/publish - cd /d/BQ-JS/publish
- cmd.exe -k stop.cmd - cmd.exe
- stop.sh
- exit
- sleep 3s - sleep 3s
- cd .. - cd ..
- rm -rf publish - 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 - name: deploy-ftp
image: cschlosser/drone-ftps image: cschlosser/drone-ftps
@ -93,5 +73,28 @@ steps:
command_timeout: 10m command_timeout: 10m
script: script:
- cd /d/BQ-JS/publish - 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

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

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

14
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

2
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 taskkill /im SettleAccount.HttpApi.Host.exe /f /t

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

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

14
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; } public string LU { get; set; }
[Display(Name = "零件名称")] [Display(Name = "零件名称")]
public string PartDesc { get; set; } public string PartDesc { get; set; }
/// <summary> ///// <summary>
///发票分组号 /////发票分组号
/// </summary> ///// </summary>
[Display(Name = "发票分组号")] //[Display(Name = "发票分组号")]
public string InvGroupNum { get; set; } //public string InvGroupNum { get; set; }
/// <summary> /// <summary>
///单价 ///单价
@ -438,6 +438,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public DateTime EndDate { get; set; } public DateTime EndDate { get; set; }
[Display(Name = "行号")]
public int LineCode { get; set; }

4
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.LU;
bj.LU = itm.PartCode; bj.LU = itm.PartCode;
bj.PRICE = itm.PRICE; bj.PRICE = itm.PRICE;
bj.InvGroupNum = itm.InvGroupNum; // bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
@ -205,7 +205,7 @@ namespace Win.Sfs.SettleAccount.Bases
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
//Version = itm.Version, //Version = itm.Version,
InvbillNum = itm.InvbillNum, InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum, //InvGroupNum = itm.InvGroupNum,
LU = itm.LU, LU = itm.LU,
// LU = itm.PartCode, // LU = itm.PartCode,
PRICE = itm.PRICE, PRICE = itm.PRICE,

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

@ -18,6 +18,7 @@ using Shouldly;
using SqlSugar; using SqlSugar;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities;
using Volo.Abp.Uow; using Volo.Abp.Uow;
using Win.Abp.Snowflakes; using Win.Abp.Snowflakes;
@ -197,21 +198,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
bj.LU = itm.LU; bj.LU = itm.LU;
bj.InvbillNum=itm.InvbillNum; bj.InvbillNum=itm.InvbillNum;
bj.PRICE = itm.PRICE; bj.PRICE = itm.PRICE;
bj.InvGroupNum = itm.InvGroupNum; // bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue(); bj.DeliveryIndexNumber =itm.GetProperty("DeliveryIndexNumber","");
bj.Qty = itm.Qty; bj.Qty = itm.Qty;
bj.PRICE = itm.PRICE; bj.PRICE = itm.PRICE;
bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2); bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2);
bj.RealAmt = Math.Round(Math.Round(itm.PRICE * itm.Qty, 2) * 0.13m, 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.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.Extend1=itm.Extend1;//合同号
bj.VendorCode = itm.ExtraProperties["VendorCode"].ToSqlValue();//供应商代码 bj.VendorCode = itm.GetProperty("VendorCode","");//供应商代码
bj.VendorName = itm.ExtraProperties["VendorName"].ToSqlValue();//供应商名称 bj.VendorName = itm.GetProperty("VendorName","");//供应商名称
bj.DeliveryNumber = itm.ExtraProperties["DeliveryNumber"].ToSqlValue();//交货号; bj.DeliveryNumber = itm.GetProperty("DeliveryNumber","");//交货号;
bj.PN = itm.ExtraProperties["PN"].ToSqlValue();// bj.PN = itm.GetProperty("PN","");//
bj.PO=itm.ExtraProperties["PO"].ToSqlValue(); bj.PO= itm.GetProperty("PO","");
bj.ProductionGroup = itm.ExtraProperties["PartGroup"].ToSqlValue(); bj.ProductionGroup = itm.GetProperty("PartGroup","");
bj.LineCode = itm.LineCode;
bj.BeginDate=itm.BeginDate; bj.BeginDate=itm.BeginDate;
bj.EndDate = itm.EndDate; bj.EndDate = itm.EndDate;
//bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号 //bj.DeliveryNumber = itm.GetProperty("DeliveryNumber", "");//交货号
@ -238,7 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
//Version = itm.Version, //Version = itm.Version,
InvbillNum = itm.InvbillNum, InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum, //InvGroupNum = itm.InvGroupNum,
LU = itm.LU, LU = itm.LU,
//PartCode = itm.PartCode, //PartCode = itm.PartCode,
PO=itm.PO, PO=itm.PO,
@ -250,16 +251,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
VendorCode = itm.VendorCode, VendorCode = itm.VendorCode,
VendorName = itm.VendorName, VendorName = itm.VendorName,
// PurchaseOrderNumber = itm.PurchaseOrderNumber, // PurchaseOrderNumber = itm.PurchaseOrderNumber,
DeliveryIndexNumber = itm.DeliveryIndexNumber, DeliveryIndexNumber = itm.DeliveryIndexNumber ,
Extend1 = itm.Extend1, Extend1 = itm.Extend1,
BeginDate = itm.BeginDate, BeginDate = itm.BeginDate,
EndDate = itm.EndDate, EndDate = itm.EndDate,
RealAmt=itm.RealAmt, RealAmt=itm.RealAmt,
TaxAmt=itm.TaxAmt, TaxAmt=itm.TaxAmt,
SettleDate = itm.SettleDate, 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();

Loading…
Cancel
Save