允收期计算控制
parent
63957e627d
commit
2b04b42714
|
@ -454,11 +454,13 @@ public class WmInQmIController extends BaseController {
|
||||||
if (Double.parseDouble(wmInQmI.getQmOkQuat()) <= 0) {
|
if (Double.parseDouble(wmInQmI.getQmOkQuat()) <= 0) {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = "数量不能为0";
|
message = "数量不能为0";
|
||||||
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = "数量 错误";
|
message = "数量 错误";
|
||||||
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
// TODO: handle exception
|
// TODO: handle exception
|
||||||
}
|
}
|
||||||
|
@ -466,6 +468,7 @@ public class WmInQmIController extends BaseController {
|
||||||
if (!wmUtil.checkbin(wmInQmI.getBinId())) {
|
if (!wmUtil.checkbin(wmInQmI.getBinId())) {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = wmInQmI.getBinId() + "储位不存在或已停用";
|
message = wmInQmI.getBinId() + "储位不存在或已停用";
|
||||||
|
j.setMsg(message);
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -481,17 +484,18 @@ public class WmInQmIController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//托盘占用判断
|
//托盘占用判断
|
||||||
|
if(!wmUtil.checkys(wmInQmI.getGoodsId(),wmInQmI.getProData())){
|
||||||
|
j.setSuccess(false);
|
||||||
|
message = "超过允收期";
|
||||||
|
j.setMsg(message);
|
||||||
|
return j;
|
||||||
|
}
|
||||||
String flagchsh = "y";
|
String flagchsh = "y";
|
||||||
try {
|
try {
|
||||||
WmImNoticeIEntity wmImNoticeIEntity = systemService.get(WmImNoticeIEntity.class, wmInQmI.getImNoticeItem());
|
WmImNoticeIEntity wmImNoticeIEntity = systemService.get(WmImNoticeIEntity.class, wmInQmI.getImNoticeItem());
|
||||||
if (wmImNoticeIEntity != null) {
|
if (wmImNoticeIEntity != null) {
|
||||||
|
|
||||||
if(!wmUtil.checkys(wmImNoticeIEntity.getGoodsCode(),wmInQmI.getProData())){
|
|
||||||
j.setSuccess(false);
|
|
||||||
message = "超过允收期";
|
|
||||||
return j;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("n".equals(ResourceUtil.getConfigByName("chaoshou"))) {
|
if ("n".equals(ResourceUtil.getConfigByName("chaoshou"))) {
|
||||||
Long weiq = Long.parseLong(wmImNoticeIEntity
|
Long weiq = Long.parseLong(wmImNoticeIEntity
|
||||||
|
@ -511,6 +515,8 @@ public class WmInQmIController extends BaseController {
|
||||||
if ("n".equals(flagchsh)) {
|
if ("n".equals(flagchsh)) {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = "不允许超收";
|
message = "不允许超收";
|
||||||
|
j.setMsg(message);
|
||||||
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -547,10 +553,14 @@ public class WmInQmIController extends BaseController {
|
||||||
} else {
|
} else {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = "收货通知不存在";
|
message = "收货通知不存在";
|
||||||
|
j.setMsg(message);
|
||||||
|
return j;
|
||||||
}
|
}
|
||||||
if (!flag.equals("X")) {
|
if (!flag.equals("X")) {
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
message = "收货通知下此商品不存在或已经全部收货";
|
message = "收货通知下此商品不存在或已经全部收货";
|
||||||
|
j.setMsg(message);
|
||||||
|
return j;
|
||||||
}
|
}
|
||||||
if (flag.equals("X")) {
|
if (flag.equals("X")) {
|
||||||
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
|
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
|
||||||
|
@ -606,6 +616,15 @@ public class WmInQmIController extends BaseController {
|
||||||
wminqm.setImNoticeItem(jeecgDemo.getId());
|
wminqm.setImNoticeItem(jeecgDemo.getId());
|
||||||
wminqm.setGoodsId(jeecgDemo.getGoodsCode());
|
wminqm.setGoodsId(jeecgDemo.getGoodsCode());
|
||||||
wminqm.setProData(DateUtils.date2Str(jeecgDemo.getGoodsPrdData(), DateUtils.date_sdf));
|
wminqm.setProData(DateUtils.date2Str(jeecgDemo.getGoodsPrdData(), DateUtils.date_sdf));
|
||||||
|
|
||||||
|
|
||||||
|
if(!wmUtil.checkys(wminqm.getGoodsId(),wminqm.getProData())){
|
||||||
|
j.setSuccess(false);
|
||||||
|
message = "超过允收期";
|
||||||
|
j.setMsg(message);
|
||||||
|
return j;
|
||||||
|
}
|
||||||
|
|
||||||
wminqm.setImNoticeId(jeecgDemo.getImNoticeId());
|
wminqm.setImNoticeId(jeecgDemo.getImNoticeId());
|
||||||
wminqm.setGoodsName(jeecgDemo.getGoodsName());
|
wminqm.setGoodsName(jeecgDemo.getGoodsName());
|
||||||
wminqm.setBinId(jeecgDemo.getBinPlan());
|
wminqm.setBinId(jeecgDemo.getBinPlan());
|
||||||
|
|
|
@ -73,7 +73,7 @@ window.onload = function() {
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmInQmIController.do?doAdd" tiptype="1" >
|
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmInQmIController.do?doAdd" tiptype="2" >
|
||||||
<%--<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="div" >--%>
|
<%--<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="div" >--%>
|
||||||
<input type="hidden" id="btn_sub" class="btn_sub"/>
|
<input type="hidden" id="btn_sub" class="btn_sub"/>
|
||||||
<input type="hidden" id="id" name="id"/>
|
<input type="hidden" id="id" name="id"/>
|
||||||
|
|
Loading…
Reference in New Issue