销售提交erp

添加组织物料信息重复添加修改的简单验证

See merge request jygk/dsc-base!28

base-server/Dockerfile

@@ -1,23 +1,13 @@
-ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
-FROM ${BASE_IMAGE}
+FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
 
 # 设置应用目录
-RUN mkdir -p /app
 WORKDIR /app
 
 # 复制应用文件
-COPY target/base-server.jar app.jar
-
-# 设置环境变量
-ENV TZ=Asia/Shanghai
-ENV JAVA_OPTS="-Xms512m -Xmx512m"
-ENV SW_AGENT_HOME=/opt/skywalking/agent
-ENV SW_AGENT_NAME=base-server
-ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
-ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
+COPY target/base-server.jar /app/base-server.jar
 
 # 暴露端口
 EXPOSE 48200
 
 # 运行应用
-CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar
+ENTRYPOINT ["java", "-jar", "/app/base-server.jar"]

base-server/pom.xml

@@ -82,6 +82,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Seata 达梦数据库补丁，必须最先引入以覆盖 seata-all 中的类 -->
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-spring-boot-starter-seata-dm</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.seata</groupId>
             <artifactId>seata-spring-boot-starter</artifactId>

base-server/src/main/resources/application-dev.yml

@@ -37,14 +37,26 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
+        mdm: # 主数据同步专用数据源（使用已引入的旧版 MySQL JDBC）
+          url: jdbc:mysql://172.16.38.10:3306/mdmdev?useSSL=false&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+          username: iworker
+          password: iwork_87871A
+          driver-class-name: com.mysql.jdbc.Driver
+
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
@@ -105,9 +117,13 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
+# erp相关配置
 erp:
   address: hana-dev.yncic.com
-  sapsys: ZTDEV203
+  sapsys: ZTQAS600  # 测试
+  #sapsys: ZTPRD800  # 正式
+  srcsys: JYGK
+  secret-key: JYGK  # erp秘钥
 
 eplat:
   share:

base-server/src/main/resources/application-local.yml

@@ -39,14 +39,20 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
@@ -95,9 +101,13 @@ zt:
   access-log: # 访问日志的配置项
     enable: true
 
+# erp相关配置
 erp:
   address: hana-dev.yncic.com
-  sapsys: ZTDEV203
+  sapsys: ZTQAS600  # 测试
+  #sapsys: ZTPRD800  # 正式
+  srcsys: JYGK
+  secret-key: JYGK  # erp秘钥
 
 eplat:
   share:

base-server/src/main/resources/application.yml

@@ -72,6 +72,8 @@ knife4j:
 
 # MyBatis Plus 的配置项
 mybatis-plus:
+  mapper-locations:
+    - classpath*:mapper/**/*.xml
   configuration:
     map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
   global-config:

deployment.yaml

@@ -23,18 +23,21 @@ spec:
       containers:
         - name: base-server
           image: 172.16.46.66:10043/yudao/base-server:VERSION_PLACEHOLDER
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           readinessProbe:
             httpGet:
               path: /actuator/health
               port: 48100
-            initialDelaySeconds: 10
+            initialDelaySeconds: 50
             periodSeconds: 5
             failureThreshold: 3
           livenessProbe:
             httpGet:
               path: /actuator/health
               port: 48100
-            initialDelaySeconds: 30
+            initialDelaySeconds: 50
             periodSeconds: 10
             failureThreshold: 5
           resources:

sql/dm/2026-01-14帆软报表上传菜单.sql

@@ -0,0 +1,35 @@
+-- 帆软报表上传菜单（父级 1965981757204459521），请根据需要调整排序/图标
+
+-- DM8 兼容写法：匿名块 + 变量赋值 + SELECT ... INTO
+BEGIN
+    DECLARE
+        v_parent_id   BIGINT;
+        v_menu_id     BIGINT;
+        v_button_id   BIGINT;
+    BEGIN
+        v_parent_id := 1965981757204459521;
+
+        -- 计算主菜单 ID（非自增：使用当前最大值 + 1）
+        SELECT COALESCE(MAX(id), 0) + 1 INTO v_menu_id FROM system_menu;
+
+        INSERT INTO system_menu(
+            id, name, permission, type, sort, parent_id,
+            path, icon, component, status, component_name
+        ) VALUES (
+            v_menu_id, '帆软报表上传', '', 2, 0, v_parent_id,
+            'fine-report-upload', 'ep:upload-filled', 'base/fineReportUpload/index', 0, 'FineReportUpload'
+        );
+
+        -- 计算按钮 ID（非自增：再取最大值 + 1）
+        SELECT COALESCE(MAX(id), 0) + 1 INTO v_button_id FROM system_menu;
+
+        INSERT INTO system_menu(
+            id, name, permission, type, sort, parent_id,
+            path, icon, component, status
+        ) VALUES (
+            v_button_id, '帆软报表上传-上传', 'base:fine-report-template:upload', 3, 1, v_menu_id,
+            '', '', '', 0
+        );
+    END;
+END;
+/

sql/dm/2026-1-14物料相关表增加索引.sql

@@ -0,0 +1,29 @@
+CREATE INDEX idx_hs_cls_tenant_deleted_cls
+    ON bse_mtrl_hs_cls(tenant_id, deleted, CLS_ID, INF_ID);
+
+CREATE INDEX idx_hs_cls_composite
+    ON bse_mtrl_hs_cls(tenant_id, deleted, CLS_ID);
+
+CREATE INDEX idx_mtrl_inf_tenant_deleted_id
+    ON bse_mtrl_inf(tenant_id, deleted, id);
+
+CREATE INDEX idx_mtrl_inf_tenant_deleted_cd
+    ON bse_mtrl_inf(tenant_id, deleted, CD, id);
+
+CREATE INDEX idx_mtrl_inf_cover
+    ON bse_mtrl_inf(tenant_id, deleted, CD, id, NAME, RMK, create_time, update_time, creator, updater);
+
+CREATE INDEX idx_hs_prps_tenant_deleted_inf
+    ON bse_mtrl_hs_prps(tenant_id, deleted, INF_ID, PRPS_ID);
+
+CREATE INDEX idx_hs_prps_tenant_inf_deleted
+    ON bse_mtrl_hs_prps(tenant_id, INF_ID, deleted);
+
+CREATE INDEX idx_hs_prps_cover
+    ON bse_mtrl_hs_prps(tenant_id, deleted, INF_ID, PRPS_ID, UNT_ID, IS_KY, IS_MTNG, SRT, DEPT_ID);
+
+CREATE INDEX idx_mtrl_prps_tenant_deleted_id
+    ON bse_mtrl_prps(tenant_id, deleted, id);
+
+CREATE INDEX idx_mtrl_prps_cover
+    ON bse_mtrl_prps(tenant_id, deleted, id, CD, NAME, UNT_QTY_ID, DIC_DAT_VAL, DAT_TP, RMK, DEPT_ID);