hfy před 4 měsíci
rodič
revize
81bbced4bc

+ 1 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -3201,6 +3201,7 @@ public class MesProductRecordController extends BaseController {
 		try{
 			MesProductQm mesProductQm = new MesProductQm();
 			mesProductQm.setOprno(oprno);
+			mesProductQm.setWorkNum(mesProductQmReq.getWorkNum());
 			mesProductQm.setComponentNum(sn);
 			mesProductQm.setProductCate(lineSn);
 			mesProductQm.setWorkNum(userCode);

+ 3 - 3
src/main/resources/config/application.yml

@@ -57,12 +57,12 @@ jdbc:
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
  # url: jdbc:mysql://127.0.0.1:3306/mes_cloud_dy?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_x04c?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_cloude_npd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   username: mes_cloud
   password: s2ENj7KaEySTC7dW
-#  username: root
- # password: root
+  #username: root
+ # password: 123456
   testSql: SELECT 1
 
   #  # Oracle 数据库配置(若使用 12c,请修改 /modules/core/pom.xml 文件,打开 12c 依赖,去掉 11g 依赖)