Merge remote-tracking branch 'origin/master'

src/main/java/com/jeesite/modules/scheduling/ProductGh.java

@@ -80,7 +80,7 @@ public class ProductGh {
                     //差别时间转化为秒
                     mesProductRecord = new MesProductRecord();
                     mesProductRecord.setSn(deviceTime.getSn());
-                    mesProductRecord.setOprno(deviceTime.getOprno());
+                    mesProductRecord.setOprno(CommonUitl.formatOprno(deviceTime.getOprno()));
                     mesProductRecord.setLineSn(deviceTime.getProductCate());
                     mesProductRecord.setCraft("100000");
 
@@ -89,6 +89,7 @@ public class ProductGh {
                         //修改生产记录固化时间
                         mesProductRecord1.setContent("OK");
                         mesProductRecord1.setMaterielSn(String.valueOf(time));
+                        mesProductRecord1.setOprno(deviceTime.getOprno());
                         mesProductRecordService.update(mesProductRecord1);
                     }
                 }

src/main/resources/config/application.yml

@@ -54,13 +54,13 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_npd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-  username: mescloud
-  password: 8neywEN86NLam3ts
-#  username: root
-#  password: root
+  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  username: mescloud
+#  password: 8neywEN86NLam3ts
+  username: root
+  password: root
 #
   testSql: SELECT 1
 
@@ -649,6 +649,7 @@ shiro:
     ${adminPath}/mes/mesProductRecord/pccheck = anon
     ${adminPath}/mes/mesProductRecord/pcresult = anon
     ${adminPath}/mes/mesProductRecord/pccreate = anon
+    ${adminPath}/mes/mesProductRecord/pcbindRecord = anon
     ${adminPath}/mes/mesProductRecord/getConfig = anon
     ${adminPath}/mes/mesElectricTorque/batchSave = anon
     ${adminPath}/mes/mesProductYgsl/batchsave = anon