xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-10-23 17:14:47 +08:00
parent e16f8188b3
commit 9a602b3df3
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java
View File

@ -33,8 +33,10 @@ public class InvoiceInvalidVerifyService extends BaseService {
Integer supermarket_id,
Integer state
) {
String selectsql = "select * ";
String fromsql = "from invoice_invalid_verify t where 1=1 ";
String selectsql = "select t.*, s.name supermarket_name ";
String fromsql = "from invoice_invalid_verify t \n" +
" left join supermarket s on s.id = t.supermarket_id \n" +
" where 1=1 \n";
List<Object> paraList = new ArrayList<>();
if (StrKit.notBlank(stm)) {

11
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -279,10 +279,7 @@ public class OrderStatService {
if (sup_name == null) {
row.createCell(a++).setCellValue("砂站");
}
row.createCell(a++).setCellValue("物流公司");
row.createCell(a++).setCellValue("车牌号");
row.createCell(a++).setCellValue("运距(公里)");
row.createCell(a++).setCellValue("运费(元)");
row.createCell(a++).setCellValue("预付费");
// 表头 end
@ -292,7 +289,7 @@ public class OrderStatService {
double sum_trans_price = 0.0;
double isprepaid_sum_price = 0.0;
int datalen = list.size();
int end_col = sup_name == null ? 14 : 13;
int end_col = sup_name == null ? 11 : 10;
for (int i = 0; i < datalen; i++) {
Record order = list.get(i);
@ -320,10 +317,7 @@ public class OrderStatService {
if (sup_name == null) {
row.createCell(a++).setCellValue(order.getStr("supermarket_name"));
}
row.createCell(a++).setCellValue(order.getStr("trans_co_name"));
row.createCell(a++).setCellValue(order.getStr("truck_license"));
row.createCell(a++).setCellValue(order.getStr("trans_distance"));
row.createCell(a++).setCellValue(order.getStr("trans_price"));
row.createCell(a++).setCellValue(order.getStr("memo"));
}
@ -343,9 +337,6 @@ public class OrderStatService {
row.createCell(a++).setCellValue("");
}
row.createCell(a++).setCellValue("");
row.createCell(a++).setCellValue("");
row.createCell(a++).setCellValue(sum_distance);
row.createCell(a++).setCellValue(sum_trans_price);
row.createCell(a++).setCellValue(isprepaid_sum_price);
// 合计 end

13
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java
View File

@ -19,14 +19,14 @@ public class InvoiceInvalidVerifySyncService {
private static Log log = Log.getLog(InvoiceInvalidVerifySyncService.class);
public static InvoiceInvalidVerifySyncService me = new InvoiceInvalidVerifySyncService();
public Result save(String order_sn, String invalid_memo, Sysuser sysuser){
public Result save(String order_sn, String invalid_memo, Sysuser sysuser) {
OrderTemp order = OrderTemp.dao.findById(order_sn);
if(order == null){
if (order == null) {
return Result.failedstr("按 %s 没有找到订单信息", order_sn);
}
if(order.getInvoiceType() == 2){
if (order.getInvoiceType() == 2) {
return Result.failed("专票作废只能由财务处理");
}
@ -35,6 +35,13 @@ public class InvoiceInvalidVerifySyncService {
return Result.failed("没有有效的发票领用记录，或者订单没有开具有效的发票");
}
InvoiceInvalidVerify old = InvoiceInvalidVerify.dao.findFirst(
"select * from invoice_invalid_verify t where t.state = ? and t.order_sn = ?", 1, order_sn);
if (old != null) {
return Result.failedstr("订单 %s 已提交申请", order_sn);
}
InvoiceInvalidVerify model = new InvoiceInvalidVerify();
model.setId(StrKit.getRandomUUID());
model.setSupermarketId(CliCacheData.SUP.getId());