zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

master
zhouxi 2021-08-16 13:37:42 +08:00
parent 37bd061ef3
commit 5661411f2f
14 changed files with 513 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/zzjee/md/controller/MdGoodsController.java
View File

@ -237,7 +237,19 @@ public class MdGoodsController extends BaseController {
} catch (Exception e) {
// TODO: handle exception
}
//查询当前商品类型的商品数量
Map<String, Object> countMap = systemService.findOneForJdbc("select right(shp_bian_ma,7) shp_bian_ma from md_goods where chp_shu_xing=? and shp_bian_ma like ? ORDER BY shp_bian_ma desc LIMIT 1",mdGoods.getChpShuXing(),mdGoods.getChpShuXing()+"%");
if (countMap == null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}else {
Object goodsCode = countMap.get("shp_bian_ma");
if (goodsCode != null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d",Integer.parseInt(((String) goodsCode))+1));
}else {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}
}
mdGoods.setShpTiaoMa(mdGoods.getShpBianMa());
mdGoodsService.save(mdGoods);
systemService.addLog(message, Globals.Log_Type_INSERT,
Globals.Log_Leavel_INFO);
@ -436,6 +448,25 @@ public class MdGoodsController extends BaseController {
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
if(mdGoods1 ==null ){
try {
//查询当前商品类型的商品数量
// Map<String, Object> map = systemService.findOneForJdbc("select ifnull(count(1),0) num from ba_goods_type where goods_type_code = ? order by create_date desc limit 1",mdGoods.getChpShuXing());
// if ((Long)map.get("num") <= 0L) {
// j.setSuccess(false);
// j.setMsg("产品属性错误："+mdGoods.getChpShuXing());
// return j;
// }
Map<String, Object> countMap = systemService.findOneForJdbc("select right(shp_bian_ma,7) shp_bian_ma from md_goods where chp_shu_xing=? and shp_bian_ma like ? ORDER BY shp_bian_ma desc LIMIT 1",mdGoods.getChpShuXing(),mdGoods.getChpShuXing()+"%");
if (countMap == null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}else {
Object goodsCode = countMap.get("shp_bian_ma");
if (goodsCode != null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d",Integer.parseInt(((String) goodsCode))+1));
}else {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}
}
if(StringUtil.isEmpty(mdGoods.getZhlKgm())){
if(!StringUtil.isEmpty(mdGoods.getBzhiQi())){
int bzhiq = Integer.parseInt(mdGoods.getBzhiQi());
@ -457,6 +488,7 @@ public class MdGoodsController extends BaseController {
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
mdGoodsService.save(mdGoods);
}else{
@ -469,6 +501,7 @@ public class MdGoodsController extends BaseController {
}
} catch (Exception e) {
e.printStackTrace();
// TODO: handle exception
}
MyBeanUtils.copyBeanNotNull2Bean(mdGoods, mdGoods1);

3
src/main/java/com/zzjee/md/controller/MvGoodsController.java
View File

@ -125,8 +125,9 @@ public class MvGoodsController extends BaseController {
//自定义追加查询条件
System.out.print("ResourceUtil.getSessionUserName().setBrowser(cusCode)data"+ ResourceUtil.getSessionUserName().getBrowser());
// String cusCode = ResourceUtil.getSessionUserName().getBrowser();
if(!StringUtil.isEmpty(ResourceUtil.getSessionUserName().getBrowser())){
cq.like("cusCode", ResourceUtil.getSessionUserName().getBrowser());
cq.eq("cusCode", coscode);
}
cq.add();
if(!StringUtil.isEmpty(goodsCode)){

9
src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
View File

@ -55,6 +55,7 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@ -158,6 +159,7 @@ public class WmImNoticeHController extends BaseController {
try {
List<WmImNoticeIEntity> wmImNoticeIEntityList = systemService
.findHql(hql0, id0);
BigDecimal totalCount = BigDecimal.ZERO;
for (WmImNoticeIEntity wmImNoticeIEntity : wmImNoticeIEntityList) {
if (StringUtil.isEmpty(wmImNoticeIEntity.getBinPlan())){
String hqlup = "from WmToUpGoodsEntity where 1 = 1 AND goodsId = ? order by createDate desc";
@ -193,13 +195,13 @@ public class WmImNoticeHController extends BaseController {
}catch (Exception e){
}
totalCount = totalCount.add(new BigDecimal(wmImNoticeIEntity.getGoodsCount()));
wmImNoticeIEntitynewList.add(wmImNoticeIEntity);
}
request.setAttribute("wmImNoticeIList", wmImNoticeIEntitynewList);
request.setAttribute("totalCount",totalCount);
}catch (Exception e){
}
@ -2080,7 +2082,8 @@ public class WmImNoticeHController extends BaseController {
printHeader.setHeader08("客户名称： " +wmImNoticeH.getCusCode()+md.getZhongWenQch());
printHeader.setHeader09("供应商： "+wmImNoticeH.getSupCode()+ wmImNoticeH.getSupName());
printHeader.setHeader09("供应商： "+(StringUtils.isEmpty(wmImNoticeH.getSupCode())||StringUtils.isEmpty(wmImNoticeH.getSupName())?"":wmImNoticeH.getSupCode()+ wmImNoticeH.getSupName()));
printHeader.setHeader10("客户电话： " +md.getDianHua());

2
src/main/java/com/zzjee/wm/controller/WmInQmIController.java
View File

@ -926,7 +926,7 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
String hql = " from WmInQmIEntity where 1 = 1 and binSta = 'N' ";
D0.setOK(true);
if(!StringUtil.isEmpty(searchstr)) {
hql=hql+" and imNoticeId like '%" + searchstr + "%'";
hql=hql+" and (imNoticeId like '%" + searchstr + "%' or tin_id like '%"+searchstr+"%')";
}
if(!StringUtil.isEmpty(searchstr2)) {
try{

11
src/main/java/com/zzjee/wm/controller/WmsApiController.java
View File

@ -135,6 +135,17 @@ public class WmsApiController {
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
if(mdGoods1 ==null ){
Map<String, Object> countMap = systemService.findOneForJdbc("select right(shp_bian_ma,7) shp_bian_ma from md_goods where chp_shu_xing=? and shp_bian_ma like ? ORDER BY shp_bian_ma desc LIMIT 1",mdGoods.getChpShuXing(),mdGoods.getChpShuXing()+"%");
if (countMap == null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}else {
Object goodsCode = countMap.get("shp_bian_ma");
if (goodsCode != null) {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d",Integer.parseInt(((String) goodsCode))+1));
}else {
mdGoods.setShpBianMa(mdGoods.getChpShuXing()+String.format("%07d", 1));
}
}
if(StringUtil.isEmpty(mdGoods.getChlKongZhi()) ){
mdGoods.setChlKongZhi("N");
}

2
src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java
View File

@ -347,7 +347,7 @@ public class WvNoticeController extends BaseController {
}
String[] ss = searchstr2.split(",");
if (ss.length == 1) {
hql = hql + " and goodsCode like '%" + searchstr2 + "%'";
hql = hql + " and (goodsCode like '%" + searchstr2 + "%'"+"or shp_ming_cheng like '%"+searchstr2+"%')";
} else {
String insearch = "";

4
src/main/java/org/jeecgframework/web/system/controller/core/SystemController.java
View File

@ -1247,10 +1247,10 @@ public class SystemController extends BaseController {
//如果是上传操作
if("1".equals(upFlag)){
String fileName = null;
String nowday=new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
String nowday=new SimpleDateFormat("yyyyMMdd").format(new Date());
File file = new File(ctxPath+File.separator+nowday);
if (!file.exists()) {
file.mkdir();// 创建文件根目录
file.mkdirs();// 创建文件根目录
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile mf=multipartRequest.getFile("file");// 获取上传文件对象

28
src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp
View File

@ -96,21 +96,21 @@ function counttiji(){
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">价格</label>
</div>
</div>
<%-- </div>--%>
<div class="row show-grid">
<%-- <div class="row show-grid">--%>
<div class="col-xs-3 text-center">
<b style="color:red">商品编码</b>
</div>
<div class="col-xs-3">
<input id="shpBianMa" name="shpBianMa" type="text" class="form-control"
ignore="checked"
datatype="*" required="required" />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">商品编码</label>
</div>
<%-- <div class="col-xs-3 text-center">--%>
<%-- <b style="color:red">商品编码</b>--%>
<%-- </div>--%>
<%-- <div class="col-xs-3">--%>
<%-- <input id="shpBianMa" name="shpBianMa" type="text" class="form-control"--%>
<%-- ignore="checked"--%>
<%-- datatype="*" required="required" />--%>
<%-- <span class="Validform_checktip" style="float:left;height:0px;"></span>--%>
<%-- <label class="Validform_label" style="display: none">商品编码</label>--%>
<%-- </div>--%>
<div class="col-xs-3 text-center">
<b >客户商品编码</b>
</div>
@ -210,11 +210,11 @@ function counttiji(){
</div>
<div class="col-xs-3 text-center">
<b style="color:red">重量</b>
<b>重量</b>
</div>
<div class="col-xs-3">
<input id="zhlKg" name="zhlKg" type="text" class="form-control"
ignore="ignore" style="text-align:right" required="required"
ignore="ignore" style="text-align:right" required=""
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">重量</label>

10
src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp
View File

@ -128,7 +128,7 @@
<label class="Validform_label" style="display: none">客户商品编码</label>
</div>
<div class="col-xs-3 text-center">
<b style="color:red">商品条码</b>
<b >商品条码</b>
</div>
<div class="col-xs-3">
<input id="shpTiaoMa" name="shpTiaoMa" type="text" class="form-control"
@ -207,7 +207,7 @@
</div>
<div class="col-xs-3 text-center">
<b style="color:red">体积</b>
<b >体积</b>
</div>
<div class="col-xs-3">
<input id="tiJiCm" name="tiJiCm" type="text" class="form-control"
@ -218,7 +218,7 @@
</div>
<div class="col-xs-3 text-center">
<b style="color:red">重量</b>
<b >重量</b>
</div>
<div class="col-xs-3">
<input id="zhlKg" name="zhlKg" type="text" class="form-control"
@ -234,7 +234,7 @@
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">长</b>
<b >长</b>
</div>
<div class="col-xs-3">
<input id="chZhXiang" name="chZhXiang" type="text" class="form-control"
@ -244,7 +244,7 @@
<label class="Validform_label" style="display: none">长</label>
</div>
<div class="col-xs-3 text-center">
<b style="color:red">宽</b>
<b >宽</b>
</div>
<div class="col-xs-3">
<input id="kuZhXiang" name="kuZhXiang" type="text" class="form-control"

68
src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp
View File

@ -124,26 +124,23 @@ function printview(){
<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl67 style='height:30.0pt'><span style="font-size: 18pt">${comname}</span></td>
<td colspan=4 class=xl68 width=168 style='width:126pt'>日期：${kprq}</td>
<td colspan=11 height=40 class=xl67 style='height:30.0pt;text-align: center;'><span style="font-size: 18pt">${comname}入库通知单</span></td>
</tr>
<tr height=25 style='mso-height-source:userset;height:25.0pt'>
<td colspan=4 height=25 class=xl68 width=242 style='height:25.0pt;width:182pt'>日期：${kprq}</td>
<td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td>
<td rowspan="3" class=xl69>
<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">
</td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl67 style='height:30.0pt'><span style="font-size: 18pt">入库通知单</span></td>
<td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td>
<td colspan=2 style='mso-ignore:colspan'></td>
<tr height=25 style='mso-height-source:userset;height:25.0pt'>
<td colspan=4 height=25 class=xl68 width=242 style='height:25.0pt;width:182pt'>货主：${cusname}</td>
<td colspan=4 height=25 class=xl68 width=242 style='height:25pt;width:182pt'>供应商：${supname}</td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>供应商：${supname}</td>
<td></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<tr height=25 style='mso-height-source:userset;height:25.0pt'>
<td colspan=4 class=xl68 width=337 style='width:252pt'>备注：${wmImNoticeHPage.imBeizhu}</td>
<td colspan=4 >WMS单号：${wmImNoticeHPage.noticeId}</td>
<td></td>
</tr>
@ -155,11 +152,12 @@ function printview(){
<td class=xl65 style='border:1.0pt solid black;text-align: center'>单位</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>生产日期</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>生产批号</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>保质期</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>数量</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>体积</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>重量</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>体积</td>--%>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>重量</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>储位</td>
@ -179,12 +177,13 @@ function printview(){
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsUnit }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsPrdData }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.bzhiQi }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsCount }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsFvol }</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsFvol }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsWeight }</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsWeight }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
@ -193,16 +192,37 @@ function printview(){
</tr>
</c:forEach>
<tr height=33 style='mso-height-source:userset;height:50px'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>合计</td>
<%--<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsCode }</td>--%>
<td class=xl65 colspan="6" style='border:1.0pt solid black;text-align: center;word-break:break-all;'><span style='word-break:break-all;width: auto;font-size: 14pt'></span></td>
<%--<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${totalCount}</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsFvol }</td>--%>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsWeight }</td>--%>
<td class=xl65 colspan="2" style='border:1.0pt solid black;text-align: center'></td>
<%--<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.goodsCode }" alt="${poVal.goodsCode }" style="width:40px;height:40px;vertical-align:middle;">　</td>
--%>
</tr>
</c:if>
<tr height=20 style='height:25.0pt'>
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>制单： ${wmOmNoticeHPage.createBy}<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>仓管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>制单：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>仓管： ${wmOmNoticeHPage.createBy}<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>主管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>叉车：<span
style='mso-spacerun:yes'></span></td>
style='mso-spacerun:yes'></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</td>
<td></td>
</tr>

64
src/main/webapp/webpage/com/zzjee/wm/print/imnoticerkd-print.jsp
View File

@ -102,8 +102,8 @@
<div class="printdiv"><t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" >
<input id="content" type="hidden" value="${printHeader.header05}">
<table border=0 cellpadding=0 cellspacing=0 width=680 style='border-collapse:
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
<table border=0 cellpadding=0 cellspacing=0 width=800 style='border-collapse:
collapse;table-layout:fixed;width:800pt;margin-left: 30px;margin-top: -30px'>
<col width=45 style='mso-width-source:userset;mso-width-alt:3612;width:45pt'>
<%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%>
@ -119,89 +119,87 @@
<tr height=18 style='height:13.2pt'>
<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
<td colspan=6 height=18 width=585 style='height:13.2pt;width:438pt'></td>
</tr>
<tr height=18 style='height:13.2pt'>
<td colspan=2 style='mso-ignore:colspan'></td>
<td colspan=7 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td>
<td colspan=6 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=9 class=xl68 width=168 style='width:126pt'>${printHeader.header02}</td>
<td colspan=6 class=xl68 width=168 style='width:126pt'>${printHeader.header02}</td>
<%-- <td rowspan="3" class=xl69>--%>
<%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%>
<%-- </td>--%>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl67 style='height:30.0pt'>${printHeader.header04}</td>
<td colspan=3 class=xl68 width=168 style='width:126pt'>${printHeader.header05}</td>
<td colspan=2 style='mso-ignore:colspan'></td>
<td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header04}222</td>
<td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header05}111</td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header08}</td>
<td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header08}</td>
<td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header09}</td>
<td></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td>
<td colspan=3 >${printHeader.header06}</td>
<td></td>
<tr height=40 style='mso-height-source:userset;height:30.0pt;'>
<td colspan=3 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td>
<td colspan=3 class=xl68>${printHeader.header06}</td>
</tr>
<tr height=33 style='mso-height-source:userset;height:25.05pt'>
<tr height=40 style='mso-height-source:userset;height:25.05pt'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>序号</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>商品编码</td>
<%--<td class=xl65 style='border:1.0pt solid black;text-align: center'>商品编码</td>--%>
<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>商品</td>
<td class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>商品</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>生产日期</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>收货温度</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>收货温度</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>单位</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>数量</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>重量</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>容积</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>重量</td>--%>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>容积</td>--%>
<td ></td>
<%-- <td ></td>--%>
<%-- <td ></td>--%>
</tr>
<c:if test="${fn:length(listitem) > 0 }">
<c:forEach items="${listitem}" var="poVal" varStatus="stuts">
<tr height=33 style='mso-height-source:userset;height:50px'>
<tr height=40 style='mso-height-source:userset;height:50px'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item20 }　</td>
<%-- <td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsCode }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center;word-break:break-all;'><span style='word-break:break-all;width: auto;font-size: 14pt'>${poVal.item01 }</span></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item02 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item03 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item04 }</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item04 }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item05 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item06 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item07 }</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item07 }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item08 }</td>
<%-- <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item08 }</td>--%>
<td ></td>
<%-- <td ></td>--%>
<%-- <td style="border: white" ></td>--%>
</tr>
</c:forEach>
</c:if>
<tr height=20 style='height:25.0pt'>
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>制单人：<span
<tr height=40 style='height:25.0pt'>
<td height=20 class=xl66 colspan=6 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>合计重量： ${printHeader.header13}<span
</span>制单人： <span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>合计数量:${printHeader.header12}<span
</span>仓管签字（盖章）:<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>客户签字（盖章）<span
<td></td>
</span>合计数量:${printHeader.header12}<span
合计数量:${printHeader.header12}
<%-- <td></td>--%>
</tr>
</table>

136
src/main/webapp/webpage/com/zzjee/wm/wmPrintModel-add.jsp
View File

@ -5,12 +5,14 @@
<head>
<title>打印模板</title>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<link rel="stylesheet" href="plug-in/uploadify/css/uploadify.css" type="text/css" />
<script type="text/javascript" src="plug-in/uploadify/jquery.uploadify-3.1.js"></script>
<script type="text/javascript">
//编写自定义JS代码
</script>
</head>
<body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmPrintModelController.do?doAdd" >
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmPrintModelController.do?doAdd" callback="jeecgFormFileCallBack@Override">
<input id="id" name="id" type="hidden" value="${wmPrintModelPage.id }"/>
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }"/>
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }"/>
@ -73,17 +75,74 @@
<tr>
<td align="right">
<label class="Validform_label">
打印服务器地址:
模板地址:
</label>
</td>
<td class="value">
<input id="printServerAddress" name="printServerAddress" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
/>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">打印服务器地址</label>
</td>
<td class="value"><t:webUploader auto="true" name="printServerAddress" duplicate="true" fileNumLimit="3"/></td>
<%-- <td class="value">--%>
<%-- <table></table>--%>
<%-- <div class="form jeecgDetail"> --%>
<%-- <script type="text/javascript">--%>
<%-- var serverMsg="";--%>
<%-- $(function(){--%>
<%-- $('#printServerAddress').uploadify({--%>
<%-- buttonText:'添加文件',--%>
<%-- auto:false,--%>
<%-- progressData:'speed',--%>
<%-- multi:true,--%>
<%-- height:25,--%>
<%-- overrideEvents:['onDialogClose'],--%>
<%-- fileTypeDesc:'文件格式:',--%>
<%-- queueID:'filediv_file',--%>
<%-- fileSizeLimit:'15MB',--%>
<%-- swf:'plug-in/uploadify/uploadify.swf', --%>
<%-- uploader:'cgUploadController.do?saveFiles&jsessionid='+$("#sessionUID").val()+'',--%>
<%-- onUploadStart : function(file) { --%>
<%-- var cgFormId=$("input[name='id']").val();--%>
<%-- $('#printServerAddress').uploadify("settings", "formData", {--%>
<%-- 'cgFormId':cgFormId,--%>
<%-- 'cgFormName':'wm_print_model',--%>
<%-- 'cgFormField':'PRINT_SERVER_ADDRESS'--%>
<%-- });--%>
<%-- } ,--%>
<%-- onQueueComplete : function(queueData) {--%>
<%-- var win = frameElement.api.opener;--%>
<%-- win.reloadTable();--%>
<%-- win.tip(serverMsg);--%>
<%-- frameElement.api.close();--%>
<%-- },--%>
<%-- onUploadSuccess : function(file, data, response) {--%>
<%-- var d=$.parseJSON(data);--%>
<%-- if(d.success){--%>
<%-- var win = frameElement.api.opener;--%>
<%-- serverMsg = d.msg;--%>
<%-- }--%>
<%-- },--%>
<%-- onFallback: function() {--%>
<%-- tip("您未安装FLASH控件，无法上传图片！请安装FLASH控件后再试")--%>
<%-- },--%>
<%-- onSelectError: function(file, errorCode, errorMsg) {--%>
<%-- switch (errorCode) {--%>
<%-- case - 100 : tip("上传的文件数量已经超出系统限制的" + $('#file').uploadify('settings', 'queueSizeLimit') + "个文件！");--%>
<%-- break;--%>
<%-- case - 110 : tip("文件 [" + file.name + "] 大小超出系统限制的" + $('#file').uploadify('settings', 'fileSizeLimit') + "大小！");--%>
<%-- break;--%>
<%-- case - 120 : tip("文件 [" + file.name + "] 大小异常！");--%>
<%-- break;--%>
<%-- case - 130 : tip("文件 [" + file.name + "] 类型不正确！");--%>
<%-- break;--%>
<%-- }--%>
<%-- },--%>
<%-- onUploadProgress: function(file, bytesUploaded, bytesTotal, totalBytesUploaded, totalBytesTotal) {}--%>
<%-- });--%>
<%-- });--%>
<%-- </script>--%>
<%-- <span id="file_uploadspan"><input type="file" name="printServerAddress" id="printServerAddress" /></span> --%>
<%-- </div> --%>
<%-- <div class="form" id="filediv_file"></div>--%>
<%-- <span class="Validform_checktip"></span>--%>
<%-- <label class="Validform_label" style="display: none;">模板地址</label>--%>
<%-- </td>--%>
</tr>
<tr>
<td align="right">
@ -104,3 +163,60 @@
</t:formvalid>
</body>
<script src = "webpage/com/zzjee/wm/wmPrintModel.js"></script>
<script type="text/javascript">
function jeecgFormFileCallBack(data){
if (data.success == true) {
uploadFile(data);
} else {
if (data.responseText == '' || data.responseText == undefined) {
$.messager.alert('错误', data.msg);
$.Hidemsg();
} else {
try {
var emsg = data.responseText.substring(data.responseText.indexOf('错误描述'), data.responseText.indexOf('错误信息'));
$.messager.alert('错误', emsg);
$.Hidemsg();
} catch(ex) {
$.messager.alert('错误', data.responseText + '');
}
}
return false;
}
if (!neibuClickFlag) {
var win = frameElement.api.opener;
win.reloadTable();
}
}
function upload() {
$('#printServerAddress').uploadify('upload', '*');
}
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
function cancel() {
$('#printServerAddress').uploadify('cancel', '*');
}
function uploadFile(data){
if(!$("input[name='id']").val()){
if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id);
}
}
if($(".uploadify-queue-item").length>0){
upload();
}else{
if (neibuClickFlag){
alert(data.msg);
neibuClickFlag = false;
}else {
var win = frameElement.api.opener;
win.reloadTable();
win.tip(data.msg);
frameElement.api.close();
}
}
}
</script>

158
src/main/webapp/webpage/com/zzjee/wm/wmPrintModel-update.jsp
View File

@ -5,12 +5,14 @@
<head>
<title>打印模板</title>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<link rel="stylesheet" href="plug-in/uploadify/css/uploadify.css" type="text/css" />
<script type="text/javascript" src="plug-in/uploadify/jquery.uploadify-3.1.js"></script>
<script type="text/javascript">
//编写自定义JS代码
</script>
</head>
<body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmPrintModelController.do?doUpdate" >
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmPrintModelController.do?doUpdate" callback="jeecgFormFileCallBack@Override">
<input id="id" name="id" type="hidden" value="${wmPrintModelPage.id }">
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }">
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }">
@ -71,16 +73,75 @@
<tr>
<td align="right">
<label class="Validform_label">
打印服务器地址:
模板地址:
</label>
</td>
<td class="value">
<input id="printServerAddress" name="printServerAddress" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
value='${wmPrintModelPage.printServerAddress}'>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">打印服务器地址</label>
<t:webUploader auto="true" pathValues="${wmPrintModelPage.printServerAddress}" name="printServerAddress" duplicate="true" fileNumLimit="3"></t:webUploader>
</td>
<%-- <td class="value">--%>
<%-- <table id="fileTable"></table>--%>
<%-- <table></table>--%>
<%-- <script type="text/javascript">--%>
<%-- var serverMsg="";--%>
<%-- $(function(){--%>
<%-- $('#printServerAddress').uploadify({--%>
<%-- buttonText:'添加文件',--%>
<%-- auto:false,--%>
<%-- progressData:'speed',--%>
<%-- multi:true,--%>
<%-- height:25,--%>
<%-- overrideEvents:['onDialogClose'],--%>
<%-- fileTypeDesc:'文件格式:',--%>
<%-- queueID:'filediv_file',--%>
<%-- fileSizeLimit:'15MB',--%>
<%-- swf:'plug-in/uploadify/uploadify.swf', --%>
<%-- uploader:'cgUploadController.do?saveFiles&jsessionid='+$("#sessionUID").val()+'',--%>
<%-- onUploadStart : function(file) { --%>
<%-- var cgFormId=$("input[name='id']").val();--%>
<%-- $('#printServerAddress').uploadify("settings", "formData", {--%>
<%-- 'cgFormId':cgFormId,--%>
<%-- 'cgFormName':'wm_print_model',--%>
<%-- 'cgFormField':'PRINT_SERVER_ADDRESS'--%>
<%-- });--%>
<%-- } ,--%>
<%-- onQueueComplete : function(queueData) {--%>
<%-- var win = frameElement.api.opener;--%>
<%-- win.reloadTable();--%>
<%-- win.tip(serverMsg);--%>
<%-- frameElement.api.close();--%>
<%-- },--%>
<%-- onUploadSuccess : function(file, data, response) {--%>
<%-- var d=$.parseJSON(data);--%>
<%-- if(d.success){--%>
<%-- var win = frameElement.api.opener;--%>
<%-- serverMsg = d.msg;--%>
<%-- }--%>
<%-- },--%>
<%-- onFallback: function() {--%>
<%-- tip("您未安装FLASH控件，无法上传图片！请安装FLASH控件后再试")--%>
<%-- },--%>
<%-- onSelectError: function(file, errorCode, errorMsg) {--%>
<%-- switch (errorCode) {--%>
<%-- case - 100 : tip("上传的文件数量已经超出系统限制的" + $('#file').uploadify('settings', 'queueSizeLimit') + "个文件！");--%>
<%-- break;--%>
<%-- case - 110 : tip("文件 [" + file.name + "] 大小超出系统限制的" + $('#file').uploadify('settings', 'fileSizeLimit') + "大小！");--%>
<%-- break;--%>
<%-- case - 120 : tip("文件 [" + file.name + "] 大小异常！");--%>
<%-- break;--%>
<%-- case - 130 : tip("文件 [" + file.name + "] 类型不正确！");--%>
<%-- break;--%>
<%-- }--%>
<%-- },--%>
<%-- onUploadProgress: function(file, bytesUploaded, bytesTotal, totalBytesUploaded, totalBytesTotal) {}--%>
<%-- });--%>
<%-- });--%>
<%-- </script>--%>
<%-- <span id="file_uploadspan"><input type="file" name="printServerAddress" id="printServerAddress" /></span> --%>
<%-- <div class="form" id="filediv_file"></div>--%>
<%-- <span class="Validform_checktip"></span>--%>
<%-- <label class="Validform_label" style="display: none;">模板地址</label>--%>
<%-- </td>--%>
</tr>
<tr>
<td align="right">
@ -100,3 +161,86 @@
</t:formvalid>
</body>
<script src = "webpage/com/zzjee/wm/wmPrintModel.js"></script>
<script type="text/javascript">
//加载 已存在的 文件
$(function(){
var table = $("#fileTable");
var cgFormId=$("input[name='id']").val();
$.ajax({
type: "post",
url: "wmPrintModelController.do?getFiles&id=" + cgFormId,
success: function(data){
var arrayFileObj = jQuery.parseJSON(data).obj;
$.each(arrayFileObj,function(n,file){
var tr = $("<tr style=\"height:34px;\"></tr>");
var td_title = $("<td>" + file.title + "</td>")
var td_download = $("<td><a href=\"commonController.do?viewFile&fileid=" + file.fileKey + "&subclassname=org.jeecgframework.web.cgform.entity.upload.CgUploadEntity\" title=\"下载\">下载</a></td>")
var td_view = $("<td><a href=\"javascript:void(0);\" onclick=\"openwindow('预览','commonController.do?openViewFile&fileid=" + file.fileKey + "&subclassname=org.jeecgframework.web.cgform.entity.upload.CgUploadEntity','fList',700,500)\">预览</a></td>");
var td_del = $("<td><a href=\"javascript:void(0)\" class=\"jeecgDetail\" onclick=\"del('cgUploadController.do?delFile&id=" + file.fileKey + "',this)\">删除</a></td>");
tr.appendTo(table);
td_title.appendTo(tr);
td_download.appendTo(tr);
td_view.appendTo(tr);
td_del.appendTo(tr);
});
}
});
})
function jeecgFormFileCallBack(data){
if (data.success == true) {
uploadFile(data);
} else {
if (data.responseText == '' || data.responseText == undefined) {
$.messager.alert('错误', data.msg);
$.Hidemsg();
} else {
try {
var emsg = data.responseText.substring(data.responseText.indexOf('错误描述'), data.responseText.indexOf('错误信息'));
$.messager.alert('错误', emsg);
$.Hidemsg();
} catch(ex) {
$.messager.alert('错误', data.responseText + '');
}
}
return false;
}
if (!neibuClickFlag) {
var win = frameElement.api.opener;
win.reloadTable();
}
}
function upload() {
$('#printServerAddress').uploadify('upload', '*');
}
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
function cancel() {
$('#printServerAddress').uploadify('cancel', '*');
}
function uploadFile(data){
if(!$("input[name='id']").val()){
if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id);
}
}
if($(".uploadify-queue-item").length>0){
upload();
}else{
if (neibuClickFlag){
alert(data.msg);
neibuClickFlag = false;
}else {
var win = frameElement.api.opener;
win.reloadTable();
win.tip(data.msg);
frameElement.api.close();
}
}
}
</script>

2
src/main/webapp/webpage/com/zzjee/wm/wmPrintModelList.jsp
View File

@ -16,7 +16,7 @@
<t:dgCol title="用户名" field="userName" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="打印类型" field="printType" query="true" queryMode="single" dictionary="print_type" width="120"></t:dgCol>
<t:dgCol title="打印模板" field="printModel" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="打印服务器地址" field="printServerAddress" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="模板地址" field="printServerAddress" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="打印文件类型" field="printFileType" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="备用1" field="query1" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="备用2" field="query2" hidden="true" queryMode="single" width="120"></t:dgCol>