master
parent
37bd061ef3
commit
5661411f2f
|
@ -237,7 +237,19 @@ public class MdGoodsController extends BaseController {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO: handle exception
|
// 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);
|
mdGoodsService.save(mdGoods);
|
||||||
systemService.addLog(message, Globals.Log_Type_INSERT,
|
systemService.addLog(message, Globals.Log_Type_INSERT,
|
||||||
Globals.Log_Leavel_INFO);
|
Globals.Log_Leavel_INFO);
|
||||||
|
@ -436,6 +448,25 @@ public class MdGoodsController extends BaseController {
|
||||||
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
|
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
|
||||||
if(mdGoods1 ==null ){
|
if(mdGoods1 ==null ){
|
||||||
try {
|
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.getZhlKgm())){
|
||||||
if(!StringUtil.isEmpty(mdGoods.getBzhiQi())){
|
if(!StringUtil.isEmpty(mdGoods.getBzhiQi())){
|
||||||
int bzhiq = Integer.parseInt(mdGoods.getBzhiQi());
|
int bzhiq = Integer.parseInt(mdGoods.getBzhiQi());
|
||||||
|
@ -457,6 +488,7 @@ public class MdGoodsController extends BaseController {
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO: handle exception
|
// TODO: handle exception
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
mdGoodsService.save(mdGoods);
|
mdGoodsService.save(mdGoods);
|
||||||
}else{
|
}else{
|
||||||
|
@ -469,6 +501,7 @@ public class MdGoodsController extends BaseController {
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
// TODO: handle exception
|
// TODO: handle exception
|
||||||
}
|
}
|
||||||
MyBeanUtils.copyBeanNotNull2Bean(mdGoods, mdGoods1);
|
MyBeanUtils.copyBeanNotNull2Bean(mdGoods, mdGoods1);
|
||||||
|
|
|
@ -51,12 +51,12 @@ import org.springframework.web.util.UriComponentsBuilder;
|
||||||
import com.zzjee.md.entity.MvGoodsEntity;
|
import com.zzjee.md.entity.MvGoodsEntity;
|
||||||
import com.zzjee.md.service.MvGoodsServiceI;
|
import com.zzjee.md.service.MvGoodsServiceI;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Title: Controller
|
* @Title: Controller
|
||||||
* @Description: 商品视图
|
* @Description: 商品视图
|
||||||
* @author erzhongxmu
|
* @author erzhongxmu
|
||||||
* @date 2017-11-02 23:59:31
|
* @date 2017-11-02 23:59:31
|
||||||
* @version V1.0
|
* @version V1.0
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Controller
|
@Controller
|
||||||
|
@ -78,7 +78,7 @@ public class MvGoodsController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 商品视图列表 页面跳转
|
* 商品视图列表 页面跳转
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "list")
|
@RequestMapping(params = "list")
|
||||||
|
@ -89,7 +89,7 @@ public class MvGoodsController extends BaseController {
|
||||||
// mv.addObject("coscode", oConvertUtils.getString(request.getParameter("coscode")));
|
// mv.addObject("coscode", oConvertUtils.getString(request.getParameter("coscode")));
|
||||||
// mv.addObject("goodsCode", mvGoods.getGoodsCode());
|
// mv.addObject("goodsCode", mvGoods.getGoodsCode());
|
||||||
return mv;
|
return mv;
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 删除销售订单
|
* 删除销售订单
|
||||||
|
@ -109,7 +109,7 @@ public class MvGoodsController extends BaseController {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* easyui AJAX请求数据
|
* easyui AJAX请求数据
|
||||||
*
|
*
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
* @param dataGrid
|
* @param dataGrid
|
||||||
|
@ -125,8 +125,9 @@ public class MvGoodsController extends BaseController {
|
||||||
//自定义追加查询条件
|
//自定义追加查询条件
|
||||||
System.out.print("ResourceUtil.getSessionUserName().setBrowser(cusCode)data"+ ResourceUtil.getSessionUserName().getBrowser());
|
System.out.print("ResourceUtil.getSessionUserName().setBrowser(cusCode)data"+ ResourceUtil.getSessionUserName().getBrowser());
|
||||||
|
|
||||||
|
// String cusCode = ResourceUtil.getSessionUserName().getBrowser();
|
||||||
if(!StringUtil.isEmpty(ResourceUtil.getSessionUserName().getBrowser())){
|
if(!StringUtil.isEmpty(ResourceUtil.getSessionUserName().getBrowser())){
|
||||||
cq.like("cusCode", ResourceUtil.getSessionUserName().getBrowser());
|
cq.eq("cusCode", coscode);
|
||||||
}
|
}
|
||||||
cq.add();
|
cq.add();
|
||||||
if(!StringUtil.isEmpty(goodsCode)){
|
if(!StringUtil.isEmpty(goodsCode)){
|
||||||
|
@ -139,7 +140,7 @@ public class MvGoodsController extends BaseController {
|
||||||
// TSUser user = ResourceUtil.getSessionUserName();
|
// TSUser user = ResourceUtil.getSessionUserName();
|
||||||
// String roles = "";
|
// String roles = "";
|
||||||
System.out.println("datagrid"+goodsCode);
|
System.out.println("datagrid"+goodsCode);
|
||||||
|
|
||||||
|
|
||||||
// if (user != null) {
|
// if (user != null) {
|
||||||
// List<TSRoleUser> rUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId());
|
// List<TSRoleUser> rUsers = systemService.findByProperty(TSRoleUser.class, "TSUser.id", user.getId());
|
||||||
|
@ -152,17 +153,17 @@ public class MvGoodsController extends BaseController {
|
||||||
// }
|
// }
|
||||||
// if(roles.equals("CUS")){
|
// if(roles.equals("CUS")){
|
||||||
// cq.eq("cusCode", user.getUserName());
|
// cq.eq("cusCode", user.getUserName());
|
||||||
//
|
//
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
cq.add();
|
cq.add();
|
||||||
this.mvGoodsService.getDataGridReturn(cq, true);
|
this.mvGoodsService.getDataGridReturn(cq, true);
|
||||||
TagUtil.datagrid(response, dataGrid);
|
TagUtil.datagrid(response, dataGrid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除商品视图
|
* 删除商品视图
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "doDel")
|
@RequestMapping(params = "doDel")
|
||||||
|
@ -183,10 +184,10 @@ public class MvGoodsController extends BaseController {
|
||||||
j.setMsg(message);
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除商品视图
|
* 批量删除商品视图
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "doBatchDel")
|
@RequestMapping(params = "doBatchDel")
|
||||||
|
@ -197,7 +198,7 @@ public class MvGoodsController extends BaseController {
|
||||||
message = "商品视图删除成功";
|
message = "商品视图删除成功";
|
||||||
try{
|
try{
|
||||||
for(String id:ids.split(",")){
|
for(String id:ids.split(",")){
|
||||||
MvGoodsEntity mvGoods = systemService.getEntity(MvGoodsEntity.class,
|
MvGoodsEntity mvGoods = systemService.getEntity(MvGoodsEntity.class,
|
||||||
id
|
id
|
||||||
);
|
);
|
||||||
mvGoodsService.delete(mvGoods);
|
mvGoodsService.delete(mvGoods);
|
||||||
|
@ -215,7 +216,7 @@ public class MvGoodsController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加商品视图
|
* 添加商品视图
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "doAdd")
|
@RequestMapping(params = "doAdd")
|
||||||
|
@ -235,10 +236,10 @@ public class MvGoodsController extends BaseController {
|
||||||
j.setMsg(message);
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新商品视图
|
* 更新商品视图
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "doUpdate")
|
@RequestMapping(params = "doUpdate")
|
||||||
|
@ -260,11 +261,11 @@ public class MvGoodsController extends BaseController {
|
||||||
j.setMsg(message);
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 商品视图新增页面跳转
|
* 商品视图新增页面跳转
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "goAdd")
|
@RequestMapping(params = "goAdd")
|
||||||
|
@ -277,7 +278,7 @@ public class MvGoodsController extends BaseController {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 商品视图编辑页面跳转
|
* 商品视图编辑页面跳转
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "goUpdate")
|
@RequestMapping(params = "goUpdate")
|
||||||
|
@ -288,10 +289,10 @@ public class MvGoodsController extends BaseController {
|
||||||
}
|
}
|
||||||
return new ModelAndView("com/zzjee/md/mvGoods-update");
|
return new ModelAndView("com/zzjee/md/mvGoods-update");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入功能跳转
|
* 导入功能跳转
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(params = "upload")
|
@RequestMapping(params = "upload")
|
||||||
|
@ -299,10 +300,10 @@ public class MvGoodsController extends BaseController {
|
||||||
req.setAttribute("controller_name","mvGoodsController");
|
req.setAttribute("controller_name","mvGoodsController");
|
||||||
return new ModelAndView("common/upload/pub_excel_upload");
|
return new ModelAndView("common/upload/pub_excel_upload");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出excel
|
* 导出excel
|
||||||
*
|
*
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
*/
|
*/
|
||||||
|
@ -321,7 +322,7 @@ public class MvGoodsController extends BaseController {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 导出excel 使模板
|
* 导出excel 使模板
|
||||||
*
|
*
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
*/
|
*/
|
||||||
|
@ -335,13 +336,13 @@ public class MvGoodsController extends BaseController {
|
||||||
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
|
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
|
||||||
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@RequestMapping(params = "importExcel", method = RequestMethod.POST)
|
@RequestMapping(params = "importExcel", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
|
public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||||
AjaxJson j = new AjaxJson();
|
AjaxJson j = new AjaxJson();
|
||||||
|
|
||||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||||
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
||||||
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
||||||
|
@ -369,14 +370,14 @@ public class MvGoodsController extends BaseController {
|
||||||
}
|
}
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(method = RequestMethod.GET)
|
@RequestMapping(method = RequestMethod.GET)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public List<MvGoodsEntity> list() {
|
public List<MvGoodsEntity> list() {
|
||||||
List<MvGoodsEntity> listMvGoodss=mvGoodsService.getList(MvGoodsEntity.class);
|
List<MvGoodsEntity> listMvGoodss=mvGoodsService.getList(MvGoodsEntity.class);
|
||||||
return listMvGoodss;
|
return listMvGoodss;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResponseEntity<?> get(@PathVariable("id") String id) {
|
public ResponseEntity<?> get(@PathVariable("id") String id) {
|
||||||
|
|
|
@ -55,6 +55,7 @@ import java.awt.image.BufferedImage;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -158,6 +159,7 @@ public class WmImNoticeHController extends BaseController {
|
||||||
try {
|
try {
|
||||||
List<WmImNoticeIEntity> wmImNoticeIEntityList = systemService
|
List<WmImNoticeIEntity> wmImNoticeIEntityList = systemService
|
||||||
.findHql(hql0, id0);
|
.findHql(hql0, id0);
|
||||||
|
BigDecimal totalCount = BigDecimal.ZERO;
|
||||||
for (WmImNoticeIEntity wmImNoticeIEntity : wmImNoticeIEntityList) {
|
for (WmImNoticeIEntity wmImNoticeIEntity : wmImNoticeIEntityList) {
|
||||||
if (StringUtil.isEmpty(wmImNoticeIEntity.getBinPlan())){
|
if (StringUtil.isEmpty(wmImNoticeIEntity.getBinPlan())){
|
||||||
String hqlup = "from WmToUpGoodsEntity where 1 = 1 AND goodsId = ? order by createDate desc";
|
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){
|
}catch (Exception e){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
totalCount = totalCount.add(new BigDecimal(wmImNoticeIEntity.getGoodsCount()));
|
||||||
|
|
||||||
|
|
||||||
wmImNoticeIEntitynewList.add(wmImNoticeIEntity);
|
wmImNoticeIEntitynewList.add(wmImNoticeIEntity);
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setAttribute("wmImNoticeIList", wmImNoticeIEntitynewList);
|
request.setAttribute("wmImNoticeIList", wmImNoticeIEntitynewList);
|
||||||
|
request.setAttribute("totalCount",totalCount);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -2080,7 +2082,8 @@ public class WmImNoticeHController extends BaseController {
|
||||||
|
|
||||||
printHeader.setHeader08("客户名称: " +wmImNoticeH.getCusCode()+md.getZhongWenQch());
|
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());
|
printHeader.setHeader10("客户电话: " +md.getDianHua());
|
||||||
|
|
||||||
|
|
|
@ -926,7 +926,7 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
|
||||||
String hql = " from WmInQmIEntity where 1 = 1 and binSta = 'N' ";
|
String hql = " from WmInQmIEntity where 1 = 1 and binSta = 'N' ";
|
||||||
D0.setOK(true);
|
D0.setOK(true);
|
||||||
if(!StringUtil.isEmpty(searchstr)) {
|
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)) {
|
if(!StringUtil.isEmpty(searchstr2)) {
|
||||||
try{
|
try{
|
||||||
|
|
|
@ -135,6 +135,17 @@ public class WmsApiController {
|
||||||
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
|
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
|
||||||
|
|
||||||
if(mdGoods1 ==null ){
|
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()) ){
|
if(StringUtil.isEmpty(mdGoods.getChlKongZhi()) ){
|
||||||
mdGoods.setChlKongZhi("N");
|
mdGoods.setChlKongZhi("N");
|
||||||
}
|
}
|
||||||
|
|
|
@ -347,7 +347,7 @@ public class WvNoticeController extends BaseController {
|
||||||
}
|
}
|
||||||
String[] ss = searchstr2.split(",");
|
String[] ss = searchstr2.split(",");
|
||||||
if (ss.length == 1) {
|
if (ss.length == 1) {
|
||||||
hql = hql + " and goodsCode like '%" + searchstr2 + "%'";
|
hql = hql + " and (goodsCode like '%" + searchstr2 + "%'"+"or shp_ming_cheng like '%"+searchstr2+"%')";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
String insearch = "";
|
String insearch = "";
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class SystemController extends BaseController {
|
||||||
return ajaxJson;
|
return ajaxJson;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型字典列表页面跳转
|
* 类型字典列表页面跳转
|
||||||
*
|
*
|
||||||
|
@ -196,7 +196,7 @@ public class SystemController extends BaseController {
|
||||||
}
|
}
|
||||||
MutiLangSqlCriteriaUtil.assembleCondition(typegroupnameKeyList, cq, "typegroupname", typegroupname);
|
MutiLangSqlCriteriaUtil.assembleCondition(typegroupnameKeyList, cq, "typegroupname", typegroupname);
|
||||||
}
|
}
|
||||||
|
|
||||||
String typegroupcode = request.getParameter("typegroupcode");
|
String typegroupcode = request.getParameter("typegroupcode");
|
||||||
if(oConvertUtils.isNotEmpty(typegroupcode)) {
|
if(oConvertUtils.isNotEmpty(typegroupcode)) {
|
||||||
cq.eq("typegroupcode", typegroupcode);
|
cq.eq("typegroupcode", typegroupcode);
|
||||||
|
@ -1040,8 +1040,8 @@ public class SystemController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在线用户列表
|
* 在线用户列表
|
||||||
* @param request
|
* @param request
|
||||||
|
@ -1188,7 +1188,7 @@ public class SystemController extends BaseController {
|
||||||
}else{
|
}else{
|
||||||
dataLogDiff.setValue1("");
|
dataLogDiff.setValue1("");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (map2.containsKey(string)) {
|
if (map2.containsKey(string)) {
|
||||||
value2 = map2.get(string).toString();
|
value2 = map2.get(string).toString();
|
||||||
if (value2 == null) {
|
if (value2 == null) {
|
||||||
|
@ -1200,7 +1200,7 @@ public class SystemController extends BaseController {
|
||||||
dataLogDiff.setValue2("");
|
dataLogDiff.setValue2("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (value1 == null && value2 == null) {
|
if (value1 == null && value2 == null) {
|
||||||
dataLogDiff.setDiff("N");
|
dataLogDiff.setDiff("N");
|
||||||
}else {
|
}else {
|
||||||
|
@ -1229,7 +1229,7 @@ public class SystemController extends BaseController {
|
||||||
return new ModelAndView("system/dataLog/diffDataVersion");
|
return new ModelAndView("system/dataLog/diffDataVersion");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WebUploader
|
* WebUploader
|
||||||
* 文件上传处理/删除处理
|
* 文件上传处理/删除处理
|
||||||
|
@ -1247,10 +1247,10 @@ public class SystemController extends BaseController {
|
||||||
//如果是上传操作
|
//如果是上传操作
|
||||||
if("1".equals(upFlag)){
|
if("1".equals(upFlag)){
|
||||||
String fileName = null;
|
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);
|
File file = new File(ctxPath+File.separator+nowday);
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
file.mkdir();// 创建文件根目录
|
file.mkdirs();// 创建文件根目录
|
||||||
}
|
}
|
||||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||||
MultipartFile mf=multipartRequest.getFile("file");// 获取上传文件对象
|
MultipartFile mf=multipartRequest.getFile("file");// 获取上传文件对象
|
||||||
|
@ -1311,7 +1311,7 @@ public class SystemController extends BaseController {
|
||||||
}else{
|
}else{
|
||||||
response.setContentType("image/jpeg;charset=utf-8");
|
response.setContentType("image/jpeg;charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
InputStream inputStream = null;
|
InputStream inputStream = null;
|
||||||
OutputStream outputStream=null;
|
OutputStream outputStream=null;
|
||||||
try {
|
try {
|
||||||
|
@ -1336,5 +1336,5 @@ public class SystemController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,21 +96,21 @@ function counttiji(){
|
||||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||||
<label class="Validform_label" style="display: none">价格</label>
|
<label class="Validform_label" style="display: none">价格</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<%-- </div>--%>
|
||||||
|
|
||||||
|
|
||||||
<div class="row show-grid">
|
<%-- <div class="row show-grid">--%>
|
||||||
|
|
||||||
<div class="col-xs-3 text-center">
|
<%-- <div class="col-xs-3 text-center">--%>
|
||||||
<b style="color:red">商品编码</b>
|
<%-- <b style="color:red">商品编码</b>--%>
|
||||||
</div>
|
<%-- </div>--%>
|
||||||
<div class="col-xs-3">
|
<%-- <div class="col-xs-3">--%>
|
||||||
<input id="shpBianMa" name="shpBianMa" type="text" class="form-control"
|
<%-- <input id="shpBianMa" name="shpBianMa" type="text" class="form-control"--%>
|
||||||
ignore="checked"
|
<%-- ignore="checked"--%>
|
||||||
datatype="*" required="required" />
|
<%-- datatype="*" required="required" />--%>
|
||||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
<%-- <span class="Validform_checktip" style="float:left;height:0px;"></span>--%>
|
||||||
<label class="Validform_label" style="display: none">商品编码</label>
|
<%-- <label class="Validform_label" style="display: none">商品编码</label>--%>
|
||||||
</div>
|
<%-- </div>--%>
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b >客户商品编码</b>
|
<b >客户商品编码</b>
|
||||||
</div>
|
</div>
|
||||||
|
@ -210,11 +210,11 @@ function counttiji(){
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">重量</b>
|
<b>重量</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="zhlKg" name="zhlKg" type="text" class="form-control"
|
<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>
|
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||||
<label class="Validform_label" style="display: none">重量</label>
|
<label class="Validform_label" style="display: none">重量</label>
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
<label class="Validform_label" style="display: none">客户商品编码</label>
|
<label class="Validform_label" style="display: none">客户商品编码</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">商品条码</b>
|
<b >商品条码</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="shpTiaoMa" name="shpTiaoMa" type="text" class="form-control"
|
<input id="shpTiaoMa" name="shpTiaoMa" type="text" class="form-control"
|
||||||
|
@ -207,7 +207,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">体积</b>
|
<b >体积</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="tiJiCm" name="tiJiCm" type="text" class="form-control"
|
<input id="tiJiCm" name="tiJiCm" type="text" class="form-control"
|
||||||
|
@ -218,7 +218,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">重量</b>
|
<b >重量</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="zhlKg" name="zhlKg" type="text" class="form-control"
|
<input id="zhlKg" name="zhlKg" type="text" class="form-control"
|
||||||
|
@ -234,7 +234,7 @@
|
||||||
<div class="row show-grid">
|
<div class="row show-grid">
|
||||||
|
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">长</b>
|
<b >长</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="chZhXiang" name="chZhXiang" type="text" class="form-control"
|
<input id="chZhXiang" name="chZhXiang" type="text" class="form-control"
|
||||||
|
@ -244,7 +244,7 @@
|
||||||
<label class="Validform_label" style="display: none">长</label>
|
<label class="Validform_label" style="display: none">长</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3 text-center">
|
<div class="col-xs-3 text-center">
|
||||||
<b style="color:red">宽</b>
|
<b >宽</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<input id="kuZhXiang" name="kuZhXiang" type="text" class="form-control"
|
<input id="kuZhXiang" name="kuZhXiang" type="text" class="form-control"
|
||||||
|
|
|
@ -3,21 +3,21 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>入库通知打印</title>
|
<title>入库通知打印</title>
|
||||||
<t:base type="jquery,easyui,tools"></t:base>
|
<t:base type="jquery,easyui,tools"></t:base>
|
||||||
<script type="text/javascript" charset="utf-8" src="webpage/com/zzjee/wmjs/jquery.jqprint.js"></script>
|
<script type="text/javascript" charset="utf-8" src="webpage/com/zzjee/wmjs/jquery.jqprint.js"></script>
|
||||||
<script language="javascript">
|
<script language="javascript">
|
||||||
function printall(){
|
function printall(){
|
||||||
|
|
||||||
$(".printdiv").jqprint();
|
$(".printdiv").jqprint();
|
||||||
|
|
||||||
}
|
}
|
||||||
function printview(){
|
function printview(){
|
||||||
document.all.WebBrowser1.ExecWB(7,1);
|
document.all.WebBrowser1.ExecWB(7,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
tr
|
tr
|
||||||
{mso-height-source:auto;
|
{mso-height-source:auto;
|
||||||
|
@ -106,7 +106,7 @@ function printview(){
|
||||||
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
|
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
|
||||||
<col width=102 style='mso-width-source:userset;mso-width-alt:3612;width:76pt'>
|
<col width=102 style='mso-width-source:userset;mso-width-alt:3612;width:76pt'>
|
||||||
|
|
||||||
<%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%>
|
<%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%>
|
||||||
<col width=253 style='mso-width-source:userset;mso-width-alt:4010;width:252pt'>
|
<col width=253 style='mso-width-source:userset;mso-width-alt:4010;width:252pt'>
|
||||||
<col width=45 style='mso-width-source:userset;mso-width-alt:1592;width:34pt'>
|
<col width=45 style='mso-width-source:userset;mso-width-alt:1592;width:34pt'>
|
||||||
<col width=94 style='mso-width-source:userset;mso-width-alt:2986;
|
<col width=94 style='mso-width-source:userset;mso-width-alt:2986;
|
||||||
|
@ -124,42 +124,40 @@ function printview(){
|
||||||
<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
|
<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
|
<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=11 height=40 class=xl67 style='height:30.0pt;text-align: center;'><span style="font-size: 18pt">${comname}入库通知单</span></td>
|
||||||
<td colspan=4 class=xl68 width=168 style='width:126pt'>日期:${kprq}</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>
|
<td rowspan="3" class=xl69>
|
||||||
<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">
|
<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</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 height=40 class=xl67 style='height:30.0pt'><span style="font-size: 18pt">入库通知单</span></td>
|
<td colspan=4 height=25 class=xl68 width=242 style='height:25.0pt;width:182pt'>货主:${cusname}</td>
|
||||||
<td colspan=4 class=xl68 width=168 style='width:126pt'>单号:${noticeid}</td>
|
<td colspan=4 height=25 class=xl68 width=242 style='height:25pt;width:182pt'>供应商:${supname}</td>
|
||||||
<td colspan=2 style='mso-ignore:colspan'></td>
|
|
||||||
</tr>
|
</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 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'>
|
|
||||||
<td colspan=4 class=xl68 width=337 style='width:252pt'>备注:${wmImNoticeHPage.imBeizhu}</td>
|
<td colspan=4 class=xl68 width=337 style='width:252pt'>备注:${wmImNoticeHPage.imBeizhu}</td>
|
||||||
<td colspan=4 >WMS单号:${wmImNoticeHPage.noticeId}</td>
|
<td colspan=4 >WMS单号:${wmImNoticeHPage.noticeId}</td>
|
||||||
<td></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
||||||
<tr height=33 style='mso-height-source:userset;height:25.05pt'>
|
<tr height=33 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 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 height=33 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 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>
|
||||||
|
|
||||||
|
@ -169,43 +167,65 @@ function printview(){
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<c:if test="${fn:length(wmImNoticeIList) > 0 }">
|
<c:if test="${fn:length(wmImNoticeIList) > 0 }">
|
||||||
<c:forEach items="${wmImNoticeIList}" var="poVal" varStatus="stuts">
|
<c:forEach items="${wmImNoticeIList}" var="poVal" varStatus="stuts">
|
||||||
|
|
||||||
|
<tr height=33 style='mso-height-source:userset;height:50px'>
|
||||||
|
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsCode } </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.goodsName }</span></td>
|
||||||
|
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.shpGuiGe }</td>
|
||||||
|
|
||||||
|
<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.goodsWeight }</td>--%>
|
||||||
|
|
||||||
|
<td class=xl65 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>
|
||||||
|
<td ></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
</c:forEach>
|
||||||
<tr height=33 style='mso-height-source:userset;height:50px'>
|
<tr height=33 style='mso-height-source:userset;height:50px'>
|
||||||
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsCode } </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'>${poVal.goodsCode }</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.goodsName }</span></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'>${poVal.shpGuiGe }</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.goodsUnit }</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.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'></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'>${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.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>
|
<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>
|
<%--<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>
|
||||||
<td ></td>
|
--%>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</c:forEach>
|
|
||||||
</c:if>
|
</c:if>
|
||||||
<tr height=20 style='height:25.0pt'>
|
<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
|
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>制单:<span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>制单: ${wmOmNoticeHPage.createBy}<span
|
</span>仓管: ${wmOmNoticeHPage.createBy}<span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>仓管:<span
|
</span>主管:<span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>叉车:<span
|
</span>叉车:<span
|
||||||
style='mso-spacerun:yes'></span></td>
|
style='mso-spacerun:yes'></span>
|
||||||
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
</t:formvalid></div>
|
</t:formvalid></div>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -102,8 +102,8 @@
|
||||||
|
|
||||||
<div class="printdiv"><t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" >
|
<div class="printdiv"><t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" >
|
||||||
<input id="content" type="hidden" value="${printHeader.header05}">
|
<input id="content" type="hidden" value="${printHeader.header05}">
|
||||||
<table border=0 cellpadding=0 cellspacing=0 width=680 style='border-collapse:
|
<table border=0 cellpadding=0 cellspacing=0 width=800 style='border-collapse:
|
||||||
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
|
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=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'>--%>
|
<%--<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'>
|
<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>
|
||||||
<tr height=18 style='height:13.2pt'>
|
<tr height=18 style='height:13.2pt'>
|
||||||
<td colspan=2 style='mso-ignore:colspan'></td>
|
<td colspan=6 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td>
|
||||||
|
|
||||||
<td colspan=7 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
|
<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>--%>
|
<%-- <td rowspan="3" class=xl69>--%>
|
||||||
<%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%>
|
<%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%>
|
||||||
<%-- </td>--%>
|
<%-- </td>--%>
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
|
<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 height=40 class=xl68 style='height:30.0pt'>${printHeader.header04}222</td>
|
||||||
<td colspan=3 class=xl68 width=168 style='width:126pt'>${printHeader.header05}</td>
|
<td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header05}111</td>
|
||||||
<td colspan=2 style='mso-ignore:colspan'></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
|
<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 colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header09}</td>
|
||||||
<td></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
|
<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 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td>
|
||||||
<td colspan=3 >${printHeader.header06}</td>
|
<td colspan=3 class=xl68>${printHeader.header06}</td>
|
||||||
<td></td>
|
|
||||||
</tr>
|
</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 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 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>
|
</tr>
|
||||||
|
|
||||||
<c:if test="${fn:length(listitem) > 0 }">
|
<c:if test="${fn:length(listitem) > 0 }">
|
||||||
<c:forEach items="${listitem}" var="poVal" varStatus="stuts">
|
<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 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 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;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.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.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.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.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>
|
</tr>
|
||||||
|
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</c:if>
|
</c:if>
|
||||||
<tr height=20 style='height:25.0pt'>
|
<tr height=40 style='height:25.0pt'>
|
||||||
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>制单人:<span
|
<td height=20 class=xl66 colspan=6 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管:<span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>合计重量: ${printHeader.header13}<span
|
</span>制单人: <span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>合计数量:${printHeader.header12}<span
|
</span>仓管签字(盖章):<span
|
||||||
style='mso-spacerun:yes'>
|
style='mso-spacerun:yes'>
|
||||||
</span>客户签字(盖章)<span
|
</span>合计数量:${printHeader.header12}<span
|
||||||
<td></td>
|
合计数量:${printHeader.header12}
|
||||||
|
<%-- <td></td>--%>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
|
@ -5,12 +5,14 @@
|
||||||
<head>
|
<head>
|
||||||
<title>打印模板</title>
|
<title>打印模板</title>
|
||||||
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
|
<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">
|
<script type="text/javascript">
|
||||||
//编写自定义JS代码
|
//编写自定义JS代码
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<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="id" name="id" type="hidden" value="${wmPrintModelPage.id }"/>
|
||||||
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }"/>
|
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }"/>
|
||||||
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }"/>
|
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }"/>
|
||||||
|
@ -33,8 +35,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="userName" name="userName" type="text" style="width: 150px" class="inputxt"
|
<input id="userName" name="userName" type="text" style="width: 150px" class="inputxt"
|
||||||
|
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
/>
|
/>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
|
@ -49,8 +51,8 @@
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<t:dictSelect field="printType" type="list"
|
<t:dictSelect field="printType" type="list"
|
||||||
typeGroupCode="print_type" defaultVal="${wmPrintModelPage.printType}" hasLabel="false" title="打印类型"
|
typeGroupCode="print_type" defaultVal="${wmPrintModelPage.printType}" hasLabel="false" title="打印类型"
|
||||||
></t:dictSelect>
|
></t:dictSelect>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
<label class="Validform_label" style="display: none;">打印类型</label>
|
<label class="Validform_label" style="display: none;">打印类型</label>
|
||||||
</td>
|
</td>
|
||||||
|
@ -62,8 +64,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="printModel" name="printModel" type="text" style="width: 150px" class="inputxt"
|
<input id="printModel" name="printModel" type="text" style="width: 150px" class="inputxt"
|
||||||
|
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
/>
|
/>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
|
@ -73,17 +75,74 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
<label class="Validform_label">
|
<label class="Validform_label">
|
||||||
打印服务器地址:
|
模板地址:
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value"><t:webUploader auto="true" name="printServerAddress" duplicate="true" fileNumLimit="3"/></td>
|
||||||
<input id="printServerAddress" name="printServerAddress" type="text" style="width: 150px" class="inputxt"
|
<%-- <td class="value">--%>
|
||||||
|
<%-- <table></table>--%>
|
||||||
ignore="ignore"
|
<%-- <div class="form jeecgDetail"> --%>
|
||||||
/>
|
<%-- <script type="text/javascript">--%>
|
||||||
<span class="Validform_checktip"></span>
|
<%-- var serverMsg="";--%>
|
||||||
<label class="Validform_label" style="display: none;">打印服务器地址</label>
|
<%-- $(function(){--%>
|
||||||
</td>
|
<%-- $('#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>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
|
@ -92,8 +151,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="printFileType" name="printFileType" type="text" style="width: 150px" class="inputxt"
|
<input id="printFileType" name="printFileType" type="text" style="width: 150px" class="inputxt"
|
||||||
|
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
/>
|
/>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
|
@ -103,4 +162,61 @@
|
||||||
</table>
|
</table>
|
||||||
</t:formvalid>
|
</t:formvalid>
|
||||||
</body>
|
</body>
|
||||||
<script src = "webpage/com/zzjee/wm/wmPrintModel.js"></script>
|
<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>
|
||||||
|
|
|
@ -5,12 +5,14 @@
|
||||||
<head>
|
<head>
|
||||||
<title>打印模板</title>
|
<title>打印模板</title>
|
||||||
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
|
<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">
|
<script type="text/javascript">
|
||||||
//编写自定义JS代码
|
//编写自定义JS代码
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<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="id" name="id" type="hidden" value="${wmPrintModelPage.id }">
|
||||||
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }">
|
<input id="createName" name="createName" type="hidden" value="${wmPrintModelPage.createName }">
|
||||||
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }">
|
<input id="createBy" name="createBy" type="hidden" value="${wmPrintModelPage.createBy }">
|
||||||
|
@ -33,8 +35,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="userName" name="userName" type="text" style="width: 150px" class="inputxt"
|
<input id="userName" name="userName" type="text" style="width: 150px" class="inputxt"
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
value='${wmPrintModelPage.userName}'>
|
value='${wmPrintModelPage.userName}'>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
<label class="Validform_label" style="display: none;">用户名</label>
|
<label class="Validform_label" style="display: none;">用户名</label>
|
||||||
|
@ -48,8 +50,8 @@
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<t:dictSelect field="printType" type="list"
|
<t:dictSelect field="printType" type="list"
|
||||||
typeGroupCode="print_type" defaultVal="${wmPrintModelPage.printType}" hasLabel="false" title="打印类型"
|
typeGroupCode="print_type" defaultVal="${wmPrintModelPage.printType}" hasLabel="false" title="打印类型"
|
||||||
></t:dictSelect>
|
></t:dictSelect>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
<label class="Validform_label" style="display: none;">打印类型</label>
|
<label class="Validform_label" style="display: none;">打印类型</label>
|
||||||
</td>
|
</td>
|
||||||
|
@ -61,8 +63,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="printModel" name="printModel" type="text" style="width: 150px" class="inputxt"
|
<input id="printModel" name="printModel" type="text" style="width: 150px" class="inputxt"
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
value='${wmPrintModelPage.printModel}'>
|
value='${wmPrintModelPage.printModel}'>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
<label class="Validform_label" style="display: none;">打印模板</label>
|
<label class="Validform_label" style="display: none;">打印模板</label>
|
||||||
|
@ -71,16 +73,75 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
<label class="Validform_label">
|
<label class="Validform_label">
|
||||||
打印服务器地址:
|
模板地址:
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="printServerAddress" name="printServerAddress" type="text" style="width: 150px" class="inputxt"
|
<t:webUploader auto="true" pathValues="${wmPrintModelPage.printServerAddress}" name="printServerAddress" duplicate="true" fileNumLimit="3"></t:webUploader>
|
||||||
ignore="ignore"
|
|
||||||
value='${wmPrintModelPage.printServerAddress}'>
|
|
||||||
<span class="Validform_checktip"></span>
|
|
||||||
<label class="Validform_label" style="display: none;">打印服务器地址</label>
|
|
||||||
</td>
|
</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>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
|
@ -89,8 +150,8 @@
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="value">
|
<td class="value">
|
||||||
<input id="printFileType" name="printFileType" type="text" style="width: 150px" class="inputxt"
|
<input id="printFileType" name="printFileType" type="text" style="width: 150px" class="inputxt"
|
||||||
ignore="ignore"
|
ignore="ignore"
|
||||||
value='${wmPrintModelPage.printFileType}'>
|
value='${wmPrintModelPage.printFileType}'>
|
||||||
<span class="Validform_checktip"></span>
|
<span class="Validform_checktip"></span>
|
||||||
<label class="Validform_label" style="display: none;">打印文件类型</label>
|
<label class="Validform_label" style="display: none;">打印文件类型</label>
|
||||||
|
@ -99,4 +160,87 @@
|
||||||
</table>
|
</table>
|
||||||
</t:formvalid>
|
</t:formvalid>
|
||||||
</body>
|
</body>
|
||||||
<script src = "webpage/com/zzjee/wm/wmPrintModel.js"></script>
|
<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>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<t:dgCol title="用户名" field="userName" queryMode="single" width="120"></t:dgCol>
|
<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="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="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="打印文件类型" 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="备用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>
|
<t:dgCol title="备用2" field="query2" hidden="true" queryMode="single" width="120"></t:dgCol>
|
||||||
|
|
Loading…
Reference in New Issue