格式化
erzhongxmu
parent
b326ad568f
commit
d5619c9523
|
|
@ -1,6 +1,8 @@
|
|||
package com.zzjee.wm.controller;
|
||||
|
||||
import com.zzjee.wm.entity.WmPrintModelEntity;
|
||||
import com.zzjee.wm.service.WmPrintModelServiceI;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
|
@ -29,6 +31,7 @@ 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;
|
||||
|
|
@ -39,12 +42,16 @@ 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;
|
||||
|
|
@ -58,20 +65,21 @@ 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;
|
||||
|
||||
/**
|
||||
* @author onlineGenerator
|
||||
* @version V1.0
|
||||
* @Title: Controller
|
||||
* @Description: 打印模板
|
||||
* @author onlineGenerator
|
||||
* @date 2021-08-02 14:51:38
|
||||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/wmPrintModelController")
|
||||
|
|
@ -89,7 +97,6 @@ public class WmPrintModelController extends BaseController {
|
|||
private Validator validator;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 打印模板列表 页面跳转
|
||||
*
|
||||
|
|
@ -241,6 +248,7 @@ public class WmPrintModelController extends BaseController {
|
|||
}
|
||||
return new ModelAndView("com/zzjee/wm/wmPrintModel-add");
|
||||
}
|
||||
|
||||
/**
|
||||
* 打印模板编辑页面跳转
|
||||
*
|
||||
|
|
@ -285,6 +293,7 @@ public class WmPrintModelController extends BaseController {
|
|||
modelMap.put(NormalExcelConstants.DATA_LIST, wmPrintModels);
|
||||
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel 使模板
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
package com.zzjee.wm.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -57,12 +58,11 @@ import com.zzjee.wm.service.WmSttInGoodsServiceI;
|
|||
import com.zzjee.wmutil.wmUtil;
|
||||
|
||||
/**
|
||||
* @author erzhongxmu
|
||||
* @version V1.0
|
||||
* @Title: Controller
|
||||
* @Description: 库存盘点
|
||||
* @author erzhongxmu
|
||||
* @date 2017-09-08 21:03:33
|
||||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/wmSttInGoodsController")
|
||||
|
|
@ -80,7 +80,6 @@ public class WmSttInGoodsController extends BaseController {
|
|||
private Validator validator;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 库存盘点列表 页面跳转
|
||||
*
|
||||
|
|
@ -90,14 +89,17 @@ public class WmSttInGoodsController extends BaseController {
|
|||
public ModelAndView list(HttpServletRequest request) {
|
||||
return new ModelAndView("com/zzjee/wm/wmSttInGoodsList");
|
||||
}
|
||||
|
||||
@RequestMapping(params = "listfp")
|
||||
public ModelAndView listfp(HttpServletRequest request) {
|
||||
return new ModelAndView("com/zzjee/wm/wmSttInGoodsfpList");
|
||||
}
|
||||
|
||||
@RequestMapping(params = "listcygz")
|
||||
public ModelAndView listcygz(HttpServletRequest request) {
|
||||
return new ModelAndView("com/zzjee/wm/wmSttInGoodscygzList");
|
||||
}
|
||||
|
||||
/**
|
||||
* easyui AJAX请求数据
|
||||
*
|
||||
|
|
@ -172,8 +174,6 @@ public class WmSttInGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@RequestMapping(params = "datagridfp")
|
||||
public void datagridfp(WmSttInGoodsEntity wmSttInGoods, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
|
||||
CriteriaQuery cq = new CriteriaQuery(WmSttInGoodsEntity.class, dataGrid);
|
||||
|
|
@ -229,7 +229,6 @@ public class WmSttInGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
@RequestMapping(params = "dorun")
|
||||
@ResponseBody
|
||||
public AjaxJson dorun(WmSttInGoodsEntity wmSttInGoods, HttpServletRequest request) {
|
||||
|
|
@ -273,7 +272,8 @@ public class WmSttInGoodsController extends BaseController {
|
|||
j.setMsg(message);
|
||||
return j;
|
||||
|
||||
};
|
||||
}
|
||||
;
|
||||
systemService.save(wmToDownGoods);
|
||||
wmSttInGoods.setSttSta("已过帐");
|
||||
wmSttInGoodsService.saveOrUpdate(wmSttInGoods);
|
||||
|
|
@ -434,6 +434,7 @@ public class WmSttInGoodsController extends BaseController {
|
|||
}
|
||||
return new ModelAndView("com/zzjee/wm/wmSttInGoods-add");
|
||||
}
|
||||
|
||||
/**
|
||||
* 库存盘点编辑页面跳转
|
||||
*
|
||||
|
|
@ -478,6 +479,7 @@ public class WmSttInGoodsController extends BaseController {
|
|||
modelMap.put(NormalExcelConstants.DATA_LIST, wmSttInGoodss);
|
||||
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel 使模板
|
||||
*
|
||||
|
|
@ -528,6 +530,7 @@ public class WmSttInGoodsController extends BaseController {
|
|||
}
|
||||
return j;
|
||||
}
|
||||
|
||||
//PDA接口
|
||||
@RequestMapping(method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
|
|
|
|||
|
|
@ -65,12 +65,11 @@ import static com.xiaoleilu.hutool.date.DateTime.now;
|
|||
import static org.jeecgframework.web.system.sms.util.Constants.wm_sta6;
|
||||
|
||||
/**
|
||||
* @author erzhongxmu
|
||||
* @version V1.0
|
||||
* @Title: Controller
|
||||
* @Description: 下架商品明细
|
||||
* @author erzhongxmu
|
||||
* @date 2017-08-25 10:40:39
|
||||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/wmToDownGoodsController")
|
||||
|
|
@ -211,6 +210,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
dataGrid.setResults(resultnew);
|
||||
TagUtil.datagrid(response, dataGrid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除下架商品明细
|
||||
*
|
||||
|
|
@ -265,6 +265,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
j.setMsg(message);
|
||||
return j;
|
||||
}
|
||||
|
||||
/**
|
||||
* 行编辑列表
|
||||
*/
|
||||
|
|
@ -273,6 +274,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
public ModelAndView delListDemo(HttpServletRequest request) {
|
||||
return new ModelAndView("com/zzjee/wm/omconf");
|
||||
}
|
||||
|
||||
@RequestMapping(params = "wavedelList")
|
||||
public ModelAndView wavedelListDemo(HttpServletRequest request) {
|
||||
return new ModelAndView("com/zzjee/wm/wavedel_rowedtior");
|
||||
|
|
@ -315,9 +317,9 @@ public class WmToDownGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* gengxin
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -352,6 +354,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
|
||||
/**
|
||||
* 装车复核
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -541,7 +544,8 @@ public class WmToDownGoodsController extends BaseController {
|
|||
j.setMsg(message);
|
||||
return j;
|
||||
|
||||
};
|
||||
}
|
||||
;
|
||||
wmToDownGoodsService.save(wmToDownGoods);
|
||||
systemService.addLog(message, Globals.Log_Type_INSERT,
|
||||
Globals.Log_Leavel_INFO);
|
||||
|
|
@ -725,6 +729,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
}
|
||||
return new ResponseEntity(task, HttpStatus.OK);
|
||||
}
|
||||
|
||||
//下架
|
||||
@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ResponseBody
|
||||
|
|
@ -753,7 +758,6 @@ public class WmToDownGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
// 保存
|
||||
try {
|
||||
//查询create_name
|
||||
|
|
@ -849,6 +853,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
// 按Restful约定，返回204状态码, 无内容. 也可以返回200状态码.
|
||||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
}
|
||||
|
||||
void updateUser(String orderId, String type, String userName) {
|
||||
try {
|
||||
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", orderId);
|
||||
|
|
@ -865,6 +870,7 @@ public class WmToDownGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
|
||||
@ResponseStatus(HttpStatus.NO_CONTENT)
|
||||
public void delete(@PathVariable("id") String id) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
package com.zzjee.wm.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -59,12 +60,11 @@ import com.zzjee.wmutil.wmUtil;
|
|||
import static com.xiaoleilu.hutool.date.DateTime.now;
|
||||
|
||||
/**
|
||||
* @author erzhongxmu
|
||||
* @version V1.0
|
||||
* @Title: Controller
|
||||
* @Description: 库存转移
|
||||
* @author erzhongxmu
|
||||
* @date 2017-09-08 21:03:22
|
||||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/wmToMoveGoodsController")
|
||||
|
|
@ -82,7 +82,6 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
private Validator validator;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 库存转移列表 页面跳转
|
||||
*
|
||||
|
|
@ -212,8 +211,6 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@RequestMapping(params = "doGetstock", method = {RequestMethod.GET,
|
||||
RequestMethod.POST})
|
||||
@ResponseBody
|
||||
|
|
@ -222,7 +219,6 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
WmToMoveGoodsEntity wmToMoveGoods = new WmToMoveGoodsEntity();
|
||||
|
||||
|
||||
|
||||
j.setObj(wmToMoveGoods);
|
||||
return j;
|
||||
}
|
||||
|
|
@ -284,9 +280,7 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param page
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -326,8 +320,6 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 库存转移新增页面跳转
|
||||
*
|
||||
|
|
@ -341,6 +333,7 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
}
|
||||
return new ModelAndView("com/zzjee/wm/wmToMoveGoods-add");
|
||||
}
|
||||
|
||||
/**
|
||||
* 库存转移编辑页面跳转
|
||||
*
|
||||
|
|
@ -385,6 +378,7 @@ public class WmToMoveGoodsController extends BaseController {
|
|||
modelMap.put(NormalExcelConstants.DATA_LIST, wmToMoveGoodss);
|
||||
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel 使模板
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue