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

1,转移状态显示

master
e 2018-09-25 08:01:07 +08:00
parent 88d1fb28fb
commit 71daea20f4
5 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
View File

@ -420,6 +420,7 @@ public class WmToMoveGoodsController extends BaseController {
}
}
wmToMoveGoods.setRunSta("计划中");
wmToMoveGoodsService.save(wmToMoveGoods);
}
j.setMsg("文件导入成功！");

7
src/main/java/com/zzjee/wm/controller/WvStockController.java
View File

@ -125,7 +125,6 @@ public class WvStockController extends BaseController {
* @param request
* @param response
* @param dataGrid
* @param user
*/
@RequestMapping(params = "datagridkczy")
public void datagridkczy(WvStockEntity wvStock, HttpServletRequest request,
@ -407,6 +406,7 @@ public class WvStockController extends BaseController {
wmtomove.setBaseGoodscount(t.getGoodsQua().toString());
wmtomove.setBaseUnit(t.getGoodsUnit());
wmtomove.setMoveSta("计划中");
wmtomove.setRunSta("计划中");
wmtomove.setTinFrom(t.getBinId());
wmtomove.setTinId(t.getBinId());
systemService.save(wmtomove);
@ -452,6 +452,7 @@ public class WvStockController extends BaseController {
wmtomove.setBaseGoodscount(t.getGoodsQua().toString());
wmtomove.setBaseUnit(t.getGoodsUnit());
wmtomove.setMoveSta("计划中");
wmtomove.setRunSta("计划中");
wmtomove.setTinFrom(t.getBinId());
wmtomove.setTinId(t.getBinId());
systemService.save(wmtomove);
@ -501,6 +502,7 @@ public class WvStockController extends BaseController {
wmtomove.setTinId(moveTinid);
}
wmtomove.setTinFrom(t.getBinId());
wmtomove.setRunSta("计划中");
systemService.save(wmtomove);
systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);
@ -546,7 +548,8 @@ public class WvStockController extends BaseController {
wmtomove.setBaseUnit(t.getGoodsUnit());
wmtomove.setMoveSta("计划中");
wmtomove.setTinFrom(t.getBinId());
wmtomove.setRunSta("计划中");
systemService.save(wmtomove);
systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);

10
src/main/java/com/zzjee/wm/entity/WmToMoveGoodsEntity.java
View File

@ -121,6 +121,7 @@ public class WmToMoveGoodsEntity implements java.io.Serializable {
private java.lang.String moveSta;
private java.lang.String runSta;
/**
@ -588,4 +589,13 @@ public class WmToMoveGoodsEntity implements java.io.Serializable {
public void setToGoodsProData(java.lang.String toGoodsProData){
this.toGoodsProData = toGoodsProData;
}
@Column(name ="RUN_STA",nullable=true,length=32)
public String getRunSta() {
return runSta;
}
public void setRunSta(String runSta) {
this.runSta = runSta;
}
}

4
src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
View File

@ -258,15 +258,19 @@ public class SmsSendTask {
for (WmToMoveGoodsEntity wmToMoveGoodsEntity : WmToMoveGoodslist) {
if(!wmUtil.checkstcok(wmToMoveGoodsEntity.getBinFrom(),wmToMoveGoodsEntity.getTinFrom(),wmToMoveGoodsEntity.getGoodsId(),wmToMoveGoodsEntity.getGoodsProData(),wmToMoveGoodsEntity.getGoodsQua())){
wmToMoveGoodsEntity.setMoveSta("库存不足");
wmToMoveGoodsEntity.setRunSta("库存不足");
systemService.saveOrUpdate(wmToMoveGoodsEntity);
continue;
};
MdBinEntity mdbin = systemService.findUniqueByProperty(MdBinEntity.class, "kuWeiBianMa", wmToMoveGoodsEntity.getBinTo());
if(mdbin==null){
wmToMoveGoodsEntity.setMoveSta("储位不存在");
wmToMoveGoodsEntity.setRunSta("储位不存在");
systemService.saveOrUpdate(wmToMoveGoodsEntity);
continue;
}
wmToMoveGoodsEntity.setRunSta("已完成");
WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity();
wmToDownGoods.setCreateBy(wmToMoveGoodsEntity.getCreateBy());
wmToDownGoods.setCreateDate(wmToMoveGoodsEntity.getCreateDate());

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

@ -31,7 +31,9 @@
<t:dgCol title="源储位" field="binFrom" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="到储位" field="binTo" extendParams="editor:'text'" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="状态" field="moveSta" queryMode="group" width="50"></t:dgCol>
<t:dgCol title="转移客户" field="toCusCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="执行状态" field="runSta" query="true" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="转移客户" field="toCusCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="转移客户名称" field="toCusName" query="true" queryMode="single" width="120"></t:dgCol>
<%-- <t:dgCol title="操作" field="opt" width="100"></t:dgCol> --%>
<t:dgDelOpt title="删除" url="wmToMoveGoodsController.do?doDel&id={id}" urlclass="ace_button" exp="moveSta#ne#已完成" urlfont="fa-trash-o"/>