From ec1244d27ac6b0430670af0094572327f200999c Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 16 Sep 2020 23:30:17 +0800 Subject: [PATCH] . --- .../ssjygl/invoice/log/InvoiceLogService.java | 11 +++++- .../receive/InvoiceReceiveService.java | 34 +++++++++++++++-- .../ordercluster/OrderclusterService.java | 9 +++-- .../devicectrl/common/DeviceThread.java | 2 +- .../ssjygl/devicectrl/device/AbsScale.java | 2 +- .../local/ssjygl/devicectrl/device/LED.java | 2 +- .../ssjygl/devicectrl/device/LEDThread.java | 16 ++++---- .../local/ssjygl/devicectrl/device/PLC.java | 4 +- .../ssjygl/devicectrl/device/Printer.java | 2 +- .../invoice/log/InvoiceLogController.java | 17 +++++---- .../receive/InvoiceReceiveController.java | 9 ++++- .../cowr/local/ssjygl/order/OrderService.java | 4 +- .../order/ordertemp/OrderTempSyncService.java | 36 +++++++++++------- .../ssjygl/transport/TransportController.java | 18 +++++++++ .../transport/TransportDeviceService.java | 15 ++++++++ .../src/main/resources/dev/config.properties | 2 +- .../src/main/resources/dev/db.properties | 12 +++--- .../src/main/resources/tpl_完整版.xlsx | Bin 13073 -> 13522 bytes .../invoice/log/InvoiceLogController.java | 17 +++++---- .../receive/InvoiceReceiveController.java | 7 +++- .../ordercluster/OrderclusterSyncService.java | 4 +- 21 files changed, 156 insertions(+), 67 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java index db76cd7..acbb16d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java @@ -21,19 +21,26 @@ import java.util.List; public class InvoiceLogService extends BaseService { public static final InvoiceLogService me = new InvoiceLogService(); - public Page find(PageParam pp, Integer state, String order_sn, String stm, String etm, String code, Integer invoice_type) { - String selectsql = "select t.*, \n" + + public Page find(PageParam pp, Integer supermarket_id, Integer state, String order_sn, String stm, String etm, String code, Integer invoice_type) { + String selectsql = "select t.*, r.supermarket_id, s.name supermarket_name, \n" + " case when t.type = 1 then s.weight when t.type = 3 then p.weight end weight, \n" + " case when t.type = 1 then s.total_price when t.type = 3 then p.total_price end total_price, \n" + " case when t.type = 1 then s.create_time when t.type = 3 then p.create_time end create_time, \n" + " case when t.type = 1 then s.settlement_user_name when t.type = 3 then p.settlement_user_name end settlement_user_name, \n" + " case when t.type = 1 then s.customer_name when t.type = 3 then p.customer_name end customer_name "; String fromsql = "from invoice_log t \n" + + " left join invoice_receive r on r.id = t.invoice_receive_id \n" + + " left join supermarket s on s.id = r.supermarket_id \n" + " left join order_sale s on s.sn = t.order_sn \n" + " left join order_temp p on p.sn = t.order_sn \n" + " where 1=1 \n"; List paraList = new ArrayList<>(); + if (supermarket_id != null) { + fromsql += " and r.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + if (state != null) { fromsql += " and t.state = ? \n"; paraList.add(state); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java index bf848a9..1abff3b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java @@ -58,6 +58,7 @@ public class InvoiceReceiveService extends BaseService { /** * 获取指定超市下一个可用的发票号码 * TODO:要区分专票和普票 + * * @param supermarket_id * @return */ @@ -67,12 +68,37 @@ public class InvoiceReceiveService extends BaseService { return nextInvoice(receive); } - public Page find(PageParam pp) { - String selectsql = "select t.*, s.name supermarket_name, s.name2 supermarket_name2 "; - String fromsql = "from invoice_receive t \n" + + public Page find(PageParam pp, Integer supermarket_id, String reveiver_user_name, String stm, String etm, Integer invoice_type) { + String selectsql = "select t.*, s.name supermarket_name, s.name2 supermarket_name2 "; + String fromsql = "from invoice_receive t \n" + " left join supermarket s on s.id = t.supermarket_id" + " where 1=1 "; - List paraList = new ArrayList<>(); + List paraList = new ArrayList<>(); + + if (supermarket_id != null) { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + + if(StrKit.notBlank(reveiver_user_name)){ + fromsql += " and t.receive_user_name like ? \n"; + paraList.add("%" + reveiver_user_name + "%"); + } + + if(StrKit.notBlank(stm)){ + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if(StrKit.notBlank(etm)){ + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + if (invoice_type != null) { + fromsql += " and t.invoice_type = ? \n"; + paraList.add(invoice_type); + } String totalRowSql = "select count(*) " + fromsql; String findSql = selectsql + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 0c2b4f2..84c85c5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -110,7 +110,7 @@ public class OrderclusterService extends BaseService { findSql += " " + Const.ORDER_BY_DESC; } } else { - findSql += " order by t.cutoff_time desc"; + findSql += " order by t.create_time desc"; } Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); @@ -191,7 +191,7 @@ public class OrderclusterService extends BaseService { findSql += " " + Const.ORDER_BY_DESC; } } else { - findSql += " order by t.cutoff_time desc"; + findSql += " order by t.create_time desc"; } Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); @@ -271,6 +271,8 @@ public class OrderclusterService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } + } else { + findSql += " order by t.create_time desc "; } Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); @@ -569,10 +571,11 @@ public class OrderclusterService extends BaseService { /** * 获取集团订单剩余成量 + * * @param ordercluster_id * @return */ - public BigDecimal getOverWeight(int ordercluster_id){ + public BigDecimal getOverWeight(int ordercluster_id) { String sql = "select sum(a.weight) weight from ( \n " + " select t.ordercluster_id, sum(t.weight) weight from order_sale t \n" + " where t.state = ? \n" + diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java index e179f9d..9021f18 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java @@ -211,7 +211,7 @@ public class DeviceThread extends Thread { throw new IllegalArgumentException(scaleId + " does not exist"); } - return this.scaleMap.get(scaleId).weigh(); + return this.scaleMap.get(scaleId).weigh15(); } public void print(String printerId, File file) throws IOException { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java index f55d3a7..87e8072 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java @@ -23,7 +23,7 @@ public abstract class AbsScale extends Device { try { socket = new Socket(); socket.setSoTimeout(1000); - socket.connect(new InetSocketAddress(getIp(), getPort()), 3000); + socket.connect(new InetSocketAddress(getIp(), getPort()), 5000); return true; } finally { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java index af5a2a4..7662b39 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java @@ -175,7 +175,7 @@ public class LED extends Device { try { socket = new Socket(); socket.setSoTimeout(1000); - socket.connect(new InetSocketAddress(getIp(), getPort()), 3000); + socket.connect(new InetSocketAddress(getIp(), getPort()), 5000); } finally { lock.unlock(); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java index b421e2b..f5f78ae 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java @@ -71,16 +71,16 @@ public class LEDThread extends Device implements Runnable { while (this.running){ try { - setWeightInfo("鄂A7D1P1", df.format(new Date())); +// // 发送测试消息 setWeightInfo("鄂A7D1P1", df.format(new Date())); screen(); - Thread.sleep(1000); + Thread.sleep(5000); }catch (Exception e){ log.error(e.getMessage(), e); } - System.out.println("running：" + running); +// System.out.println("running：" + running); } System.out.println("led 线程退出"); @@ -126,7 +126,7 @@ public class LEDThread extends Device implements Runnable { msgCrc[msgCrc.length - 3] = (byte) crc; msgCrc[msgCrc.length - 1] = frameTail; - System.out.println("LED 发送数据：" + HexDump.toHex(msgCrc)); +// System.out.println(getId() + " LED 发送数据：" + HexDump.toHex(msgCrc)); socket.getOutputStream().write(msgCrc); socket.getOutputStream().flush(); @@ -143,7 +143,7 @@ public class LEDThread extends Device implements Runnable { } byte[] z = new byte[read]; System.arraycopy(y, 0, z, 0, read); - System.out.println("LED 返回数据：" + HexDump.toHex(z)); +// System.out.println(getId() + " LED 返回数据：" + HexDump.toHex(z)); // socket.close(); } catch (Exception e) { log.error(e.getMessage(), e); @@ -230,7 +230,7 @@ public class LEDThread extends Device implements Runnable { try { socket = new Socket(); socket.setSoTimeout(1000); - socket.connect(new InetSocketAddress(getIp(), getPort()), 3000); + socket.connect(new InetSocketAddress(getIp(), getPort()), 5000); } finally { lock.unlock(); } @@ -275,7 +275,7 @@ public class LEDThread extends Device implements Runnable { try { socket = new Socket(); socket.setSoTimeout(1000); - socket.connect(new InetSocketAddress(getIp(), getPort()), 3000); + socket.connect(new InetSocketAddress(getIp(), getPort()), 5000); } catch (Exception e) { log.error(e.getMessage(), e); } finally { @@ -287,7 +287,7 @@ public class LEDThread extends Device implements Runnable { public static void main(String[] args) { try { - LEDThread led = new LEDThread("", "192.168.30.205", 5005); + LEDThread led = new LEDThread("", "192.168.20.52", 5005); Thread thread = new Thread(led); thread.setDaemon(true); thread.start(); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java index b5ba587..ee93a3b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java @@ -64,7 +64,7 @@ public class PLC extends Device { socket.setSoLinger(false, 0); socket.setKeepAlive(true); socket.setSoTimeout(3000); - socket.connect(new InetSocketAddress(getIp(), getPort()), 3000); + socket.connect(new InetSocketAddress(getIp(), getPort()), 5000); int crc = CRC16.calcCrc16(presetRead); byte[] data = new byte[presetRead.length + 2]; @@ -259,7 +259,7 @@ public class PLC extends Device { PLC plc = new PLC("_plc", "192.168.20.20", 502, com.cowr.local.ssjygl.devicectrl.common.DeviceThread.defaultAddressTable); plc.connect(); plc.isConnected(); - plc.write("rodIn2Up"); + plc.write("rodIn2Down"); // plc.write("rodOut2Up"); // plc.write("sensorIn2Reset"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java index c9796f7..ecce935 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java @@ -28,7 +28,7 @@ public class Printer { socket.setSoLinger(false, 0); socket.setKeepAlive(false); socket.setSoTimeout(15000); - socket.connect(new InetSocketAddress(ip, port), 3000); + socket.connect(new InetSocketAddress(ip, port), 5000); FileInputStream fis = new FileInputStream(file); OutputStream out = socket.getOutputStream(); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java index 9004582..7722bd4 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java @@ -34,14 +34,15 @@ public class InvoiceLogController extends Controller { * 分页查找 invoice_log 发票管理 - 发票使用记录 */ public void find() { - PageParam pp = getBean(PageParam.class, "", true); - Integer state = getInt("state"); - String order_sn = get("order_sn"); - String stm = get("stm"); - String etm = get("etm"); - String code = get("code"); - Integer invoice_type = getInt("invoice_type"); - renderJson(Result.object(InvoiceLogService.me.find(pp, state, order_sn, stm, etm, code, invoice_type))); + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + Integer state = getInt("state"); + String order_sn = get("order_sn"); + String stm = get("stm"); + String etm = get("etm"); + String code = get("code"); + Integer invoice_type = getInt("invoice_type"); + renderJson(Result.object(InvoiceLogService.me.find(pp, supermarket_id, state, order_sn, stm, etm, code, invoice_type))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java index 7e792f6..c984670 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java @@ -32,8 +32,13 @@ public class InvoiceReceiveController extends Controller { * 分页查找 invoice_receive 发票管理 - 领用记录 */ public void find() { - PageParam pp = getBean(PageParam.class, "", true); - renderJson(Result.object(InvoiceReceiveService.me.find(pp))); + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + String reveiver_user_name = get("reveiver_user_name"); + String stm = get("stm"); + String etm = get("etm"); + Integer invoice_type = getInt("invoice_type"); + renderJson(Result.object(InvoiceReceiveService.me.find(pp, supermarket_id, reveiver_user_name, stm, etm, invoice_type))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/OrderService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/OrderService.java index e5f1519..55a63d4 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/OrderService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/OrderService.java @@ -141,7 +141,7 @@ public class OrderService { out.set("pay", ret); // 支付结果 if (ret) { - if (req_receipt == 1) { +// if (req_receipt == 1) { try { printdata.set("first_weight", transport.getFirstWeight()); printdata.set("second_weight", transport.getSecondWeight()); @@ -152,7 +152,7 @@ public class OrderService { out.set("print", "打印指令发送失败"); log.error(e.getMessage(), e); } - } +// } try { if (transport.getTruckLicense().equals(Config.deviceThread.getCtrlCurrentLicense(transport.getOutWhich()))) { 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 53b2798..1158795 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 @@ -251,11 +251,6 @@ public class OrderTempSyncService { return Result.failedstr("集团订单【%s】信息不存在", ordercluster_id); } - Customer customer = Customer.dao.findById(ordercluster.getCustomerId()); - if (customer == null) { - return Result.failed("未找到关联客户信息"); - } - if (!DateTimeUtil.isToday(ordercluster.getCutoffTime())) { return Result.failedstr("集团订单只能在%s使用", DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); } @@ -310,7 +305,7 @@ public class OrderTempSyncService { BigDecimal overweight = OrderclusterService.me.getOverWeight(ordercluster_id); // 集团订单已完成量 // 不能超过集团订单剩余量 if (net_weight.compareTo(ordercluster.getTotalWeight().subtract(overweight)) > 0) { - return Result.failedstr("净重 %.2f 吨，超过了剩余的 %.2f 余量", net_weight, overweight); + return Result.failedstr("净重 %.2f 吨，超过了剩余的 %.2f 余量", net_weight, ordercluster.getTotalWeight().subtract(overweight)); } // if (req_receipt == 1) { // 需要同时开具发票 @@ -334,14 +329,27 @@ public class OrderTempSyncService { order.setOrderclusterId(ordercluster_id); // 客户信息 - order.setCustomerId(customer.getId()); - order.setCustomerAddress(customer.getAddress()); - order.setCustomerBankAccount(customer.getBankAccount()); - order.setCustomerBankName(customer.getBankName()); - order.setCustomerName(customer.getName()); - order.setCustomerPhone(customer.getPhone()); - order.setCustomerTexpayerName(customer.getTexpayerName()); - order.setCustomerTexpayerNum(customer.getTexpayerNum()); + Customer customer = Customer.dao.findById(ordercluster.getCustomerId()); + if (customer != null) { + order.setCustomerId(customer.getId()); + order.setCustomerAddress(customer.getAddress()); + order.setCustomerBankAccount(customer.getBankAccount()); + order.setCustomerBankName(customer.getBankName()); + order.setCustomerName(customer.getName()); + order.setCustomerPhone(customer.getPhone()); + order.setCustomerTexpayerName(customer.getTexpayerName()); + order.setCustomerTexpayerNum(customer.getTexpayerNum()); + } else { + order.setCustomerId(ordercluster.getCustomerId()); + order.setCustomerAddress(ordercluster.getCustomerAddress()); + order.setCustomerBankAccount(ordercluster.getCustomerBankAccount()); + order.setCustomerBankName(ordercluster.getCustomerBankName()); + order.setCustomerName(ordercluster.getCustomerName()); + order.setCustomerPhone(ordercluster.getCustomerPhone()); + order.setCustomerTexpayerName(ordercluster.getCustomerTexpayerName()); + order.setCustomerTexpayerNum(ordercluster.getCustomerTexpayerNum()); + } + // 物流公司信息 order.setTransCoId(ordercluster.getTransCoId()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java index 6d5a4b2..6f0ae00 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java @@ -269,6 +269,24 @@ public class TransportController extends BaseController { renderJson(result ? Result.success(true) : Result.failed("抬闸失败")); } + public void cmdScale() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.permissionDenied()); + return; + } + + String which = get("which"); // Enums.WhichEnum R01 入场流程 C01 出场流程 + + if (StrKit.notBlank(which)) { + which = which.toUpperCase(); + } + + double result = TransportDeviceService.me.cmdScale(which, tokenuser); + renderJson(Result.success(result)); + } + @Before(TransportIdValidator.class) public void cancel() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java index 65f2cc0..442d7d3 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java @@ -249,6 +249,21 @@ public class TransportDeviceService { } } + public double cmdScale(String which, Sysuser sysuser){ + Record cmdlog = new Record(); + cmdlog.set("cmd", "scale"); + cmdlog.set("which", which); + + try{ + ActionCmdLogService.me.save(cmdlog.toJson(), sysuser); + + return Config.deviceThread.scale(which); + }catch (Exception e){ + log.error(e.getMessage(), e); + return 0.0; + } + } + /** * 调用相机接口，手动触发识别 * @param which diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties index 8161eb6..32e3d9a 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties @@ -10,7 +10,7 @@ socketserver.port=21002 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=6 +current.supermarket_id=2 #打印用到的配置信息 print.vendor=浠水县长投环保有限公司 diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties index 4597813..1dbd269 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties @@ -1,12 +1,12 @@ # mysql # GRANT ALL PRIVILEGES ON *.* TO 'root'@'192.168.1.119' IDENTIFIED BY 'Local_1' WITH GRANT OPTION; -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -user=dev_ssjy_xsx -password=Ssjy_xs_890 +#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#user=dev_ssjy_xsx +#password=Ssjy_xs_890 -#jdbcUrl=jdbc:mysql://localhost:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -#user=root -#password=Ssjy_xsx_890 +jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=root +password=Ssjy_xsx_890 # redis redis.basekey=ssjcgl_xsx_dev diff --git a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx index 44d10ee8a93c8ce546b5453cafed00da2fdcf1ff..7d5287479ab149564524f5a10a8b8142484f01a8 100644 GIT binary patch delta 6621 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 WTqrvcX-orNRIvyfZX*A`F#iF)-JcNv diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java index 09ad3b5..8f4f0b4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java @@ -33,14 +33,15 @@ public class InvoiceLogController extends Controller { * 分页查找 invoice_log 发票管理 - 发票使用记录 */ public void find() { - PageParam pp = getBean(PageParam.class, "", true); - Integer state = getInt("state"); - String order_sn = get("order_sn"); - String stm = get("stm"); - String etm = get("etm"); - String code = get("code"); - Integer invoice_type = getInt("invoice_type"); - renderJson(Result.object(InvoiceLogService.me.find(pp, state, order_sn, stm, etm, code, invoice_type))); + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + Integer state = getInt("state"); + String order_sn = get("order_sn"); + String stm = get("stm"); + String etm = get("etm"); + String code = get("code"); + Integer invoice_type = getInt("invoice_type"); + renderJson(Result.object(InvoiceLogService.me.find(pp, supermarket_id, state, order_sn, stm, etm, code, invoice_type))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java index 3d8bf6b..3142e1f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java @@ -100,7 +100,12 @@ public class InvoiceReceiveController extends Controller { */ public void find(){ PageParam pp = getBean(PageParam.class, "", true); - renderJson(Result.object(InvoiceReceiveService.me.find(pp))); + Integer supermarket_id = getInt("supermarket_id"); + String reveiver_user_name = get("reveiver_user_name"); + String stm = get("stm"); + String etm = get("etm"); + Integer invoice_type = getInt("invoice_type"); + renderJson(Result.object(InvoiceReceiveService.me.find(pp, supermarket_id, reveiver_user_name, stm, etm, invoice_type))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index dd575bf..d3da80f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -297,9 +297,9 @@ public class OrderclusterSyncService extends BaseSyncService { model.setCustomerName(customer_name); // 判断是否需要开具发票 - if (req_receipt == 1) { +// if (req_receipt == 1) { model.setCustomerTexpayerNum(customer_texpayer_num); - } +// } model.setTransDistance(new BigDecimal(0));