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 44d10ee..7d52874 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-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));