diff --git a/src/main/java/com/gaotao/config/SwaggerConfig.java b/src/main/java/com/gaotao/config/SwaggerConfig.java index 0d48728..10fe428 100644 --- a/src/main/java/com/gaotao/config/SwaggerConfig.java +++ b/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(); } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/dao/PackingDao.java b/src/main/java/com/gaotao/modules/finishedProduct/dao/PackingDao.java index e1011d7..6caa49b 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/dao/PackingDao.java +++ b/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 + **/ List packageOut(PackingVo packingVo); + /** + * @Author SXM + * @Description 草稿单信息 + * @Date 8:59 2022/5/25 + * @Param [packingVo] + * @return java.util.List + **/ List 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); diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java index 8f3ac89..35bcf89 100644 --- a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java +++ b/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()); diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java index bfbe7ee..6392ee0 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java @@ -41,7 +41,8 @@ public class SysUserTokenServiceImpl extends ServiceImpl Select count(1) from RoutingHeader where site='1' and PartNo='100001701400' and RevNo='A0' @@ -19,7 +19,7 @@ - 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} diff --git a/src/main/resources/templates/dump/dump_page.ftl b/src/main/resources/templates/dump/dump_page.ftl index 0961603..abf4fcc 100644 --- a/src/main/resources/templates/dump/dump_page.ftl +++ b/src/main/resources/templates/dump/dump_page.ftl @@ -51,7 +51,7 @@