diff --git a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
index 82730d44..071f55cb 100644
--- a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
@@ -420,6 +420,7 @@ public class WmToMoveGoodsController extends BaseController {
}
}
+ wmToMoveGoods.setRunSta("计划中");
wmToMoveGoodsService.save(wmToMoveGoods);
}
j.setMsg("文件导入成功！");
diff --git a/src/main/java/com/zzjee/wm/controller/WvStockController.java b/src/main/java/com/zzjee/wm/controller/WvStockController.java
index 836b0d49..3d2518d0 100644
--- a/src/main/java/com/zzjee/wm/controller/WvStockController.java
+++ b/src/main/java/com/zzjee/wm/controller/WvStockController.java
@@ -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);
diff --git a/src/main/java/com/zzjee/wm/entity/WmToMoveGoodsEntity.java b/src/main/java/com/zzjee/wm/entity/WmToMoveGoodsEntity.java
index d168c29b..fd4d550e 100644
--- a/src/main/java/com/zzjee/wm/entity/WmToMoveGoodsEntity.java
+++ b/src/main/java/com/zzjee/wm/entity/WmToMoveGoodsEntity.java
@@ -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;
+ }
}
diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
index 653a855b..0901b7a1 100644
--- a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
+++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
@@ -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());
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmToMoveGoodsList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmToMoveGoodsList.jsp
index 45c07f53..a2aa0d6e 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmToMoveGoodsList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmToMoveGoodsList.jsp
@@ -31,7 +31,9 @@
-
+
+
+
<%-- --%>