|
|
@@ -1346,10 +1346,10 @@ public class OrderController {
|
|
|
//查询列表数据
|
|
|
// =================================================System Format导出开始=====================================
|
|
|
List<SystemFormatDto> systemFormatList = orderService.queryExportSystemFormatList(params);
|
|
|
- String[] header = new String[]{"Receipt No.","Store Name", "Cash Register No.", "Time Stamp Details (Date & Time)", "Staff ID", "Staff Name",
|
|
|
+ String[] header = new String[]{"Receipt No.","Store Name", "Cash Register No.", "Time Stamp Details (Date & Time)", "Staff ID", "Staff Name","Pay Flag","Order Status","Order SnWx","Order SnAli",
|
|
|
"HS Code", "HS Code Name", "E-matou Code", "PLU", "MychemID", "Product Name (EN)","Product Name (CN)", "Barcode", "Pack Size", "Product Specification",
|
|
|
"Brand","EDLP","Current Price","Cost Price","Prime Cost","Goods Number","Deduction Rate","Unit Sold","Sales","Tax amount","Total Sales incl. Tax","Tax Rate",
|
|
|
- "GP ￥","GP %","Product Category","Supplier Name","Transaction Type","Sale Return Type","Order Status","Pay Flag","Order SnWx","Order SnAli","Remark"};
|
|
|
+ "GP ￥","GP %","Product Category","Supplier Name","Transaction Type","Sale Return Type","Remark"};
|
|
|
|
|
|
LinkedHashMap<String, Object> headerMap = initHeaderMap();
|
|
|
List<Map<String, Object>> list = new LinkedList<>();
|
|
|
@@ -1456,6 +1456,10 @@ public class OrderController {
|
|
|
map.put("TimeStampDetails",systemFormat.getTimeStampDetails());
|
|
|
map.put("StaffID",systemFormat.getStaffID());
|
|
|
map.put("StaffName",systemFormat.getStaffName());
|
|
|
+ map.put("PayFlag",systemFormat.getPayFlag());
|
|
|
+ map.put("OrderStatus",orderStatus);
|
|
|
+ map.put("OrderSnWx",systemFormat.getOrderSnWx());
|
|
|
+ map.put("OrderSnAli",systemFormat.getOrderSnAli());
|
|
|
map.put("HSCode",systemFormat.getHsCode());
|
|
|
map.put("HSCodeName",systemFormat.getHsCodeName());
|
|
|
map.put("EmatouCode",systemFormat.getEmatouCode());
|
|
|
@@ -1484,10 +1488,8 @@ public class OrderController {
|
|
|
map.put("SupplierName",systemFormat.getSupplierName());
|
|
|
map.put("TransactionType",systemFormat.getTransactionType());
|
|
|
map.put("SaleReturnType",systemFormat.getSaleReturnType());
|
|
|
- map.put("OrderStatus",orderStatus);
|
|
|
- map.put("PayFlag",systemFormat.getPayFlag());
|
|
|
- map.put("OrderSnWx",systemFormat.getOrderSnWx());
|
|
|
- map.put("OrderSnAli",systemFormat.getOrderSnAli());
|
|
|
+
|
|
|
+
|
|
|
map.put("Remark",systemFormat.getRemark());
|
|
|
|
|
|
list.add(map);
|
|
|
@@ -1512,6 +1514,10 @@ public class OrderController {
|
|
|
headerMap.put("TimeStampDetails","销售时间");
|
|
|
headerMap.put("StaffID","收银员");
|
|
|
headerMap.put("StaffName","收银员姓名");
|
|
|
+ headerMap.put("PayFlag","支付方式");
|
|
|
+ headerMap.put("OrderStatus","支付状态");
|
|
|
+ headerMap.put("OrderSnWx","微信流水号");
|
|
|
+ headerMap.put("OrderSnAli","支付宝流水号");
|
|
|
headerMap.put("HSCode","海关商品编码");
|
|
|
headerMap.put("HSCodeName","品类名称");
|
|
|
headerMap.put("EmatouCode","料件号");
|
|
|
@@ -1540,10 +1546,6 @@ public class OrderController {
|
|
|
headerMap.put("SupplierName","主供应商名称");
|
|
|
headerMap.put("TransactionType","销售类型");
|
|
|
headerMap.put("SaleReturnType","退货类型");
|
|
|
- headerMap.put("OrderStatus","支付状态");
|
|
|
- headerMap.put("PayFlag","支付方式");
|
|
|
- headerMap.put("OrderSnWx","微信流水号");
|
|
|
- headerMap.put("OrderSnAli","支付宝流水号");
|
|
|
headerMap.put("Remark","备注");
|
|
|
return headerMap;
|
|
|
}
|
