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

删除时检查是否存在库存

master
erzhongxmu 2020-07-27 07:09:53 +08:00
parent db515e2f05
commit 6395a5cec6
4 changed files with 128 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/com/zzjee/md/controller/MdBinController.java
View File

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validator; import javax.validation.Validator;
import com.zzjee.wmutil.wmUtil;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jeecgframework.core.beanvalidator.BeanValidators; import org.jeecgframework.core.beanvalidator.BeanValidators;
import org.jeecgframework.core.common.controller.BaseController; import org.jeecgframework.core.common.controller.BaseController;
@ -54,12 +55,12 @@ import com.zzjee.md.service.MdBinServiceI;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 仓位定义 * @Description: 仓位定义
* @author erzhongxmu * @author erzhongxmu
* @date 2017-08-15 23:17:02 * @date 2017-08-15 23:17:02
* @version V1.0 * @version V1.0
* *
*/ */
@Controller @Controller
@ -76,12 +77,12 @@ public class MdBinController extends BaseController {
private SystemService systemService; private SystemService systemService;
@Autowired @Autowired
private Validator validator; private Validator validator;
/** /**
* 仓位定义列表 页面跳转 * 仓位定义列表 页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "list") @RequestMapping(params = "list")
@ -94,7 +95,7 @@ public class MdBinController extends BaseController {
} }
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
@ -114,10 +115,10 @@ public class MdBinController extends BaseController {
this.mdBinService.getDataGridReturn(cq, true); this.mdBinService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
/** /**
* 删除仓位定义 * 删除仓位定义
* *
* @return * @return
*/ */
@RequestMapping(params = "doDel") @RequestMapping(params = "doDel")
@ -130,6 +131,12 @@ public class MdBinController extends BaseController {
try{ try{
// mdBin.setTingYong("Y"); // mdBin.setTingYong("Y");
// mdBinService.saveOrUpdate(mdBin); // mdBinService.saveOrUpdate(mdBin);
if(wmUtil.checkishavestock("bin",mdBin.getKuWeiBianMa())){
message = "仓位存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdBinService.delete(mdBin); mdBinService.delete(mdBin);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
@ -141,9 +148,9 @@ public class MdBinController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
@RequestMapping(params = "getbinall") @RequestMapping(params = "getbinall")
@ResponseBody @ResponseBody
public AjaxJson getNoticeList(HttpServletRequest req) { public AjaxJson getNoticeList(HttpServletRequest req) {
@ -174,11 +181,11 @@ public class MdBinController extends BaseController {
jsonParts.put("binid", resultt.get(i).get("binid")); jsonParts.put("binid", resultt.get(i).get("binid"));
jsonParts.put("des", resultt.get(i).get("des")); jsonParts.put("des", resultt.get(i).get("des"));
jsonParts.put("tincount", resultt.get(i).get("tincount")); jsonParts.put("tincount", resultt.get(i).get("tincount"));
result.add(jsonParts); result.add(jsonParts);
} }
j.setObj(resultt.size()); j.setObj(resultt.size());
Map<String,Object> attrs = new HashMap<String, Object>(); Map<String,Object> attrs = new HashMap<String, Object>();
attrs.put("messageList", result); attrs.put("messageList", result);
// String tip = MutiLangUtil.getMutiLangInstance().getLang("message.tip"); // String tip = MutiLangUtil.getMutiLangInstance().getLang("message.tip");
@ -192,11 +199,11 @@ public class MdBinController extends BaseController {
} }
return j; return j;
} }
/** /**
* 批量删除仓位定义 * 批量删除仓位定义
* *
* @return * @return
*/ */
@RequestMapping(params = "doBatchDel") @RequestMapping(params = "doBatchDel")
@ -207,10 +214,16 @@ public class MdBinController extends BaseController {
message = "仓位停用成功"; message = "仓位停用成功";
try{ try{
for(String id:ids.split(",")){ for(String id:ids.split(",")){
MdBinEntity mdBin = systemService.getEntity(MdBinEntity.class, MdBinEntity mdBin = systemService.getEntity(MdBinEntity.class,
id id
); );
// mdBin.setTingYong("Y"); // mdBin.setTingYong("Y");
if(wmUtil.checkishavestock("bin",mdBin.getKuWeiBianMa())){
message = "仓位存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdBinService.delete(mdBin); mdBinService.delete(mdBin);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
} }
@ -226,7 +239,7 @@ public class MdBinController extends BaseController {
/** /**
* 添加仓位定义 * 添加仓位定义
* *
* @return * @return
*/ */
@RequestMapping(params = "doAdd") @RequestMapping(params = "doAdd")
@ -261,10 +274,10 @@ public class MdBinController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 更新仓位定义 * 更新仓位定义
* *
* @return * @return
*/ */
@RequestMapping(params = "doUpdate") @RequestMapping(params = "doUpdate")
@ -286,11 +299,11 @@ public class MdBinController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 仓位定义新增页面跳转 * 仓位定义新增页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goAdd") @RequestMapping(params = "goAdd")
@ -303,7 +316,7 @@ public class MdBinController extends BaseController {
} }
/** /**
* 仓位定义编辑页面跳转 * 仓位定义编辑页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goUpdate") @RequestMapping(params = "goUpdate")
@ -314,10 +327,10 @@ public class MdBinController extends BaseController {
} }
return new ModelAndView("com/zzjee/md/mdBin-update"); return new ModelAndView("com/zzjee/md/mdBin-update");
} }
/** /**
* 导入功能跳转 * 导入功能跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "upload") @RequestMapping(params = "upload")
@ -325,10 +338,10 @@ public class MdBinController extends BaseController {
req.setAttribute("controller_name","mdBinController"); req.setAttribute("controller_name","mdBinController");
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
*/ */
@ -347,7 +360,7 @@ public class MdBinController extends BaseController {
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -361,13 +374,13 @@ public class MdBinController 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()) {
@ -408,14 +421,14 @@ public class MdBinController extends BaseController {
} }
return j; return j;
} }
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<MdBinEntity> list() { public List<MdBinEntity> list() {
List<MdBinEntity> listMdBins=mdBinService.getList(MdBinEntity.class); List<MdBinEntity> listMdBins=mdBinService.getList(MdBinEntity.class);
return listMdBins; return listMdBins;
} }
@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) {

71
src/main/java/com/zzjee/md/controller/MdCusController.java
View File

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validator; import javax.validation.Validator;
import com.zzjee.wmutil.wmUtil;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jeecgframework.core.beanvalidator.BeanValidators; import org.jeecgframework.core.beanvalidator.BeanValidators;
import org.jeecgframework.core.common.controller.BaseController; import org.jeecgframework.core.common.controller.BaseController;
@ -51,12 +52,12 @@ import org.springframework.web.util.UriComponentsBuilder;
import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MdCusEntity;
import com.zzjee.md.service.MdCusServiceI; import com.zzjee.md.service.MdCusServiceI;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 客户 * @Description: 客户
* @author erzhongxmu * @author erzhongxmu
* @date 2017-08-15 23:17:09 * @date 2017-08-15 23:17:09
* @version V1.0 * @version V1.0
* *
*/ */
@Controller @Controller
@ -73,12 +74,12 @@ public class MdCusController extends BaseController {
private SystemService systemService; private SystemService systemService;
@Autowired @Autowired
private Validator validator; private Validator validator;
/** /**
* 客户列表 页面跳转 * 客户列表 页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "list") @RequestMapping(params = "list")
@ -93,7 +94,7 @@ public class MdCusController extends BaseController {
} }
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
@ -110,17 +111,17 @@ public class MdCusController extends BaseController {
}catch (Exception e) { }catch (Exception e) {
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
Map<String,Object> map1 = new HashMap<String,Object>(); Map<String,Object> map1 = new HashMap<String,Object>();
map1.put("zhuJiMa", "desc"); map1.put("zhuJiMa", "desc");
cq.setOrder(map1); cq.setOrder(map1);
cq.add(); cq.add();
this.mdCusService.getDataGridReturn(cq, true); this.mdCusService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
/** /**
* 删除客户 * 删除客户
* *
* @return * @return
*/ */
@RequestMapping(params = "doDel") @RequestMapping(params = "doDel")
@ -131,6 +132,12 @@ public class MdCusController extends BaseController {
mdCus = systemService.getEntity(MdCusEntity.class, mdCus.getId()); mdCus = systemService.getEntity(MdCusEntity.class, mdCus.getId());
message = "客户删除成功"; message = "客户删除成功";
try{ try{
if(wmUtil.checkishavestock("cus",mdCus.getKeHuBianMa())){
message = "货主存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdCusService.delete(mdCus); mdCusService.delete(mdCus);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}catch(Exception e){ }catch(Exception e){
@ -141,10 +148,10 @@ public class MdCusController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 批量删除客户 * 批量删除客户
* *
* @return * @return
*/ */
@RequestMapping(params = "doBatchDel") @RequestMapping(params = "doBatchDel")
@ -155,9 +162,15 @@ public class MdCusController extends BaseController {
message = "客户删除成功"; message = "客户删除成功";
try{ try{
for(String id:ids.split(",")){ for(String id:ids.split(",")){
MdCusEntity mdCus = systemService.getEntity(MdCusEntity.class, MdCusEntity mdCus = systemService.getEntity(MdCusEntity.class,
id id
); );
if(wmUtil.checkishavestock("cus",mdCus.getKeHuBianMa())){
message = "货主存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdCusService.delete(mdCus); mdCusService.delete(mdCus);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
} }
@ -173,7 +186,7 @@ public class MdCusController extends BaseController {
/** /**
* 添加客户 * 添加客户
* *
* @param ids * @param ids
* @return * @return
*/ */
@ -201,10 +214,10 @@ public class MdCusController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 更新客户 * 更新客户
* *
* @param ids * @param ids
* @return * @return
*/ */
@ -227,11 +240,11 @@ public class MdCusController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 客户新增页面跳转 * 客户新增页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goAdd") @RequestMapping(params = "goAdd")
@ -244,7 +257,7 @@ public class MdCusController extends BaseController {
} }
/** /**
* 客户编辑页面跳转 * 客户编辑页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goUpdate") @RequestMapping(params = "goUpdate")
@ -255,10 +268,10 @@ public class MdCusController extends BaseController {
} }
return new ModelAndView("com/zzjee/md/mdCus-update"); return new ModelAndView("com/zzjee/md/mdCus-update");
} }
/** /**
* 导入功能跳转 * 导入功能跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "upload") @RequestMapping(params = "upload")
@ -266,10 +279,10 @@ public class MdCusController extends BaseController {
req.setAttribute("controller_name","mdCusController"); req.setAttribute("controller_name","mdCusController");
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
*/ */
@ -288,7 +301,7 @@ public class MdCusController extends BaseController {
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -302,13 +315,13 @@ public class MdCusController 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()) {
@ -342,14 +355,14 @@ public class MdCusController extends BaseController {
} }
return j; return j;
} }
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<MdCusEntity> list() { public List<MdCusEntity> list() {
List<MdCusEntity> listMdCuss=mdCusService.getList(MdCusEntity.class); List<MdCusEntity> listMdCuss=mdCusService.getList(MdCusEntity.class);
return listMdCuss; return listMdCuss;
} }
@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) {

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

@ -139,6 +139,12 @@ public class MdGoodsController extends BaseController {
message = "商品删除成功"; message = "商品删除成功";
try { try {
// mdGoods.setZhuangTai("Y"); // mdGoods.setZhuangTai("Y");
if(wmUtil.checkishavestock("goods",mdGoods.getShpBianMa())){
message = "商品存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdGoodsService.delete(mdGoods);; mdGoodsService.delete(mdGoods);;
systemService.addLog(message, Globals.Log_Type_DEL, systemService.addLog(message, Globals.Log_Type_DEL,
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);
@ -176,6 +182,12 @@ public class MdGoodsController extends BaseController {
for (String id : ids.split(",")) { for (String id : ids.split(",")) {
MdGoodsEntity mdGoods = systemService.getEntity( MdGoodsEntity mdGoods = systemService.getEntity(
MdGoodsEntity.class, id); MdGoodsEntity.class, id);
if(wmUtil.checkishavestock("goods",mdGoods.getShpBianMa())){
message = "商品存在库存";
j.setSuccess(false);
j.setMsg(message);
return j;
}
mdGoodsService.delete(mdGoods); mdGoodsService.delete(mdGoods);
systemService.addLog(message, Globals.Log_Type_DEL, systemService.addLog(message, Globals.Log_Type_DEL,
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);

28
src/main/java/com/zzjee/wmutil/wmUtil.java
View File

@ -4,6 +4,7 @@ import com.zzjee.conf.entity.FxjOtherLoginEntity;
import com.zzjee.md.entity.MdBinEntity; import com.zzjee.md.entity.MdBinEntity;
import com.zzjee.md.entity.MdGoodsEntity; import com.zzjee.md.entity.MdGoodsEntity;
import com.zzjee.sys.entity.SysParaEntity; import com.zzjee.sys.entity.SysParaEntity;
import com.zzjee.wm.entity.WvStockEntity;
import org.antlr.stringtemplate.language.Cat; import org.antlr.stringtemplate.language.Cat;
import org.jeecgframework.core.common.exception.BusinessException; import org.jeecgframework.core.common.exception.BusinessException;
import org.jeecgframework.core.util.DateUtils; import org.jeecgframework.core.util.DateUtils;
@ -372,6 +373,33 @@ public class wmUtil {
return flag; return flag;
} }
public static boolean checkishavestock(String checktype,String checkvalue){
boolean ishavestock = false;
String hql = "from WvStockEntity where ";
if("bin".equals(checktype)){
hql = hql + " kuWeiBianMa = ?";
}
if("cus".equals(checktype)){
hql = hql + " cusCode = ?";
}
if("goods".equals(checktype)){
hql = hql + " goodsId = ?";
}
SystemService systemService =ApplicationContextUtil.getContext().getBean(SystemService.class);
List<WvStockEntity> list = systemService.findHql(hql,checkvalue);
if(list!=null&&list.size()>0){
ishavestock = true;
}
return ishavestock;
}
public static String getstock(String goodsid) { public static String getstock(String goodsid) {
String goodsqua = "0"; String goodsqua = "0";
try { try {