Skip to content

W
warehouse
Commit 802d2846 by zhanglt
Options

Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

parents 16428bef 66b839ac
Showing with 222 additions and 160 deletions
src/main/java/com/jeeplus/modules/warehouse/goods/service/GoodsService.java
...@@ -94,7 +94,7 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> { ...@@ -94,7 +94,7 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> {
*/ */
@Transactional(readOnly = false) @Transactional(readOnly = false)
public GoodsInfo printQr(String infoId) { public GoodsInfo printQr(String infoId) {
String qrImgPath = Global.getUserfilesBaseDir() + "image"; String qrImgPath = Global.getAttachmentDir() + "image";
File file = new File(qrImgPath); File file = new File(qrImgPath);
if (!file .exists() && !file .isDirectory()) { if (!file .exists() && !file .isDirectory()) {
System.out.println("//不存在"); System.out.println("//不存在");
...@@ -135,7 +135,7 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> { ...@@ -135,7 +135,7 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
qrCode.setUrl("image/" + numSeq + "_" + i + ".png"); qrCode.setUrl(Global.getAttachmentUrl() + "image/" + numSeq + "_" + i + ".png");
qrCodeMapper.insert(qrCode); qrCodeMapper.insert(qrCode);
qrCodeList.add(qrCode); qrCodeList.add(qrCode);
...@@ -171,7 +171,11 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> { ...@@ -171,7 +171,11 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> {
for (QrCode qrCode : qrCodeList) { for (QrCode qrCode : qrCodeList) {
if (StringUtils.isNotBlank(qrCode.getUrl())) { if (StringUtils.isNotBlank(qrCode.getUrl())) {
try { try {
FileUtil.deleteFile(new File(Global.getUserfilesBaseDir() + qrCode.getUrl())); String url = qrCode.getUrl();
if (null != url && url.contains("image")) {
String photo = url.split("image/")[1];
FileUtil.deleteFile(new File(Global.getAttachmentDir() + "image/" + photo));
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
src/main/java/com/jeeplus/modules/warehouse/ikanalyzer/IKSegmenterTest.java 0 → 100644
package com.jeeplus.modules.warehouse.ikanalyzer;
import java.io.StringReader;
import org.wltea.analyzer.cfg.DefaultConfig;
import org.wltea.analyzer.core.IKSegmenter;
import org.wltea.analyzer.core.Lexeme;
import org.wltea.analyzer.cfg.Configuration;
public class IKSegmenterTest {
private static Configuration m_wordCut_cfg;
public String parse(String content, boolean useSmart) throws Exception{
StringReader sr = new StringReader(content);
// 参数2为是否使用智能分词
// true：使用智能分词
// false：使用最细粒度分词
IKSegmenter ikSegmenter = new IKSegmenter(sr, useSmart);
Lexeme word = null;
String w = null;
StringBuffer sb = new StringBuffer();
while((word = ikSegmenter.next()) != null){
w = word.getLexemeText();
// int nTtype = word.getLexemeType();
// if (nTtype == 64) continue;
if(sb.length() > 0){
sb.append("|");
}
sb.append(w);
}
return sb.toString();
}
/**
* 分词方法
* @param text 需要拆分的字符串
* @param b ture为智能拆分，false为最细粒度拆分
* @return
*/
public static String splitStr(String text, boolean b) {
String strs = text;
m_wordCut_cfg = DefaultConfig.getInstance();
try {
IKSegmenterTest ikSegmenterTest = new IKSegmenterTest();
strs = ikSegmenterTest.parse(text,b);
} catch (Exception e) {
e.printStackTrace();
}
return strs;
}
public static void main(String[] args) {
String text = "185的绿色军鞋15双";
System.out.println("使用智能分词结果："+splitStr(text, true));
System.out.println("最细粒度分词结果："+splitStr(text, false));
}
}
src/main/java/com/jeeplus/modules/warehouse/ledger/service/LedgerService.java
...@@ -49,6 +49,7 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> { ...@@ -49,6 +49,7 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
List<CountLedgerInfo> list = map.get(batchNum); List<CountLedgerInfo> list = map.get(batchNum);
if (null == list) { if (null == list) {
list = new ArrayList<>(); list = new ArrayList<>();
list.add(countLedgerInfo); list.add(countLedgerInfo);
map.put(countLedgerInfo.getBatchNum(), list); map.put(countLedgerInfo.getBatchNum(), list);
} else { } else {
......
src/main/resources/IKAnalyzer.cfg.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<comment>IK Analyzer 扩展配置</comment>
<!--用户可以在这里配置自己的扩展字典 -->
<entry key="ext_dict">ext.dic;</entry>
<!--用户可以在这里配置自己的扩展停止词字典 -->
<!-- <entry key="ext_stopwords">stopword.dic;org/wltea/analyzer/dic/main2012.dic;</entry>-->
</properties>
\ No newline at end of file
src/main/resources/ext.dic 0 → 100644
185
170
鞋子
衣服
裤子
绿军鞋
\ No newline at end of file
src/main/webapp/static/common/css/login.css 0 → 100644
.login-page{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
#loginForm{
width: 700px;
height: 485px;
border-radius: 10px;
background: #fff;
}
.title{
font-family: "微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑;
font-weight: 700;
font-style: normal;
font-size: 24px;
color: rgb(51, 153, 255);
}
.input-text{
width: 306px;
height: 54px;
margin:auto;
border-radius: 4px;
}
.form-group{
margin-bottom: 0;
}
.login-page .form-content{
padding-bottom: 8px;
}
.progress-login{
line-height: 54px;
}
.input-group-addon{
border-radius: 4px;
border-right: 0;
background: transparent;
color:#eee;
font-size: 22px;
}
.input-group{
width: 306px;
margin: auto;
}
.input-group .input-text{
font-size: 14px;
}
.logo{
width: 140px;
padding-top: 24px;
}
.login-page .form-content{
padding: 5px 0;
}
\ No newline at end of file
src/main/webapp/webpage/modules/sys/login/sysLogin.jsp
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp" %>
<!-- _login_page_ --><!--登录超时标记 勿删--> <!-- _login_page_ --><!--登录超时标记 勿删-->
<html> <html>
<head> <head>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<title>${fns:getConfig('productName')} 登录</title> <title>${fns:getConfig('productName')} 登录</title>
<script> <link rel="stylesheet" href="${ctxStatic}/common/css/login.css">
if (window.top !== window.self) { <script>
window.top.location = window.location; if (window.top !== window.self) {
} window.top.location = window.location;
</script> }
<script type="text/javascript"> </script>
$(document).ready(function() { <script type="text/javascript">
$("#loginForm").validate({ $(document).ready(function () {
rules: { $("#loginForm").validate({
validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"} rules: {
}, validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"}
messages: { },
username: {required: "请填写用户名."},password: {required: "请填写密码."}, messages: {
validateCode: {remote: "验证码不正确.", required: "请填写验证码."} username: {required: "请填写用户名."}, password: {required: "请填写密码."},
}, validateCode: {remote: "验证码不正确.", required: "请填写验证码."}
errorLabelContainer: "#messageBox", },
errorPlacement: function(error, element) { errorLabelContainer: "#messageBox",
error.appendTo($("#loginError").parent()); errorPlacement: function (error, element) {
} error.appendTo($("#loginError").parent());
}); }
}); });
// 如果在框架或在对话框中，则弹出提示并跳转到首页 });
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0){ // 如果在框架或在对话框中，则弹出提示并跳转到首页
alert('未登录或登录超时。请重新登录，谢谢！'); if (self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0) {
top.location = "${ctx}"; alert('未登录或登录超时。请重新登录，谢谢！');
} top.location = "${ctx}";
</script> }
</script>
</head>
</head>
<body>
<div class="login-page">
<div class="row">
<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
<img class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
<h1>Jeeplus</h1>
<sys:message content="${message}" showType="1"/>
<form id="loginForm" role="form" action="${ctx}/login" method="post">
<div class="form-content">
<div class="form-group">
<input type="text" id="username" name="username" class="form-control input-underline input-lg required" value="admin" placeholder="用户名">
</div>
<div class="form-group"> <body>
<input type="password" id="password" name="password" value="admin" class="form-control input-underline input-lg required" placeholder="密码">
</div>
<c:if test="${isValidateCodeLogin}">
<div class="form-group text-muted">
<label class="inline"><font color="white">验证码:</font></label>
<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:5px;" buttonCssStyle="color:white"/>
</div>
</c:if>
<ul class="pull-right btn btn-info btn-circle" style="background-color:white;height:45px;width:46px">
<li class="dropdown color-picker" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span><i class="fa fa-circle"></i></span>
</a>
<ul class="dropdown-menu pull-right animated fadeIn" role="menu">
<li class="padder-h-xs">
<table class="table color-swatches-table text-center no-m-b">
<tr>
<td class="text-center colorr">
<a href="#" data-theme="blue" class="theme-picker">
<i class="fa fa-circle blue-base"></i>
</a>
</td>
<td class="text-center colorr">
<a href="#" data-theme="green" class="theme-picker">
<i class="fa fa-circle green-base"></i>
</a>
</td>
<td class="text-center colorr">
<a href="#" data-theme="red" class="theme-picker">
<i class="fa fa-circle red-base"></i>
</a>
</td>
</tr>
<tr>
<td class="text-center colorr">
<a href="#" data-theme="purple" class="theme-picker">
<i class="fa fa-circle purple-base"></i>
</a>
</td>
<td class="text-center color">
<a href="#" data-theme="midnight-blue" class="theme-picker">
<i class="fa fa-circle midnight-blue-base"></i>
</a>
</td>
<td class="text-center colorr">
<a href="#" data-theme="lynch" class="theme-picker">
<i class="fa fa-circle lynch-base"></i>
</a>
</td>
</tr>
</table>
</li>
</ul>
</li>
</ul>
<label class="inline">
<input type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
<span class="lbl"> 记住我</span>
</label>
</div>
<input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login" value="登录">
&nbsp;
<a href="${ctx}/sys/register" class="btn btn-white btn-outline btn-lg btn-rounded progress-login">注册</a>
</form>
</div>
</div>
</div>
<script>
$(function(){
$('.theme-picker').click(function() {
changeTheme($(this).attr('data-theme'));
});
});
function changeTheme(theme) { <div class="login-page">
$('<link>') <sys:message content="${message}" showType="1"/>
.appendTo('head') <form id="loginForm" role="form" action="${ctx}/login" method="post">
.attr({type : 'text/css', rel : 'stylesheet'}) <div><img class="logo" src="${ctxStatic}/common/images/logo.png"></div>
.attr('href', '${ctxStatic}/common/css/app-'+theme+'.css'); <div class="title">${fns:getConfig('productName')}</div>
//$.get('api/change-theme?theme='+theme); <div class="form-content">
$.get('${pageContext.request.contextPath}/theme/'+theme+'?url='+window.top.location.href,function(result){ }); <div class="form-group">
} <input type="text" id="username" name="username"
class="form-control input-text input-lg required" value="admin"
placeholder="用户名">
</div>
<div class="form-group">
<input type="password" id="password" name="password" value="admin"
class="form-control input-text input-lg required" placeholder="密码">
</div>
<c:if test="${isValidateCodeLogin}">
<div class="form-group text-muted">
<label class="inline">验证码:</label>
<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:5px;"
buttonCssStyle="color:white"/>
</div>
</c:if>
</div>
<input type="submit" class="btn btn-primary input-text btn-lg progress-login" value="登录">
&nbsp;
</form>
</div>
<script>
$(function () {
$('.theme-picker').click(function () {
changeTheme($(this).attr('data-theme'));
});
});
function changeTheme(theme) {
$('<link>')
.appendTo('head')
.attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/common/css/app-' + theme + '.css');
//$.get('api/change-theme?theme='+theme);
$.get('${pageContext.request.contextPath}/theme/' + theme + '?url=' + window.top.location.href, function (result) {
});
}
</script> </script>
<style>
li.color-picker i {
font-size: 24px;
line-height: 30px;
}
.red-base {
color: #D24D57;
}
.blue-base {
color: #3CA2E0;
}
.green-base {
color: #27ae60;
}
.purple-base {
color: #957BBD;
}
.midnight-blue-base {
color: #2c3e50;
}
.lynch-base {
color: #6C7A89;
}
</style>
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment