diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java index 4b2be37..4743e4e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java @@ -3,11 +3,8 @@ package com.cowr.local.ssjygl.customer.supermarketproduct; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.CustomerSupermarketProduct; -import com.cowr.model.Sysuser; -import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.customer.supermarketproduct.CustomerSupermarketProductPKValidator; import com.cowr.ssjygl.customer.supermarketproduct.CustomerSupermarketProductService; -import com.cowr.ssjygl.customer.supermarketproduct.CustomerSupermarketProductValidator; import com.jfinal.aop.Before; import com.jfinal.core.Controller; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java index 2cdba35..e57a25f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java @@ -40,6 +40,9 @@ public class ExcelHelper { datetimePrint = CellAddresses.datetimePrint; } +// CellStyle cellStyle = workbook.createCellStyle(); +// cellStyle.setWrapText(true); + Set> entrySet = addrMap.entrySet(); for (Map.Entry entry : entrySet) { Object val = model.get(entry.getKey()); @@ -55,7 +58,9 @@ public class ExcelHelper { // anchor.setAnchorType(ClientAnchor.AnchorType.byId(2)); // patriarch.createPicture(anchor, workbook.addPicture(QRcodeZxingUtil.generateQRcodeByte(val.toString(), 200, "png"), XSSFWorkbook.PICTURE_TYPE_PNG)); // } else { - getCell(getRow(sheet, addr.getRow()), addr.getColumn()).setCellValue(val.toString()); + Cell cell = getCell(getRow(sheet, addr.getRow()), addr.getColumn()); + cell.setCellValue(val.toString()); +// cell.setCellStyle(cellStyle); // } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java index 344697e..ebc2af5 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java @@ -333,7 +333,7 @@ public class LocalOrderService { } origin = supermarket.getName(); // 运输起点 - dest = clientName; // 运输终点 + dest = StrUtil.getRecordStr(order, "customer_receiver_address"); // 运输终点 vendor = CacheData.print_vendor; // 销售方名称 vendorTaxId = CacheData.print_vendorTaxId; // 销售方纳税人识别号 @@ -344,6 +344,14 @@ public class LocalOrderService { remark = "订单号：" + StrUtil.getRecordStr(order, "sn"); } +// if(StrKit.notBlank(origin)){ +// remark += "\r\n发货地：" + origin; +// } +// +// if(StrKit.notBlank(dest)){ +// remark += "\r\n收货地：" + dest; +// } + if (order.get("total_price") != null) { paid = String.format("%.2f", order.getBigDecimal("total_price")); // 总价 paidUp = ChineseNumberUtil.getChineseNumber(order.getBigDecimal("total_price").doubleValue()); // 总价汉字大写 diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java index 782635e..318f43b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java @@ -8,7 +8,6 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.LocalOrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.ssjygl.customer.supermarketproduct.CustomerSupermarketProductService; -import com.cowr.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index e8f74b1..d5d3e48 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -17,7 +17,6 @@ import com.cowr.ssjygl.invoice.receive.InvoiceReceiveService; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java index 0bb17ff..2b83fb5 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java @@ -7,7 +7,6 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.utils.ImageUtil; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.Config; -import com.cowr.local.ssjygl.order.LocalOrderService; import com.cowr.ssjygl.customer.supermarketproduct.CustomerSupermarketProductService; import com.cowr.ssjygl.invoice.receive.InvoiceReceiveService; import com.cowr.ssjygl.order.OrderService; diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties index efd6107..bc5991a 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties @@ -19,16 +19,24 @@ current.supermarket_id=6 #落杆后，等待上磅的时间 default_scale_wait_time=5000 +#最大毛重不超过 49 吨，超过 49 吨不能上高速 +#2020-10-16 盐港都是小磅，最大只能40 +weigh.max=40 + #打印用到的配置信息 print.vendor=浠水县长投环保有限公司 print.vendorTaxId=91421125MA49GYYK2B + + + + + + + #如果物流车辆入场重量大大超过皮重（>=10%），则认为是转运车辆 #2019-08-01 暂定 50% weight.distinguish=0.5 -#最大毛重不超过 49 吨，超过 49 吨不能上高速 -#2020-10-16 盐港都是小磅，最大只能40 -weigh.max=40 #起步运输距离 start.trans.distance=5 diff --git a/ssjygl-xsx-local/src/main/resources/prod/config.properties b/ssjygl-xsx-local/src/main/resources/prod/config.properties index 1d8e729..0b6b5f9 100644 --- a/ssjygl-xsx-local/src/main/resources/prod/config.properties +++ b/ssjygl-xsx-local/src/main/resources/prod/config.properties @@ -18,16 +18,22 @@ socketio.port=12002 current.supermarket_id=6 #落杆后，等待上磅的时间 default_scale_wait_time=5000 +#最大毛重不超过 49 吨，超过 49 吨不能上高速 +#2020-10-16 盐港都是小磅，最大只能40 +weigh.max=49 #打印用到的配置信息 print.vendor=浠水县长投环保有限公司 print.vendorTaxId=91421125MA49GYYK2B + + + + + #如果物流车辆入场重量大大超过皮重（>=10%），则认为是转运车辆 #2019-08-01 暂定 50% weight.distinguish=0.5 -#最大毛重不超过 49 吨，超过 49 吨不能上高速 -weigh.max=49 #起步运输距离 start.trans.distance=5 diff --git a/ssjygl-xsx-local/src/main/resources/tpl.xlsx b/ssjygl-xsx-local/src/main/resources/tpl.xlsx index 75f41d7..8c2d647 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl.xlsx differ diff --git a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx index 03ed56f..19b045e 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx differ diff --git a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx index c18ee44..a22a1c1 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx differ diff --git a/ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx index 6113ca5..8559b7a 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx differ