允许用户重复登陆 2022-05-27 sxm

src/main/java/com/gaotao/config/SwaggerConfig.java

@@ -40,8 +40,8 @@ public class SwaggerConfig implements WebMvcConfigurer {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
             .title("佘莉")
-            .description("gaotao-fast文档")
-            .termsOfServiceUrl("https://www.gaotao.io")
+            .description("旭捷文档")
+            .termsOfServiceUrl("#")
             .version("3.0.0")
             .build();
     }

src/main/java/com/gaotao/modules/finishedProduct/dao/PackingDao.java

@@ -11,10 +11,31 @@ import java.util.Map;
 @Mapper
 public interface PackingDao {
 
+    /**
+     * @Author SXM
+     * @Description 料号交货信息
+     * @Date 9:00 2022/5/25
+     * @Param [packingVo]
+     * @return java.util.List<com.gaotao.modules.finishedProduct.vo.PackingVo>
+     **/
     List<PackingVo> packageOut(PackingVo packingVo);
 
+    /**
+     * @Author SXM
+     * @Description 草稿单信息
+     * @Date 8:59 2022/5/25
+     * @Param [packingVo]
+     * @return java.util.List<com.gaotao.modules.finishedProduct.vo.PackingVo>
+     **/
     List<PackingVo> getPackingList(PackingVo packingVo);
 
+    /**
+     * @Author SXM
+     * @Description  根据料号获取交货信息
+     * @Date 9:00 2022/5/25
+     * @Param [partNo]
+     * @return java.lang.String
+     **/
     String getCustomerId(String partNo);
 
     String getMPNByPartNo(String partNo);

src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java

@@ -79,6 +79,7 @@ public class SysLoginController extends AbstractController {
 			return R.error("账号已被锁定,请联系管理员");
 		}
 		session.setAttribute("user", user);
+
 		//生成token，并保存到数据库
 		R r = sysUserTokenService.createToken(user.getUserId());
 		r.put("language",user.getLanguageDefault());

src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java

@@ -41,7 +41,8 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
 			//保存token
 			this.save(tokenEntity);
 		}else{
-			tokenEntity.setToken(token);
+			// 允许重复登陆
+			//tokenEntity.setToken(token);
 			tokenEntity.setUpdateTime(now);
 			tokenEntity.setExpireTime(expireTime);
 
@@ -49,7 +50,7 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
 			this.updateById(tokenEntity);
 		}
 
-		R r = R.ok().put("token", token).put("expire", EXPIRE);
+		R r = R.ok().put("token", tokenEntity.getToken()).put("expire", EXPIRE);
 
 		return r;
 	}

src/main/resources/mapper/finishedProduct/CRollinfoDao.xml

@@ -210,7 +210,7 @@
     </select>
     <select id="getCoustomerCode" resultType="java.lang.String">
         SELECT CardCode
-        FROM YRTEST.dbo.ODRF
+        FROM YR.dbo.ODRF
         WHERE DocEntry = #{orderNo}
     </select>
     <select id="getOrderNo" resultType="java.lang.String">
@@ -237,11 +237,11 @@
                             )         AS customer_id,
                         t3.Substitute AS mpn,
                         T0.u_ul
-        FROM YRTEST.dbo.OITM T0
-                 INNER JOIN YRTEST.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
+        FROM YR.dbo.OITM T0
+                 INNER JOIN YR.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
                  INNER JOIN XJMES.dbo.C_RollInfo t2 ON t1.DocEntry = t2.OrderRef1
             AND t2.SourceType = '生产订单'
-                 LEFT JOIN YRTEST.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
+                 LEFT JOIN YR.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
         WHERE T0.ItemCode = #{partno}
     </select>
     <select id="rollOutboundControl" resultType="com.gaotao.modules.finishedProduct.entity.CRollinfoEntity">
@@ -305,7 +305,7 @@
     </select>
     <select id="searchLotNo" resultType="java.lang.String">
         SELECT MAX(docentry)
-        FROM YRTEST.dbo.OWOR
+        FROM YR.dbo.OWOR
         WHERE ItemCode = #{partNo}
     </select>
     <select id="getRollInfo" resultType="com.gaotao.modules.finishedProduct.vo.CRollinfoVo">

src/main/resources/mapper/finishedProduct/SapDao.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gaotao.modules.finishedProduct.dao.SapDao">
     <update id="updateOnnmAutoKey">
-        update   YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
+        update   YR.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateNNM1NextNumber">
-        update   YRTEST.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
+        update   YR.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateODRFStuts">
-        update   YRTEST.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
+        update   YR.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
     </update>
     <delete id="reomverNullData">
-        DELETE FROM   YRTEST.dbo.ODLN where docDate is null  and CardCode is null
+        DELETE FROM   YR.dbo.ODLN where docDate is null  and CardCode is null
     </delete>
     <select id="getCount" resultType="java.lang.Integer">
         Select count(1)   from RoutingHeader where site='1' and PartNo='100001701400' and RevNo='A0'
@@ -19,7 +19,7 @@
     </select>
 
     <update id="UpdateODLNMesTranNo">
-        update    YRTEST.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
+        update    YR.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
     </update>
 
 

src/main/resources/templates/dump/dump_page.ftl

@@ -51,7 +51,7 @@
 				<div class="ivu-form-item-content" style="margin-left: 5px;">
 					<div class="ivu-input-wrapper ivu-input-type">
 						<textarea autocomplete="off" spellcheck="false" id="orderNo"
-								   rows="2" autofocus="autofocus"
+								   rows="2"
 								  class="ivu-input"
 								  style="height: 40px; min-height: 40px; max-height: 40px;"></textarea>
 					</div>