.

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java

@@ -116,7 +116,12 @@ public class DeviceThread extends Thread {
             Record record = Db.findFirst("select * from device_config where supermarket_id = ? ", CliCacheData.SUP.getId());
 
             if (record == null) {
-                log.error("从数据库未读到有效的配置");
+                log.error("从数据库未读到有效的砂站本地配置文件");
+                log.error("从数据库未读到有效的砂站本地配置文件");
+                log.error("从数据库未读到有效的砂站本地配置文件");
+                log.error("从数据库未读到有效的砂站本地配置文件");
+                log.error("从数据库未读到有效的砂站本地配置文件");
+                log.error("从数据库未读到有效的砂站本地配置文件");
                 return;
             }
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java

@@ -287,7 +287,7 @@ public class LEDThread extends Device implements Runnable {
 
     public static void main(String[] args) {
         try {
-            LEDThread led    = new LEDThread("", "192.168.20.52", 5005);
+            LEDThread led    = new LEDThread("", "192.168.20.50", 5005);
             Thread    thread = new Thread(led);
             thread.setDaemon(true);
             thread.start();

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java

@@ -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("rodIn2Down");
+            plc.write("rodIn1Down");
 //            plc.write("rodOut2Up");
 
 //            plc.write("sensorIn2Reset");

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java

@@ -94,7 +94,7 @@ public class XiShuiScale extends AbsScale {
 
 
     public static void main(String[] args) {
-        XiShuiScale s = new XiShuiScale("scale", "192.168.20.30", 10001);
+        XiShuiScale s = new XiShuiScale("scale", "192.168.20.31", 10001);
 
         try {
             boolean connect = s.connect();

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java

@@ -12,7 +12,7 @@ public class CellAddresses {
     // 单号
 //    public static final CellAddress serial         = makeCellAddress("j2");
     // 开票时间
-    public static final CellAddress datetimePrint  = makeCellAddress("n8");
+    public static final CellAddress datetimePrint  = makeCellAddress("o8");
     // 客户名称
     public static final CellAddress clientName     = makeCellAddress("e9");
     // 客户纳税人识别号
@@ -69,8 +69,8 @@ public class CellAddresses {
 //    public static final CellAddress haulerCo             = makeCellAddress("k23");
     // 车牌号
     public static final CellAddress truckLicense         = makeCellAddress("m11");
-    // 发票号码
+    // 机打发票号码
-    public static final CellAddress invoiceCode         = makeCellAddress("o5");
+    public static final CellAddress invoiceCode         = makeCellAddress("o7");
 
     public static Map<String, CellAddress> addrMap = new HashMap<>();
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java

@@ -379,7 +379,7 @@ public class Config extends JFinalConfig {
             // 这边将 生产 环境运行目录写死，只有在这个目录下运行时，才算 生产 环境
             String path = PathKit.getWebRootPath();
             log.debug("WebRootPath:", path);
-            String linux_dev_dir = "/home/admin123456/ssjygl_hzq/ssjygl-local-release";
+            String linux_dev_dir = "/home/a/ssjy_xsx";
 
             if (linux_dev_dir.equals(path)) {
                 ENV = "prod";

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/OrderService.java

@@ -340,7 +340,7 @@ public class OrderService {
             if (order.get("old_sn") != null) {
                 remark = "外销订单：" + StrUtil.getRecordStr(order, "old_sn");
             } else {
-                remark = "外销订单：" + StrUtil.getRecordStr(order, "sn");
+                remark = "订单号：" + StrUtil.getRecordStr(order, "sn");
             }
 
             if (order.get("total_price") != null) {
@@ -404,7 +404,7 @@ public class OrderService {
 
         out.put("goodsTareWeight", goodsTareWeight);
         out.put("goodsGrossWeight", goodsGrossWeight);
-        out.put("qrcode", sn);
+//        out.put("qrcode", sn);
         out.put("serial", sn);
         out.put("datetimePrint", sdf.get().format(new Date()));
         out.put("clientName", clientName);

ssjygl-xsx-local/src/main/resources/dev/config.properties

@@ -10,7 +10,7 @@ socketserver.port=21002
 socketio.port=12002
 
 #当前部署本地程序的砂站id
-current.supermarket_id=2
+current.supermarket_id=1
 
 #打印用到的配置信息
 print.vendor=浠水县长投环保有限公司

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
+#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
+#user=dev_ssjy_xsx
-password=Ssjy_xs_890
+#password=Ssjy_xs_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
+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
+user=root
-#password=Ssjy_xsx_890
+password=Ssjy_xsx_890
 
 # redis
 redis.basekey=ssjcgl_xsx_dev

ssjygl-xsx-local/src/main/resources/prod/config.properties

@@ -2,15 +2,15 @@
 devMode=true
 #本地服务 和 云端服务 socket 通信
 socketserver.enable=true
-#socketserver.host=47.112.109.118
+socketserver.host=47.112.109.118
-socketserver.host=127.0.0.1
+#socketserver.host=127.0.0.1
 socketserver.port=21002
 
 #和 web 端的 socket.io 通信端口
 socketio.port=12002
 
 #当前部署本地程序的砂站id
-current.supermarket_id=1
+current.supermarket_id=2
 
 #打印用到的配置信息
 print.vendor=浠水县长投环保有限公司
@@ -22,6 +22,3 @@ weight.distinguish=0.5
 
 #起步运输距离
 start.trans.distance=5
-
-#二维码根url
-base.url=http://qaky.cloudowr.cn/local

ssjygl-xsx-local/src/main/resources/prod/db.properties

@@ -1,11 +1,11 @@
 # mysql
-jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
+jdbcUrl=jdbc:mysql://localhost:3306/ssjy_xsx?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
-user=ssjy_xsx
+user=root
-password=Ssjy_xs_890
+password=Ssjy_xsx_890
 
 # redis
-redis.basekey = ssjcgl_xsx
+redis.basekey=ssjcgl_xsx
-redis.ip=192.168.1.119
+redis.ip=localhost
 redis.port=6379
 redis.pwd=
 redis.db=