Merge remote-tracking branch 'origin/master'

src/main/java/com/tld/config/MyRedissonConfig.java

@@ -16,8 +16,8 @@ public class MyRedissonConfig {
     public RedissonClient redissonClient(){
         // 创建配置 指定redis地址及节点信息
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
-//        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
+//        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
+        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
         //redis集群使用
 //        config.useClusterServers().addNodeAddress("redis://8.142.144.205:6379");
         // 根据config创建出RedissonClient实例

src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -666,7 +666,8 @@ public class WarehousingServiceImpl implements WarehousingService {
                     .setRemovalCode(removalCode)
                     .setSourceType(askGoods.getSourceType())
                     .setMoveType(askGoods.getMoveType())
-                    .setName(notice.getRealName());
+                    .setName(notice.getRealName())
+                    .setRequestTypeName(askGoods.getRequestTypeName());
             askGoodsMapper.addReturnGsRemovalF(returRemoval);//新增返回gs数据父表信息
             askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
             map.put("data", notice.getAskGoodsId());

src/main/resources/application.yml

@@ -13,16 +13,21 @@ spring:
       strict: true
       datasource:
         # 主库数据源
+#        master:
+#          username: root
+#          password: "#09SilverB"
+#          url: jdbc:mysql://8.142.144.205:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
+#          driver-class-name: com.mysql.cj.jdbc.Driver
         master:
           username: root
           password: "#09SilverB"
-          url: jdbc:mysql://8.142.144.205:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
+          url: jdbc:mysql://10.2.111.91:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
           driver-class-name: com.mysql.cj.jdbc.Driver
-        # 从数据源
+        #从数据源
         slave:
           # 从数据源开关/默认关闭
           enabled: true
-          url: jdbc:mysql://8.142.144.205:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
+          url: jdbc:mysql://10.2.111.92:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
           username: root
           password: "#09SilverB"
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -41,8 +46,8 @@ spring:
     async:
       request-timeout: 20000
   redis:
-    host: 8.142.144.205
-#    host: 10.2.111.91
+#    host: 8.142.144.205
+    host: 10.2.111.91
     port: 6379
     password: '#09SilverB'
     jedis:

src/main/resources/mapper/AskGoodsMapper.xml

@@ -92,7 +92,8 @@
                a.entry_number,
                e.wllb_class,
                a.wbs,
-               f.name as wbsCode
+               f.name as wbsName,
+               f.code as wbsCode
         FROM tld_ask_goods a
         JOIN tld_ask_goods_f b ON a.ask_goods_id = b.ask_goods_id
         LEFT JOIN tld_department c ON b.department = c.code
@@ -460,7 +461,7 @@
                source_type  as sourceType,
                move_type    as moveType,
                scrq,
-               request_type_name as requestTypeName
+               ifnull(request_type_name, '生产领用申请') as requestTypeName
         from tld_return_gs_removal
         where document_id = #{removalCode}
     </select>
@@ -1628,7 +1629,7 @@
     </select>
     <!-- 查询生产领料回调信息 -->
     <select id="getCallback" resultType="com.tld.model.ReturRemoval">
-        select document_id,name from tld_return_gs_removal where source_type = "8" and move_type = "207"
+        select document_id,ifnull(name, '李兆峰') as name from tld_return_gs_removal where source_type = "8" and move_type = "207"
     </select>
     <!--查询父表信息-->
     <select id="getMergeGsF" resultType="com.tld.model.ReturRemoval">

src/main/resources/mapper/InviteMapper.xml

@@ -75,7 +75,8 @@
             a.wbs,
             a.entry_number,
             a.wbs,
-            f.name as wbsCode
+            f.name as wbsName,
+            f.code as wbsCode
         FROM
             tld_invite a
             JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id

src/main/resources/mapper/WarehousingMapper.xml

@@ -804,7 +804,8 @@
                b.move_type,
                c.code as wllbCode,
                a.type,
-               b.department
+               b.department,
+               b.request_type_name
         from tld_ask_goods a
                  join tld_ask_goods_f b on a.ask_goods_id = b.ask_goods_id
                  left join tld_material c on a.material_id = c.tld_id