Merge remote-tracking branch 'origin/master'

# Conflicts:
#	run.sh
#	src/main/resources/application-linux.yml

run.sh

@@ -21,7 +21,7 @@ echo '----rm image----'
 # 打包编译docker镜像
 docker build -t ${group_name}/${app_name}:${app_version} .
 echo '----build image----'
-docker run -p ${app_port}:${app_port} --name ${app_name} --network=host\
+docker run -p ${app_port}:${app_port} --name ${app_name} --network host \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /home/build/${volume_name}/logs:/var/logs \

src/main/java/cn/ezhizao/project/business/controller/Mrp10201Controller.java

@@ -83,7 +83,9 @@ public class Mrp10201Controller extends BaseController {
          */
 
         // 先从新系统中的 biz_pull_p2_time 中获取最新数据
-        List<BizPullP2Time> pullDetails = pullP2TimeService.getList(new BizPullP2Time());
+        BizPullP2Time pullDetail = new BizPullP2Time();
+        pullDetail.setType("plan_detail");
+        List<BizPullP2Time> pullDetails = pullP2TimeService.getList(pullDetail);
         /*
          * 如果 pullDetails 不为空，则获取最后一条数据，做为查询P2的生产计划明细的条件。
          * 这里有个细节，每次从P2中获取生产计划明细，不能都从头开始，否则随着数据量增加，将会重复拉取大量的数据，性能很差

src/main/resources/application-dev.yml

@@ -37,9 +37,12 @@ spring:
                 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:sqlserver://120.46.159.163:1433;DatabaseName=p240_dianzi_xz
+#                url: jdbc:sqlserver://120.46.159.163:1433;DatabaseName=p240_dianzi_xz
+#                username: sa
+#                password: ezhizao.cn123456
+                url: jdbc:sqlserver://localhost:1433;DatabaseName=p240_dianzi_xz
                 username: sa
-                password: ezhizao.cn123456
+                password: sa12345678
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

src/main/resources/application-linux.yml

@@ -36,7 +36,7 @@ spring:
             # 主库数据源
             master:
                 driverClassName: com.mysql.cj.jdbc.Driver
-                url: jdbc:mysql://192.168.10.40:3306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.10.40:7306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源
@@ -48,7 +48,7 @@ spring:
                 password: YZZ20230925
 #                url: jdbc:sqlserver://192.168.10.40:1433;DatabaseName=p240_dianzi_xz
 #                username: sa
-#                password: sa12345678
+#                password:  sa12345678
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

src/main/resources/mybatis/business/BizPullP2TimeMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getList" parameterType="BizPullP2Time" resultMap="BizPullP2TimeResult">
         SELECT * FROM biz_pull_p2_time
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            1=1
             <if test="type != null  and type != ''"> AND type = #{type}</if>
             <if test="pullTime != null "> AND pull_time = #{pullTime}</if>
         </trim>