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

优化

master
zhouxi 2021-08-20 14:48:32 +08:00
parent 95e155548f
commit 201195a0ac
31 changed files with 1385 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

477
src/main/java/com/zzjee/ba/controller/BaGoodsCategoryController.java Normal file
View File

@ -0,0 +1,477 @@
package com.zzjee.ba.controller;
import com.zzjee.ba.entity.BaGoodsCategoryEntity;
import com.zzjee.ba.service.BaGoodsCategoryServiceI;
import java.util.ArrayList;
import java.util.List;
import java.text.SimpleDateFormat;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zzjee.ba.vo.BaGoodsCategoryVo;
import org.apache.log4j.Logger;
import org.jeecgframework.core.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import org.jeecgframework.core.common.controller.BaseController;
import org.jeecgframework.core.common.exception.BusinessException;
import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery;
import org.jeecgframework.core.common.model.common.TreeChildCount;
import org.jeecgframework.core.common.model.json.AjaxJson;
import org.jeecgframework.core.common.model.json.DataGrid;
import org.jeecgframework.core.constant.Globals;
import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.tag.core.easyui.TagUtil;
import org.jeecgframework.web.system.pojo.base.TSDepart;
import org.jeecgframework.web.system.service.SystemService;
import org.jeecgframework.core.util.MyBeanUtils;
import java.io.OutputStream;
import org.jeecgframework.core.util.BrowserUtils;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.TemplateExportParams;
import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.jeecgframework.core.util.ResourceUtil;
import java.io.IOException;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.util.Map;
import java.util.HashMap;
import org.jeecgframework.core.util.ExceptionUtil;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.jeecgframework.core.beanvalidator.BeanValidators;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import java.net.URI;
import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder;
/**
* @Title: Controller
* @Description: 商品类目
* @author onlineGenerator
* @date 2021-08-20 10:29:34
* @version V1.0
*
*/
@Controller
@RequestMapping("/baGoodsCategoryController")
public class BaGoodsCategoryController extends BaseController {
/**
* Logger for this class
*/
private static final Logger logger = Logger.getLogger(BaGoodsCategoryController.class);
@Autowired
private BaGoodsCategoryServiceI baGoodsCategoryService;
@Autowired
private SystemService systemService;
@Autowired
private Validator validator;
@Autowired
private CommonService commonService;
/**
* 商品类目列表 页面跳转
*
* @return
*/
@RequestMapping(params = "list")
public ModelAndView list(HttpServletRequest request) {
return new ModelAndView("com/zzjee/ba/baGoodsCategoryList");
}
/**
* easyui AJAX请求数据
*
* @param request
* @param response
* @param dataGrid
* @param user
*/
@RequestMapping(params = "datagrid")
public void datagrid(BaGoodsCategoryEntity baGoodsCategory,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(BaGoodsCategoryEntity.class, dataGrid);
//查询条件组装器
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, baGoodsCategory, request.getParameterMap());
try{
//自定义追加查询条件
String query_createTime_begin = request.getParameter("createTime_begin");
String query_createTime_end = request.getParameter("createTime_end");
if(StringUtil.isNotEmpty(query_createTime_begin)){
cq.ge("createTime", new SimpleDateFormat("yyyy-MM-dd").parse(query_createTime_begin));
}
if(StringUtil.isNotEmpty(query_createTime_end)){
cq.le("createTime", new SimpleDateFormat("yyyy-MM-dd").parse(query_createTime_end));
}
}catch (Exception e) {
throw new BusinessException(e.getMessage());
}
cq.add();
this.baGoodsCategoryService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid);
}
/**
* 删除商品类目
*
* @return
*/
@RequestMapping(params = "doDel")
@ResponseBody
public AjaxJson doDel(BaGoodsCategoryEntity baGoodsCategory, HttpServletRequest request) {
String message = null;
AjaxJson j = new AjaxJson();
baGoodsCategory = systemService.getEntity(BaGoodsCategoryEntity.class, baGoodsCategory.getId());
message = "商品类目删除成功";
try{
baGoodsCategoryService.delete(baGoodsCategory);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}catch(Exception e){
e.printStackTrace();
message = "商品类目删除失败";
throw new BusinessException(e.getMessage());
}
j.setMsg(message);
return j;
}
/**
* 批量删除商品类目
*
* @return
*/
@RequestMapping(params = "doBatchDel")
@ResponseBody
public AjaxJson doBatchDel(String ids,HttpServletRequest request){
String message = null;
AjaxJson j = new AjaxJson();
message = "商品类目删除成功";
try{
for(String id:ids.split(",")){
BaGoodsCategoryEntity baGoodsCategory = systemService.getEntity(BaGoodsCategoryEntity.class,
Integer.parseInt(id)
);
baGoodsCategoryService.delete(baGoodsCategory);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}
}catch(Exception e){
e.printStackTrace();
message = "商品类目删除失败";
throw new BusinessException(e.getMessage());
}
j.setMsg(message);
return j;
}
/**
* 添加商品类目
*
* @param ids
* @return
*/
@RequestMapping(params = "doAdd")
@ResponseBody
public AjaxJson doAdd(BaGoodsCategoryEntity baGoodsCategory, HttpServletRequest request) {
String message = null;
AjaxJson j = new AjaxJson();
message = "商品类目添加成功";
try{
baGoodsCategoryService.save(baGoodsCategory);
systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
}catch(Exception e){
e.printStackTrace();
message = "商品类目添加失败";
throw new BusinessException(e.getMessage());
}
j.setMsg(message);
return j;
}
/**
* 更新商品类目
*
* @param ids
* @return
*/
@RequestMapping(params = "doUpdate")
@ResponseBody
public AjaxJson doUpdate(BaGoodsCategoryEntity baGoodsCategory, HttpServletRequest request) {
String message = null;
AjaxJson j = new AjaxJson();
message = "商品类目更新成功";
BaGoodsCategoryEntity t = baGoodsCategoryService.get(BaGoodsCategoryEntity.class, baGoodsCategory.getId());
try {
MyBeanUtils.copyBeanNotNull2Bean(baGoodsCategory, t);
baGoodsCategoryService.saveOrUpdate(t);
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) {
e.printStackTrace();
message = "商品类目更新失败";
throw new BusinessException(e.getMessage());
}
j.setMsg(message);
return j;
}
/**
* 商品类目新增页面跳转
*
* @return
*/
@RequestMapping(params = "goAdd")
public ModelAndView goAdd(BaGoodsCategoryEntity baGoodsCategory, HttpServletRequest req) {
if (StringUtil.isNotEmpty(baGoodsCategory.getId())) {
baGoodsCategory = baGoodsCategoryService.getEntity(BaGoodsCategoryEntity.class, baGoodsCategory.getId());
req.setAttribute("baGoodsCategoryPage", baGoodsCategory);
}
return new ModelAndView("com/zzjee/ba/baGoodsCategory-add");
}
/**
* 商品类目编辑页面跳转
*
* @return
*/
@RequestMapping(params = "goUpdate")
public ModelAndView goUpdate(BaGoodsCategoryEntity baGoodsCategory, HttpServletRequest req) {
if (StringUtil.isNotEmpty(baGoodsCategory.getId())) {
baGoodsCategory = baGoodsCategoryService.getEntity(BaGoodsCategoryEntity.class, baGoodsCategory.getId());
req.setAttribute("baGoodsCategoryPage", baGoodsCategory);
}
return new ModelAndView("com/zzjee/ba/baGoodsCategory-update");
}
/**
* 导入功能跳转
*
* @return
*/
@RequestMapping(params = "upload")
public ModelAndView upload(HttpServletRequest req) {
req.setAttribute("controller_name","baGoodsCategoryController");
return new ModelAndView("common/upload/pub_excel_upload");
}
/**
* 导出excel
*
* @param request
* @param response
*/
@RequestMapping(params = "exportXls")
public String exportXls(BaGoodsCategoryEntity baGoodsCategory,HttpServletRequest request,HttpServletResponse response
, DataGrid dataGrid,ModelMap modelMap) {
CriteriaQuery cq = new CriteriaQuery(BaGoodsCategoryEntity.class, dataGrid);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, baGoodsCategory, request.getParameterMap());
List<BaGoodsCategoryEntity> baGoodsCategorys = this.baGoodsCategoryService.getListByCriteriaQuery(cq,false);
modelMap.put(NormalExcelConstants.FILE_NAME,"商品类目");
modelMap.put(NormalExcelConstants.CLASS,BaGoodsCategoryEntity.class);
modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("商品类目列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),
"导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST,baGoodsCategorys);
return NormalExcelConstants.JEECG_EXCEL_VIEW;
}
/**
* 导出excel 使模板
*
* @param request
* @param response
*/
@RequestMapping(params = "exportXlsByT")
public String exportXlsByT(BaGoodsCategoryEntity baGoodsCategory,HttpServletRequest request,HttpServletResponse response
, DataGrid dataGrid,ModelMap modelMap) {
modelMap.put(NormalExcelConstants.FILE_NAME,"商品类目");
modelMap.put(NormalExcelConstants.CLASS,BaGoodsCategoryEntity.class);
modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("商品类目列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),
"导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
return NormalExcelConstants.JEECG_EXCEL_VIEW;
}
@SuppressWarnings("unchecked")
@RequestMapping(params = "importExcel", method = RequestMethod.POST)
@ResponseBody
public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
AjaxJson j = new AjaxJson();
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<BaGoodsCategoryEntity> listBaGoodsCategoryEntitys = ExcelImportUtil.importExcel(file.getInputStream(),BaGoodsCategoryEntity.class,params);
for (BaGoodsCategoryEntity baGoodsCategory : listBaGoodsCategoryEntitys) {
baGoodsCategoryService.save(baGoodsCategory);
}
j.setMsg("文件导入成功！");
} catch (Exception e) {
j.setMsg("文件导入失败！");
logger.error(ExceptionUtil.getExceptionMessage(e));
}finally{
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return j;
}
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public List<BaGoodsCategoryEntity> list() {
List<BaGoodsCategoryEntity> listBaGoodsCategorys=baGoodsCategoryService.getList(BaGoodsCategoryEntity.class);
return listBaGoodsCategorys;
}
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> get(@PathVariable("id") String id) {
BaGoodsCategoryEntity task = baGoodsCategoryService.get(BaGoodsCategoryEntity.class, id);
if (task == null) {
return new ResponseEntity(HttpStatus.NOT_FOUND);
}
return new ResponseEntity(task, HttpStatus.OK);
}
@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> create(@RequestBody BaGoodsCategoryEntity baGoodsCategory, UriComponentsBuilder uriBuilder) {
//调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
Set<ConstraintViolation<BaGoodsCategoryEntity>> failures = validator.validate(baGoodsCategory);
if (!failures.isEmpty()) {
return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST);
}
//保存
try{
baGoodsCategoryService.save(baGoodsCategory);
} catch (Exception e) {
e.printStackTrace();
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
//按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象.
int id = baGoodsCategory.getId();
URI uri = uriBuilder.path("/rest/baGoodsCategoryController/" + id).build().toUri();
HttpHeaders headers = new HttpHeaders();
headers.setLocation(uri);
return new ResponseEntity(headers, HttpStatus.CREATED);
}
@RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> update(@RequestBody BaGoodsCategoryEntity baGoodsCategory) {
//调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
Set<ConstraintViolation<BaGoodsCategoryEntity>> failures = validator.validate(baGoodsCategory);
if (!failures.isEmpty()) {
return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST);
}
//保存
try{
baGoodsCategoryService.saveOrUpdate(baGoodsCategory);
} catch (Exception e) {
e.printStackTrace();
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
//按Restful约定，返回204状态码, 无内容. 也可以返回200状态码.
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ResponseStatus(HttpStatus.NO_CONTENT)
public void delete(@PathVariable("id") String id) {
baGoodsCategoryService.deleteEntityById(BaGoodsCategoryEntity.class, id);
}
@RequestMapping(params = "getGoodsTreeList")
@ResponseBody
public AjaxJson getGoodsTreeList(){
List<BaGoodsCategoryVo> treeList = new ArrayList<>();
List<BaGoodsCategoryEntity> dataList = systemService.findHql("from BaGoodsCategoryEntity order by id");
for (BaGoodsCategoryEntity baGoodsCategoryEntity : dataList) {
BaGoodsCategoryVo baGoodsCategoryVo = new BaGoodsCategoryVo();
baGoodsCategoryVo.setLabel(baGoodsCategoryEntity.getCategoryName());
baGoodsCategoryVo.setValue(baGoodsCategoryEntity.getId());
baGoodsCategoryVo.setPid(baGoodsCategoryEntity.getPid());
if (baGoodsCategoryVo.getPid() == null){
System.out.println();
}
if (baGoodsCategoryVo.getPid() == 0) {
treeList.add(baGoodsCategoryVo);
}else {
BaGoodsCategoryVo parent = findParent(treeList,baGoodsCategoryVo.getPid());
if(parent!=null){
if(parent.getChildren()==null){
parent.setChildren(new ArrayList<>());
}
parent.getChildren().add(baGoodsCategoryVo);
} else {
treeList.add(baGoodsCategoryVo);
}
}
}
AjaxJson ajaxJson = new AjaxJson();
ajaxJson.setSuccess(true);
ajaxJson.setMsg("查询成功");
ajaxJson.setObj(treeList);
return ajaxJson;
}
private BaGoodsCategoryVo findParent(List<BaGoodsCategoryVo> treeList, Integer pid) {
BaGoodsCategoryVo find = null;
for(BaGoodsCategoryVo baGoodsCategoryVo:treeList){
if(baGoodsCategoryVo.getValue().equals(pid)){
find = baGoodsCategoryVo;
break;
} else if(baGoodsCategoryVo.getChildren()!=null) {
find = findParent(baGoodsCategoryVo.getChildren(),pid);
if(find!=null){
break;
}
}
}
return find;
}
}

275
src/main/java/com/zzjee/ba/entity/BaGoodsCategoryEntity.java Normal file
View File

@ -0,0 +1,275 @@
package com.zzjee.ba.entity;
import java.math.BigDecimal;
import java.util.Date;
import java.lang.String;
import java.lang.Double;
import java.lang.Integer;
import java.math.BigDecimal;
import javax.xml.soap.Text;
import java.sql.Blob;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.SequenceGenerator;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* @Title: Entity
* @Description: 商品类目
* @author onlineGenerator
* @date 2021-08-20 10:29:34
* @version V1.0
*
*/
@Entity
@Table(name = "ba_goods_category", schema = "")
@SuppressWarnings("serial")
public class BaGoodsCategoryEntity implements java.io.Serializable {
/**id*/
private Integer id;
/**创建人名称*/
private String createName;
/**创建人登录名称*/
private String createBy;
/**创建日期*/
private Date createTime;
/**更新人名称*/
private String updateName;
/**更新人登录名称*/
private String updateBy;
/**更新日期*/
private Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**类目编码*/
@Excel(name="类目编码")
private String categoryCode;
/**类目名称*/
@Excel(name="类目名称")
private String categoryName;
/**类目级别*/
@Excel(name="类目级别")
private Integer categoryLevel;
/**父级目录*/
@Excel(name="父级目录")
private Integer pid;
/**是否为顶级目录*/
@Excel(name="是否为顶级目录")
private String topNode;
/**
*方法: 取得java.lang.Integer
*@return: java.lang.Integer id
*/
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name ="ID",nullable=false,length=10)
public Integer getId(){
return this.id;
}
/**
*方法: 设置java.lang.Integer
*@param: java.lang.Integer id
*/
public void setId(Integer id){
this.id = id;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 创建人名称
*/
@Column(name ="CREATE_NAME",nullable=true,length=50)
public String getCreateName(){
return this.createName;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 创建人名称
*/
public void setCreateName(String createName){
this.createName = createName;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 创建人登录名称
*/
@Column(name ="CREATE_BY",nullable=true,length=50)
public String getCreateBy(){
return this.createBy;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 创建人登录名称
*/
public void setCreateBy(String createBy){
this.createBy = createBy;
}
/**
*方法: 取得java.util.Date
*@return: java.util.Date 创建日期
*/
@Column(name ="CREATE_TIME",nullable=true)
public Date getCreateTime(){
return this.createTime;
}
/**
*方法: 设置java.util.Date
*@param: java.util.Date 创建日期
*/
public void setCreateTime(Date createTime){
this.createTime = createTime;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 更新人名称
*/
@Column(name ="UPDATE_NAME",nullable=true,length=50)
public String getUpdateName(){
return this.updateName;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 更新人名称
*/
public void setUpdateName(String updateName){
this.updateName = updateName;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 更新人登录名称
*/
@Column(name ="UPDATE_BY",nullable=true,length=50)
public String getUpdateBy(){
return this.updateBy;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 更新人登录名称
*/
public void setUpdateBy(String updateBy){
this.updateBy = updateBy;
}
/**
*方法: 取得java.util.Date
*@return: java.util.Date 更新日期
*/
@Column(name ="UPDATE_TIME",nullable=true)
public Date getUpdateTime(){
return this.updateTime;
}
/**
*方法: 设置java.util.Date
*@param: java.util.Date 更新日期
*/
public void setUpdateTime(Date updateTime){
this.updateTime = updateTime;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 所属部门
*/
@Column(name ="SYS_ORG_CODE",nullable=true,length=50)
public String getSysOrgCode(){
return this.sysOrgCode;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 所属部门
*/
public void setSysOrgCode(String sysOrgCode){
this.sysOrgCode = sysOrgCode;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 类目编码
*/
@Column(name ="CATEGORY_CODE",nullable=true,length=50)
public String getCategoryCode(){
return this.categoryCode;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 类目编码
*/
public void setCategoryCode(String categoryCode){
this.categoryCode = categoryCode;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 类目名称
*/
@Column(name ="CATEGORY_NAME",nullable=true,length=50)
public String getCategoryName(){
return this.categoryName;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 类目名称
*/
public void setCategoryName(String categoryName){
this.categoryName = categoryName;
}
/**
*方法: 取得java.lang.Integer
*@return: java.lang.Integer 类目级别
*/
@Column(name ="CATEGORY_LEVEL",nullable=true,length=10)
public Integer getCategoryLevel(){
return this.categoryLevel;
}
/**
*方法: 设置java.lang.Integer
*@param: java.lang.Integer 类目级别
*/
public void setCategoryLevel(Integer categoryLevel){
this.categoryLevel = categoryLevel;
}
/**
*方法: 取得java.lang.Integer
*@return: java.lang.Integer 父级目录
*/
@Column(name ="PID",nullable=true,length=10)
public Integer getPid(){
return this.pid;
}
/**
*方法: 设置java.lang.Integer
*@param: java.lang.Integer 父级目录
*/
public void setPid(Integer pid){
this.pid = pid;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 是否为顶级目录
*/
@Column(name ="TOP_NODE",nullable=true,length=10)
public String getTopNode(){
return this.topNode;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 是否为顶级目录
*/
public void setTopNode(String topNode){
this.topNode = topNode;
}
}

15
src/main/java/com/zzjee/ba/service/BaGoodsCategoryServiceI.java Normal file
View File

@ -0,0 +1,15 @@
package com.zzjee.ba.service;
import com.zzjee.ba.entity.BaGoodsCategoryEntity;
import org.jeecgframework.core.common.service.CommonService;
import java.io.Serializable;
public interface BaGoodsCategoryServiceI extends CommonService{
public void delete(BaGoodsCategoryEntity entity) throws Exception;
public Serializable save(BaGoodsCategoryEntity entity) throws Exception;
public void saveOrUpdate(BaGoodsCategoryEntity entity) throws Exception;
}

142
src/main/java/com/zzjee/ba/service/impl/BaGoodsCategoryServiceImpl.java Normal file
View File

@ -0,0 +1,142 @@
package com.zzjee.ba.service.impl;
import com.zzjee.ba.service.BaGoodsCategoryServiceI;
import org.jeecgframework.core.common.service.impl.CommonServiceImpl;
import com.zzjee.ba.entity.BaGoodsCategoryEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.io.Serializable;
import org.jeecgframework.core.util.ApplicationContextUtil;
import org.jeecgframework.core.util.MyClassLoader;
import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter;
@Service("baGoodsCategoryService")
@Transactional
public class BaGoodsCategoryServiceImpl extends CommonServiceImpl implements BaGoodsCategoryServiceI {
public void delete(BaGoodsCategoryEntity entity) throws Exception{
super.delete(entity);
//执行删除操作增强业务
this.doDelBus(entity);
}
public Serializable save(BaGoodsCategoryEntity entity) throws Exception{
Serializable t = super.save(entity);
//执行新增操作增强业务
this.doAddBus(entity);
return t;
}
public void saveOrUpdate(BaGoodsCategoryEntity entity) throws Exception{
super.saveOrUpdate(entity);
//执行更新操作增强业务
this.doUpdateBus(entity);
}
/**
* 新增操作增强业务
* @param t
* @return
*/
private void doAddBus(BaGoodsCategoryEntity t) throws Exception{
//-----------------sql增强 start----------------------------
//-----------------sql增强 end------------------------------
//-----------------java增强 start---------------------------
//-----------------java增强 end-----------------------------
}
/**
* 更新操作增强业务
* @param t
* @return
*/
private void doUpdateBus(BaGoodsCategoryEntity t) throws Exception{
//-----------------sql增强 start----------------------------
//-----------------sql增强 end------------------------------
//-----------------java增强 start---------------------------
//-----------------java增强 end-----------------------------
}
/**
* 删除操作增强业务
* @param id
* @return
*/
private void doDelBus(BaGoodsCategoryEntity t) throws Exception{
//-----------------sql增强 start----------------------------
//-----------------sql增强 end------------------------------
//-----------------java增强 start---------------------------
//-----------------java增强 end-----------------------------
}
private Map<String,Object> populationMap(BaGoodsCategoryEntity t){
Map<String,Object> map = new HashMap<String,Object>();
map.put("id", t.getId());
map.put("create_name", t.getCreateName());
map.put("create_by", t.getCreateBy());
map.put("create_time", t.getCreateTime());
map.put("update_name", t.getUpdateName());
map.put("update_by", t.getUpdateBy());
map.put("update_time", t.getUpdateTime());
map.put("sys_org_code", t.getSysOrgCode());
map.put("category_code", t.getCategoryCode());
map.put("category_name", t.getCategoryName());
map.put("category_level", t.getCategoryLevel());
map.put("pid", t.getPid());
map.put("top_node", t.getTopNode());
return map;
}
/**
* 替换sql中的变量
* @param sql
* @param t
* @return
*/
public String replaceVal(String sql,BaGoodsCategoryEntity t){
sql = sql.replace("#{id}",String.valueOf(t.getId()));
sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName()));
sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy()));
sql = sql.replace("#{create_time}",String.valueOf(t.getCreateTime()));
sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName()));
sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy()));
sql = sql.replace("#{update_time}",String.valueOf(t.getUpdateTime()));
sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode()));
sql = sql.replace("#{category_code}",String.valueOf(t.getCategoryCode()));
sql = sql.replace("#{category_name}",String.valueOf(t.getCategoryName()));
sql = sql.replace("#{category_level}",String.valueOf(t.getCategoryLevel()));
sql = sql.replace("#{pid}",String.valueOf(t.getPid()));
sql = sql.replace("#{top_node}",String.valueOf(t.getTopNode()));
sql = sql.replace("#{UUID}",UUID.randomUUID().toString());
return sql;
}
/**
* 执行JAVA增强
*/
private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map<String,Object> data) throws Exception {
if(StringUtil.isNotEmpty(cgJavaValue)){
Object obj = null;
try {
if("class".equals(cgJavaType)){
//因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断
obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance();
}else if("spring".equals(cgJavaType)){
obj = ApplicationContextUtil.getContext().getBean(cgJavaValue);
}
if(obj instanceof CgformEnhanceJavaInter){
CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj;
javaInter.execute("ba_goods_category",data);
}
} catch (Exception e) {
e.printStackTrace();
throw new Exception("执行JAVA增强出现异常！");
}
}
}
}

55
src/main/java/com/zzjee/ba/vo/BaGoodsCategoryVo.java Normal file
View File

@ -0,0 +1,55 @@
package com.zzjee.ba.vo;
import java.util.List;
/**
* @Package com.zzjee.ba.vo
* @date 2021/8/20 11:38 上午
* @description
*/
public class BaGoodsCategoryVo {
private String label;
private Integer value;
public String getLabel() {
return label;
}
public BaGoodsCategoryVo setLabel(String label) {
this.label = label;
return this;
}
public Integer getValue() {
return value;
}
public BaGoodsCategoryVo setValue(Integer value) {
this.value = value;
return this;
}
public Integer getPid() {
return pid;
}
public BaGoodsCategoryVo setPid(Integer pid) {
this.pid = pid;
return this;
}
public List<BaGoodsCategoryVo> getChildren() {
return children;
}
public BaGoodsCategoryVo setChildren(List<BaGoodsCategoryVo> children) {
this.children = children;
return this;
}
private Integer pid;
private List<BaGoodsCategoryVo> children;
}

24
src/main/java/com/zzjee/md/entity/MdGoodsEntity.java
View File

@ -147,6 +147,20 @@ public class MdGoodsEntity implements java.io.Serializable {
private java.lang.String zhuangTai;
private java.lang.String minStock;
private String sku;
private Integer categoryId;
@Column(name ="category_id",nullable=false,length=36)
public Integer getCategoryId() {
return categoryId;
}
public MdGoodsEntity setCategoryId(Integer categoryId) {
this.categoryId = categoryId;
return this;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@ -927,4 +941,14 @@ public class MdGoodsEntity implements java.io.Serializable {
this.minStock = minStock;
return this;
}
@Column(name ="sku",nullable=true,length=32)
public String getSku() {
return sku;
}
public MdGoodsEntity setSku(String sku) {
this.sku = sku;
return this;
}
}

4
src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
View File

@ -1669,11 +1669,11 @@ public class WmOmNoticeHController extends BaseController {
sheet.addMergedRegion(c72);
Cell cell73 = row.createCell(10);
cell73.setCellValue("① 财务联 ② 客户联 ③司机联 ④回单联 ");
cell73.setCellValue("①财务联 ②客户联 ③司机联 ④回单联");
cell73.setCellStyle(cs52);
CellRangeAddress c73 = new CellRangeAddress(page*20, page*20+19, 10, 10);//第7行打印时间
CellRangeAddress c73 = new CellRangeAddress(page*20, page*20+16, 10, 10);//第7行打印时间
sheet.addMergedRegion(c73);
Row rowColumnName = sheet.createRow((short) page*20+8); // 列名

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

@ -137,7 +137,7 @@ public class WmsApiController {
message = "商品信息添加成功";
try {
MdGoodsEntity mdGoods1 = systemService.findUniqueByProperty(
MdGoodsEntity.class, "shpBianMa", mdGoods.getShpBianMa());
MdGoodsEntity.class, "sku", mdGoods.getSku());
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 suo_shu_ke_hu = ? and shp_bian_ma like ? ORDER BY shp_bian_ma desc LIMIT 1",mdGoods.getChpShuXing(),mdGoods.getSuoShuKeHu(),mdGoods.getSuoShuKeHu()+"&"+mdGoods.getChpShuXing()+"%");
@ -177,8 +177,20 @@ public class WmsApiController {
Globals.Log_Leavel_INFO);
j.setObj(mdGoods);
}else{
message = "商品编码或者条码已经存在";
j.setSuccess(false);
try {
if(StringUtil.isEmpty(mdGoods.getZhlKgm())){
if(!StringUtil.isEmpty(mdGoods.getBzhiQi())){
int bzhiq = Integer.parseInt(mdGoods.getBzhiQi());
mdGoods.setZhlKgm(Integer.toString(bzhiq));
}
}
} catch (Exception e) {
e.printStackTrace();
// TODO: handle exception
}
MyBeanUtils.copyBeanNotNull2Bean(mdGoods, mdGoods1);
mdGoodsService.updateEntitie(mdGoods1);
}
} catch (Exception e) {

100
src/main/webapp/webpage/com/zzjee/ba/baGoodsCategory-add.jsp Normal file
View File

@ -0,0 +1,100 @@
<%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<!DOCTYPE html>
<html>
<head>
<title>商品类目</title>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<script type="text/javascript">
//编写自定义JS代码
</script>
</head>
<body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="baGoodsCategoryController.do?doAdd" >
<input id="id" name="id" type="hidden" value="${baGoodsCategoryPage.id }"/>
<input id="createName" name="createName" type="hidden" value="${baGoodsCategoryPage.createName }"/>
<input id="createBy" name="createBy" type="hidden" value="${baGoodsCategoryPage.createBy }"/>
<input id="createTime" name="createTime" type="hidden" value="${baGoodsCategoryPage.createTime }"/>
<input id="updateName" name="updateName" type="hidden" value="${baGoodsCategoryPage.updateName }"/>
<input id="updateBy" name="updateBy" type="hidden" value="${baGoodsCategoryPage.updateBy }"/>
<input id="updateTime" name="updateTime" type="hidden" value="${baGoodsCategoryPage.updateTime }"/>
<input id="sysOrgCode" name="sysOrgCode" type="hidden" value="${baGoodsCategoryPage.sysOrgCode }"/>
<table style="width: 600px;" cellpadding="0" cellspacing="1" class="formtable">
<tr>
<td align="right">
<label class="Validform_label">
类目编码:
</label>
</td>
<td class="value">
<input id="categoryCode" name="categoryCode" type="text" style="width: 150px" class="inputxt"
ignore="checked"
/>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目编码</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
类目名称:
</label>
</td>
<td class="value">
<input id="categoryName" name="categoryName" type="text" style="width: 150px" class="inputxt"
ignore="checked"
/>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目名称</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
类目级别:
</label>
</td>
<td class="value">
<input id="categoryLevel" name="categoryLevel" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
/>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目级别</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
父级目录:
</label>
</td>
<td class="value">
<input id="pid" name="pid" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
/>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">父级目录</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
是否为顶级目录:
</label>
</td>
<td class="value">
<t:dictSelect field="topNode" type="list"
typeGroupCode="yes_no" defaultVal="${baGoodsCategoryPage.topNode}" hasLabel="false" title="是否为顶级目录"
></t:dictSelect>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">是否为顶级目录</label>
</td>
</tr>
</table>
</t:formvalid>
</body>
<script src = "webpage/com/zzjee/ba/baGoodsCategory.js"></script>

96
src/main/webapp/webpage/com/zzjee/ba/baGoodsCategory-update.jsp Normal file
View File

@ -0,0 +1,96 @@
<%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<!DOCTYPE html>
<html>
<head>
<title>商品类目</title>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<script type="text/javascript">
//编写自定义JS代码
</script>
</head>
<body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="baGoodsCategoryController.do?doUpdate" >
<input id="id" name="id" type="hidden" value="${baGoodsCategoryPage.id }">
<input id="createName" name="createName" type="hidden" value="${baGoodsCategoryPage.createName }">
<input id="createBy" name="createBy" type="hidden" value="${baGoodsCategoryPage.createBy }">
<input id="createTime" name="createTime" type="hidden" value="${baGoodsCategoryPage.createTime }">
<input id="updateName" name="updateName" type="hidden" value="${baGoodsCategoryPage.updateName }">
<input id="updateBy" name="updateBy" type="hidden" value="${baGoodsCategoryPage.updateBy }">
<input id="updateTime" name="updateTime" type="hidden" value="${baGoodsCategoryPage.updateTime }">
<input id="sysOrgCode" name="sysOrgCode" type="hidden" value="${baGoodsCategoryPage.sysOrgCode }">
<table style="width: 600px;" cellpadding="0" cellspacing="1" class="formtable">
<tr>
<td align="right">
<label class="Validform_label">
类目编码:
</label>
</td>
<td class="value">
<input id="categoryCode" name="categoryCode" type="text" style="width: 150px" class="inputxt"
ignore="checked"
value='${baGoodsCategoryPage.categoryCode}'>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目编码</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
类目名称:
</label>
</td>
<td class="value">
<input id="categoryName" name="categoryName" type="text" style="width: 150px" class="inputxt"
ignore="checked"
value='${baGoodsCategoryPage.categoryName}'>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目名称</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
类目级别:
</label>
</td>
<td class="value">
<input id="categoryLevel" name="categoryLevel" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
value='${baGoodsCategoryPage.categoryLevel}'>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">类目级别</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
父级目录:
</label>
</td>
<td class="value">
<input id="pid" name="pid" type="text" style="width: 150px" class="inputxt"
ignore="ignore"
value='${baGoodsCategoryPage.pid}'>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">父级目录</label>
</td>
</tr>
<tr>
<td align="right">
<label class="Validform_label">
是否为顶级目录:
</label>
</td>
<td class="value">
<t:dictSelect field="topNode" type="list"
typeGroupCode="yes_no" defaultVal="${baGoodsCategoryPage.topNode}" hasLabel="false" title="是否为顶级目录"
></t:dictSelect>
<span class="Validform_checktip"></span>
<label class="Validform_label" style="display: none;">是否为顶级目录</label>
</td>
</tr>
</table>
</t:formvalid>
</body>
<script src = "webpage/com/zzjee/ba/baGoodsCategory.js"></script>

32
src/main/webapp/webpage/com/zzjee/ba/baGoodsCategory.js Normal file
View File

@ -0,0 +1,32 @@
//通用弹出式文件上传
function commonUpload(callback){
$.dialog({
content: "url:systemController.do?commonUpload",
lock : true,
title:"文件上传",
zIndex:2100,
width:700,
height: 200,
parent:windowapi,
cache:false,
ok: function(){
var iframe = this.iframe.contentWindow;
iframe.uploadCallback(callback);
return true;
},
cancelVal: '关闭',
cancel: function(){
}
});
}
function browseImages(inputId, Img) {// 图片管理器，可多个上传共用
}
function browseFiles(inputId, file) {// 文件管理器，可多个上传共用
}
function decode(value, id) {//value传入值,id接受值
var last = value.lastIndexOf("/");
var filename = value.substring(last + 1, value.length);
$("#" + id).text(decodeURIComponent(filename));
}

0
src/main/webapp/webpage/com/zzjee/ba/baGoodsCategoryList.js Normal file
View File

54
src/main/webapp/webpage/com/zzjee/ba/baGoodsCategoryList.jsp Normal file
View File

@ -0,0 +1,54 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<div class="easyui-layout" fit="true">
<div region="center" style="padding:0px;border:0px">
<t:datagrid name="baGoodsCategoryList" checkbox="true" pagination="true" fitColumns="false" title="商品类目" actionUrl="baGoodsCategoryController.do?datagrid" idField="id" fit="true" queryMode="group">
<t:dgCol title="id" field="id" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createTime" formatter="yyyy-MM-dd" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="更新人名称" field="updateName" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="更新人登录名称" field="updateBy" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="更新日期" field="updateTime" formatter="yyyy-MM-dd" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="类目编码" field="categoryCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="类目名称" field="categoryName" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="类目级别" field="categoryLevel" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="父级目录" field="pid" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="是否为顶级目录" field="topNode" hidden="true" queryMode="group" dictionary="yes_no" width="120"></t:dgCol>
<t:dgCol title="操作" field="opt" width="100"></t:dgCol>
<t:dgDelOpt title="删除" url="baGoodsCategoryController.do?doDel&id={id}" urlclass="ace_button" urlfont="fa-trash-o"/>
<t:dgToolBar title="录入" icon="icon-add" url="baGoodsCategoryController.do?goAdd" funname="add"></t:dgToolBar>
<t:dgToolBar title="编辑" icon="icon-edit" url="baGoodsCategoryController.do?goUpdate" funname="update"></t:dgToolBar>
<t:dgToolBar title="批量删除" icon="icon-remove" url="baGoodsCategoryController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar>
<t:dgToolBar title="查看" icon="icon-search" url="baGoodsCategoryController.do?goUpdate" funname="detail"></t:dgToolBar>
<t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar>
<t:dgToolBar title="导出" icon="icon-putout" funname="ExportXls"></t:dgToolBar>
<t:dgToolBar title="模板下载" icon="icon-putout" funname="ExportXlsByT"></t:dgToolBar>
</t:datagrid>
</div>
</div>
<script src = "webpage/com/zzjee/ba/baGoodsCategoryList.js"></script>
<script type="text/javascript">
$(document).ready(function(){
});
//导入
function ImportXls() {
openwindow('Excel导入', 'baGoodsCategoryController.do?upload', "baGoodsCategoryList");
}
//导出
function ExportXls() {
JeecgExcelExport("baGoodsCategoryController.do?exportXls","baGoodsCategoryList");
}
//模板下载
function ExportXlsByT() {
JeecgExcelExport("baGoodsCategoryController.do?exportXlsByT","baGoodsCategoryList");
}
</script>

82
src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp
View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -31,7 +31,7 @@
<script type="text/javascript" src="plug-in/Validform/plugin/passwordStrength/passwordStrength-min.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript">
//编写自定义JS代码
</script>
@ -56,51 +56,51 @@
</div>
<div class="col-xs-3">
<t:dictSelect field="xingYeFenLei" type="list" extendJson="{class:'form-control'}"
dictTable="ba_com_type" dictField="com_type_code" dictText="com_type_name" hasLabel="false" title="企业属性"></t:dictSelect>
dictTable="ba_com_type" dictField="com_type_code" dictText="com_type_name" hasLabel="false" title="企业属性"></t:dictSelect>
<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>
<b style="color:red">供应商编码</b>
</div>
<div class="col-xs-3">
<input id="keHuBianMa" name="keHuBianMa" type="text" class="form-control"
<input id="keHuBianMa" name="keHuBianMa" type="text" class="form-control"
ignore="checked"
datatype="*" />
<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 class="col-xs-3 text-center">
<b style="color:red">客户属性</b>
<b style="color:red">供应商属性</b>
</div>
<div class="col-xs-3">
<t:dictSelect field="keHuShuXing" type="list" extendJson="{class:'form-control',datatype:'*'}"
dictTable="ba_keHuShuXing" dictField="kehushuxing_code" dictText="kehushuxing_name" hasLabel="false" title="客户属性"></t:dictSelect>
<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 class="col-xs-3 text-center">
<b style="color:red">出库计费方式</b>
</div>
<div class="col-xs-3">
<t:dictSelect field="keHuZhuangTai" type="list" extendJson="{class:'form-control',datatype:'*'}"
dictTable="ba_kehuzhuangtai" dictField="kehuzhuangtai_code" dictText="kehuzhuangtai_name" hasLabel="false" title="有无意向书"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">出库计费方式</label>
</div>
</div>
<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="zhongWenQch" name="zhongWenQch" type="text" class="form-control"
<input id="zhongWenQch" name="zhongWenQch" type="text" class="form-control"
ignore="checked" style="width:490px"
datatype="*" />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -112,7 +112,7 @@
<b >合同号</b>
</div>
<div class="col-xs-3">
<input id="zhuJiMa" name="zhuJiMa" type="text" class="form-control"
<input id="zhuJiMa" name="zhuJiMa" type="text" class="form-control"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -122,7 +122,7 @@
<b >营业执照</b>
</div>
<div class="col-xs-3">
<input id="yingYeZhiZhao" name="yingYeZhiZhao" type="text" class="form-control"
<input id="yingYeZhiZhao" name="yingYeZhiZhao" type="text" class="form-control"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -135,21 +135,21 @@
<b style="color:red">地&emsp;&emsp;址</b>
</div>
<div class="col-xs-3">
<input id="diZhi" name="diZhi" type="text" class="form-control"
<input id="diZhi" name="diZhi" type="text" class="form-control"
ignore="ignore" style="width:490px"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">地址</label>
</div>
</div>
<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="zhuLianXiRen" name="zhuLianXiRen" type="text" class="form-control"
<input id="zhuLianXiRen" name="zhuLianXiRen" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -159,22 +159,22 @@
<b >电&emsp;&emsp;话</b>
</div>
<div class="col-xs-3">
<input id="dianHua" name="dianHua" type="text" class="form-control"
<input id="dianHua" name="dianHua" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">电话</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">手&emsp;&emsp;机</b>
</div>
<div class="col-xs-3">
<input id="shouJi" name="shouJi" type="text" class="form-control"
<input id="shouJi" name="shouJi" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -184,7 +184,7 @@
<b>Email地址</b>
</div>
<div class="col-xs-3">
<input id="emaildiZhi" name="emaildiZhi" type="text" class="form-control"
<input id="emaildiZhi" name="emaildiZhi" type="text" class="form-control"
ignore="ignore"
datatype="e" />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -192,14 +192,14 @@
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b >联系人1</b>
</div>
<div class="col-xs-3">
<input id="zhuLianXiRen1" name="zhuLianXiRen1" type="text" class="form-control"
<input id="zhuLianXiRen1" name="zhuLianXiRen1" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -209,21 +209,21 @@
<b >电&emsp;&emsp;话1</b>
</div>
<div class="col-xs-3">
<input id="dianHua1" name="dianHua1" type="text" class="form-control"
<input id="dianHua1" name="dianHua1" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">电话1</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>备&emsp;&emsp;注</b>
</div>
<div class="col-xs-3">
<textarea id="beiZhu" class="form-control" rows="6"
<textarea id="beiZhu" class="form-control" rows="6"
ignore="ignore" style="width:490px"
name="beiZhu"></textarea>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -242,7 +242,7 @@
</div>
</div>
<div class="row" id = "sub_tr" style="display: none;">
<div class="col-xs-12 layout-header">
<div class="col-xs-6"></div>
@ -251,7 +251,7 @@
</div>
</div>
</div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div>
</t:formvalid>
@ -262,7 +262,7 @@
if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide();
}
if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled");
@ -275,11 +275,11 @@
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
</script>
</body>
<script src = "webpage/com/zzjee/md/mdCus.js"></script>
</html>
<script src = "webpage/com/zzjee/md/mdCus.js"></script>
</html>

52
src/main/webapp/webpage/com/zzjee/md/mdCus-update.jsp
View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -40,8 +40,8 @@
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="mdCusController.do?doUpdate" tiptype="1" >
<input type="hidden" id="btn_sub" class="btn_sub"/>
<input type="hidden" name="id" value='${mdCusPage.id}' >
<div class="tab-wrapper">
<!-- tab -->
<ul class="nav nav-tabs">
@ -56,38 +56,38 @@
</div>
<div class="col-xs-3">
<t:dictSelect field="xingYeFenLei" type="list" extendJson="{class:'form-control'}"
dictTable="ba_com_type" dictField="com_type_code" dictText="com_type_name" defaultVal="${mdCusPage.xingYeFenLei}" hasLabel="false" title="企业属性"></t:dictSelect>
dictTable="ba_com_type" dictField="com_type_code" dictText="com_type_name" defaultVal="${mdCusPage.xingYeFenLei}" hasLabel="false" title="企业属性"></t:dictSelect>
<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>
<b style="color:red">供应商编码</b>
</div>
<div class="col-xs-3">
<input id="keHuBianMa" name="keHuBianMa" type="text" class="form-control"
ignore="checked" readonly="readonly"
datatype="*" value='${mdCusPage.keHuBianMa}' />
<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 class="col-xs-3 text-center">
<b style="color:red">客户属性</b>
<b style="color:red">供应商属性</b>
</div>
<div class="col-xs-3">
<t:dictSelect field="keHuShuXing" type="list" extendJson="{class:'form-control'}"
defaultVal="${mdCusPage.keHuShuXing}" dictTable="ba_keHuShuXing" dictField="kehushuxing_code" dictText="kehushuxing_name" hasLabel="false" title="客户属性"></t:dictSelect>
defaultVal="${mdCusPage.keHuShuXing}" dictTable="ba_keHuShuXing" dictField="kehushuxing_code" dictText="kehushuxing_name" hasLabel="false" title="客户属性"></t:dictSelect>
<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 class="col-xs-3 text-center">
<b style="color:red">出库计费方式</b>
</div>
<div class="col-xs-3">
<t:dictSelect field="keHuZhuangTai" type="list" extendJson="{class:'form-control'}"
defaultVal="${mdCusPage.keHuZhuangTai}" dictTable="ba_kehuzhuangtai" dictField="kehuzhuangtai_code" dictText="kehuzhuangtai_name" hasLabel="false" title="有无意向书"></t:dictSelect>
defaultVal="${mdCusPage.keHuZhuangTai}" dictTable="ba_kehuzhuangtai" dictField="kehuzhuangtai_code" dictText="kehuzhuangtai_name" hasLabel="false" title="有无意向书"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">出库计费方式</label>
</div>
@ -126,7 +126,7 @@
<label class="Validform_label" style="display: none">营业执照</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">地&emsp;&emsp;址</b>
@ -139,8 +139,8 @@
<label class="Validform_label" style="display: none">地址</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">负责人</b>
@ -163,7 +163,7 @@
<label class="Validform_label" style="display: none">电话</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">手&emsp;&emsp;机</b>
@ -186,7 +186,7 @@
<label class="Validform_label" style="display: none">Email地址</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b >联系人1</b>
@ -209,13 +209,13 @@
<label class="Validform_label" style="display: none">电话1</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>备&emsp;&emsp;注</b>
</div>
<div class="col-xs-3">
<textarea id="beiZhu" class="form-control" rows="6"
<textarea id="beiZhu" class="form-control" rows="6"
ignore="ignore" style="width:490px"
name="beiZhu">${mdCusPage.beiZhu}</textarea>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
@ -244,7 +244,7 @@
</div>
</div>
</div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div>
</t:formvalid>
@ -255,7 +255,7 @@
if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide();
}
if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled");
@ -268,11 +268,11 @@
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
</script>
</body>
<script src = "webpage/com/zzjee/md/mdCus.js"></script>
</html>
<script src = "webpage/com/zzjee/md/mdCus.js"></script>
</html>

12
src/main/webapp/webpage/com/zzjee/md/mdCusList.jsp
View File

@ -15,19 +15,19 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="中文全称" field="zhongWenQch" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="合同号" field="zhuJiMa" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="客户简称" field="keHuJianCheng" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户编码" field="keHuBianMa" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户英文名称" field="keHuYingWen" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="供应商简称" field="keHuJianCheng" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="keHuBianMa" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商英文名称" field="keHuYingWen" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="曾用企业代码" field="zengYongQi" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="曾用企业名称" field="zengYongQiYe" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户状态" field="keHuZhuangTai" hidden="true" queryMode="group" dictionary="sf_yn" width="120"></t:dgCol>
<t:dgCol title="供应商状态" field="keHuZhuangTai" hidden="true" queryMode="group" dictionary="sf_yn" width="120"></t:dgCol>
<t:dgCol title="企业属性" field="xingYeFenLei" queryMode="group" dictionary="ba_com_type,com_type_code,com_type_name" width="120"></t:dgCol>
<t:dgCol title="客户等级" field="keHuDengJi" hidden="true" queryMode="group" dictionary="ba_com_deg,com_deg_code,com_deg_name" width="120"></t:dgCol>
<t:dgCol title="供应商等级" field="keHuDengJi" hidden="true" queryMode="group" dictionary="ba_com_deg,com_deg_code,com_deg_name" width="120"></t:dgCol>
<t:dgCol title="所属行业" field="suoShuXingYe" hidden="true" queryMode="group" dictionary="ba_classfl,classfl_code,classfl_name" width="120"></t:dgCol>
<t:dgCol title="首签日期" field="shouQianRiQi" formatter="yyyy-MM-dd" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="终止合作时间" field="zhongZhiHeShiJian" formatter="yyyy-MM-dd" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="申请时间" field="shenQingShiJian" formatter="yyyy-MM-dd" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户属性" field="keHuShuXing" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="供应商属性" field="keHuShuXing" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="归属组织代码" field="guiShuZuZh" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="归属省份代码" field="guiShuSheng" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="归属市代码" field="guiShuShiDai" hidden="true" queryMode="group" width="120"></t:dgCol>

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

@ -60,13 +60,13 @@ function counttiji(){
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">所属客户</b>
<b style="color:red">所属供应商</b>
</div>
<div class="col-xs-3">
<t:dictSelect field="suoShuKeHu" type="list" extendJson="{class:'form-control';datatype:'*'}"
dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="所属客户"></t:dictSelect>
<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 class="col-xs-3 text-center">
<b style="color:red">存放温层</b>

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

@ -64,13 +64,13 @@
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">所属客户</b>
<b style="color:red">所属供应商</b>
</div>
<div class="col-xs-3">
<t:dictSelect readonly="readonly" field="suoShuKeHu" type="list" extendJson="{class:'form-control'}"
dictTable="mv_cus" dictField="cus_code" dictText="cus_name" defaultVal="${mdGoodsPage.suoShuKeHu}" hasLabel="false" title="所属客户"></t:dictSelect>
<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 class="col-xs-3 text-center">
<b style="color:red">存放温层</b>

2
src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp
View File

@ -16,7 +16,7 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="操作" field="opt" width="100"></t:dgCol>
<t:dgCol title="所属客户" field="suoShuKeHu" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="所属供应商" field="suoShuKeHu" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="商品名称" field="shpMingCheng" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="英文名称" field="ywMingCheng" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="日文名称" field="rwMingCheng" query="true" queryMode="single" width="160"></t:dgCol>

2
src/main/webapp/webpage/com/zzjee/md/mdGoodsallList.jsp
View File

@ -13,7 +13,7 @@
<t:dgCol title="更新日期" field="updateDate" formatter="yyyy-MM-dd" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="所属客户" field="suoShuKeHu" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属供应商" field="suoShuKeHu" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="商品名称" field="shpMingCheng" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="商品简称" field="shpJianCheng" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="商品编码" field="shpBianMa" query="true" queryMode="single" width="90"></t:dgCol>

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

@ -14,7 +14,7 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="进货通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="80"></t:dgCol>

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

@ -15,7 +15,7 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="要求交货时间" field="delvData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="收货人" field="delvMember" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="收货人电话" field="delvMobile" query="true" queryMode="single" width="90"></t:dgCol>

6
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp
View File

@ -173,13 +173,13 @@
<div class="row show-grid">
<div class="col-xs-1 text-center">
<b>货主：</b>
<b>供应商：</b>
</div>
<div class="col-xs-2">
<t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}"
defaultVal="${wmImNoticeHPage.cusCode}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="货主"></t:dictSelect>
<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>
<%-- <t:autocomplete searchField="cusName" name="cusCode" entityName="MvCusEntity" ></t:autocomplete> --%>
</div>
@ -234,7 +234,7 @@
<label class="Validform_label" style="display: none">运输公司</label>
</div>
<div class="col-xs-1 text-center">
<b>供应商：</b>
<b>生产厂家：</b>
</div>
<t:dictSelect field="supCode" type="list" extendJson=" {class:'form-control',style:'width:230px'}"
dictTable="md_sup" dictField="GYS_BIAN_MA" dictText="ZHONG_WEN_QCH" hasLabel="false" title="供应商"></t:dictSelect>

4
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-update.jsp
View File

@ -123,7 +123,7 @@
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-1 text-center">
<b>货主：</b>
<b>供应商：</b>
</div>
<div class="col-xs-2">
<t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson="{class:'form-control',style:'width:230px'}"
@ -202,7 +202,7 @@
ignore="ignore" value='${wmImNoticeHPage.supCode}'
/>
<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 class="col-xs-1 text-center">
<b>预约库区：</b>

4
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeHList.jsp
View File

@ -16,14 +16,14 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="进货通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="货主" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="供应商" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="运输号码" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="运输公司" field="imCarDri" query="true" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="供应商编号" field="supCode" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="供应商名称" field="supName" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="生产厂家名称" field="supName" query="true" queryMode="single" width="120"></t:dgCol>
<%--<t:dgCol title="司机电话" field="imCarMobile" query="true" queryMode="single" width="60"></t:dgCol>--%>
<t:dgCol title="订单类型" field="orderTypeCode" query="true" queryMode="single" dictionary="ba_order_type,order_type_code,order_type_name" width="60"></t:dgCol>

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

@ -16,7 +16,7 @@
<t:dgCol title="操作" field="opt" width="350"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

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

@ -16,7 +16,7 @@
<t:dgCol title="操作" field="opt" width="350"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

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

@ -14,7 +14,7 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

4
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp
View File

@ -144,7 +144,7 @@
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-1 text-center">
<b>客户：</b>
<b>供应商：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}"
@ -197,7 +197,7 @@
<t:dictSelect id="ocusCodeid" field="ocusCode" type="list" extendJson="{class:'form-control',style:'width:230px'}"
dictTable="mv_cus_other" dictField="cus_code" dictText="cus_name" hasLabel="false" title="三方客户编码"></t:dictSelect>
<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>

4
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
View File

@ -119,7 +119,7 @@
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-1 text-center">
<b>客户：</b>
<b>供应商：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}"
@ -172,7 +172,7 @@
<input id="ocusCode" name="ocusCode"
value="${wmOmNoticeHPage.ocusCode}" hasLabel="false" class="form-control"/>
<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 class="col-xs-1 text-center">

6
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
View File

@ -19,12 +19,12 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="货主" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="备注" field="omBeizhu" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="三方客户编码" field="ocusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="三方客户" field="ocusName" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="客户编码" field="ocusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="客户" field="ocusName" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="要求交货时间" field="delvData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="收货人" field="delvMember" query="true" queryMode="single" width="60"></t:dgCol>