Commit bff3841f by guanzhenshan

调整物流往来供应商报表

parent 4cdcbe6b
...@@ -173,8 +173,8 @@ group by t1.receive_unit"; ...@@ -173,8 +173,8 @@ group by t1.receive_unit";
item.amount_other = obj.amount_other; item.amount_other = obj.amount_other;
} }
//期末 = 期初+发生额-付款额+收款额-其他金额 //期末 = 期初+发生额-付款额+收款额(负数)+其他金额(手工导入数据)
item.amount_end = item.amount_start + item.amount_happen - item.amount_pay + (-item.amount_receipt) + item.amount_other; item.amount_end = item.amount_start + item.amount_happen - item.amount_pay + (item.amount_receipt) + item.amount_other;
s += ($"('{item.day.ToString("yyyy-MM-dd")}',{item.supplierid},'{item.suppliername}',{item.amount_start},{item.amount_happen},{item.amount_pay},{item.amount_receipt},{item.amount_other},{item.amount_end},'{item.createtime.ToString("yyyy-MM-dd HH:mm:ss")}','{item.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")}',{item.lastupdateuserid},'{item.lastupdateusername}'),"); s += ($"('{item.day.ToString("yyyy-MM-dd")}',{item.supplierid},'{item.suppliername}',{item.amount_start},{item.amount_happen},{item.amount_pay},{item.amount_receipt},{item.amount_other},{item.amount_end},'{item.createtime.ToString("yyyy-MM-dd HH:mm:ss")}','{item.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")}',{item.lastupdateuserid},'{item.lastupdateusername}'),");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment