Merge remote-tracking branch 'origin/master'

pcbms/src/main/java/com/hssx/pcbms/config/Db1Configuration.java

@@ -1,54 +0,0 @@
-//package com.hssx.pcbms.config;
-//
-//import org.apache.ibatis.session.SqlSessionFactory;
-//import org.mybatis.spring.SqlSessionFactoryBean;
-//import org.mybatis.spring.SqlSessionTemplate;
-//import org.mybatis.spring.annotation.MapperScan;
-//import org.springframework.beans.factory.annotation.Qualifier;
-//import org.springframework.boot.context.properties.ConfigurationProperties;
-//import org.springframework.boot.jdbc.DataSourceBuilder;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.Primary;
-//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-//import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-//
-//import javax.sql.DataSource;
-//
-///**
-// * Author: 吴涛涛 cuiyi@itany.com
-// * Date : 2019 - 11 - 14 15:16
-// * Description:<描述>
-// * Version: 1.0
-// */
-//@Configuration
-//@MapperScan(basePackages = "com.hssx.pcbms.mapper", sqlSessionTemplateRef = "db1SqlSessionTemplate")
-//public class Db1Configuration {
-//    @Bean(name = "db1DataSource")
-//    @ConfigurationProperties(prefix = "spring.datasource.hikari.db1")
-//    @Primary
-//    public DataSource testDataSource() {
-//        return DataSourceBuilder.create().build();
-//    }
-//
-//    @Bean(name = "db1SqlSessionFactory")
-//    @Primary
-//    public SqlSessionFactory testSqlSessionFactory(@Qualifier("db1DataSource") DataSource dataSource) throws Exception {
-//        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-//        bean.setDataSource(dataSource);
-//        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));//指定mapper.xml路径
-//        return bean.getObject();
-//    }
-//
-//    @Bean(name = "db1TransactionManager")
-//    @Primary
-//    public DataSourceTransactionManager testTransactionManager(@Qualifier("db1DataSource") DataSource dataSource) {
-//        return new DataSourceTransactionManager(dataSource);
-//    }
-//
-//    @Bean(name = "db1SqlSessionTemplate")
-//    @Primary
-//    public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("db1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
-//        return new SqlSessionTemplate(sqlSessionFactory);
-//    }
-//}

pcbms/src/main/java/com/hssx/pcbms/entity/vo/GoodsVO.java

@@ -23,4 +23,5 @@ public class GoodsVO extends Goods {
     private String hum;
     private String temp;
     private Integer doorStatus;
+    private String tagName;
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -177,6 +177,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(currentUserId);
         GoodsNo no = goodsNoMapper.selectById(goodsNo.getId());
+        goodsNo.setGoodsId(no.getGoodsId());
         goodsNoMapper.updateById(goodsNo);
         //添加处置记录
         OperateRecord operateRecord = new OperateRecord();
@@ -317,6 +318,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             maintainRecordService.saveBatch(operateRecords);
             //将原来待维护的状态更新为正常
             GoodsNo goodsNo = new GoodsNo();
+            goodsNo.setGoodsId(operateRecordVO.getGoodsId());
             goodsNo.setIsMaintain(0);
             goodsNoMapper.update(goodsNo, new QueryWrapper<GoodsNo>().in("id", idList));
         } else {

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -93,6 +93,7 @@
         <result column="suffixcode" property="suffixCode"/>
         <result column="good_type" property="goodType" />
         <result column="rack_id" property="rackId" />
+        <result column="tag_name" property="tagName" />
         <collection property="goodsNosVO" ofType="com.hssx.pcbms.entity.vo.GoodsNoVO">
             <id column="nid" property="id"/>
             <result column="model_no" property="modelNo"/>
@@ -136,7 +137,7 @@
     </select>
     <select id="getDetail" resultMap="BaseResultMapDetail">
         select
-        g.id, g.name, g.tag_id, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
+        g.id, g.name, g.tag_id,gt.name tag_name, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
         g.is_delete,gn.id nid,g.good_type,g.rack_id,rd.hum,rd.door_status,rd.temp,
         gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
         from
@@ -148,6 +149,8 @@
         on u.id = gn.user_id
         left join rack_data rd
         on g.id = rd.goods_id
+        left join goods_tags gt
+        on gt.id = g.tag_id
         <where>
             g.id = #{id}
         </where>