diff --git a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
index ede52c86..4f3d8acc 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
@@ -414,6 +414,13 @@ public class WmOmQmIController extends BaseController {
systemService.save(wmToDownGoods);
wmOmQmI.setBinSta("H");
systemService.saveOrUpdate(wmOmQmI);
+ try{
+ String orderId = wmOmQmI.getOmNoticeId();
+ String type = "jh";
+ String username = ResourceUtil.getSessionUserName().getRealName();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
systemService.addLog(message, Globals.Log_Type_DEL,
Globals.Log_Leavel_INFO);
} else {
@@ -433,6 +440,8 @@ public class WmOmQmIController extends BaseController {
}
+
+
@RequestMapping(params = "dotodown")
@ResponseBody
public AjaxJson dotodown(HttpServletRequest request) {
@@ -464,6 +473,13 @@ public class WmOmQmIController extends BaseController {
systemService.save(wmToDownGoods);
wmOmQmI.setBinSta("Y");
systemService.saveOrUpdate(wmOmQmI);
+ try{
+ String orderId = wmOmQmI.getOmNoticeId();
+ String type = "jh";
+ String username = ResourceUtil.getSessionUserName().getRealName();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
systemService.addLog(message, Globals.Log_Type_DEL,
Globals.Log_Leavel_INFO);
} else {
@@ -799,6 +815,23 @@ public class WmOmQmIController extends BaseController {
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
+
+ void updateUser(String orderId,String type,String userName){
+ try{
+ WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class,"omNoticeId",orderId);
+ if ("jh".equals(type)){
+ wmOmNoticeHEntity.setJhUser(userName);
+ }
+ if ("fh".equals(type)){
+ wmOmNoticeHEntity.setFhUser(userName);
+ }
+ systemService.updateEntitie(wmOmNoticeHEntity);
+ }catch (Exception e){
+
+ }
+
+ }
+
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ResponseStatus(HttpStatus.NO_CONTENT)
public void delete(@PathVariable("id") String id) {
diff --git a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
index 8d014bf2..036d387d 100644
--- a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
@@ -294,6 +294,13 @@ public class WmToDownGoodsController extends BaseController {
try {
t.setDownSta(Constants.wm_sta5);//直接修改状态
wmToDownGoodsService.saveOrUpdate(t);
+ try{
+ String orderId = t.getOrderId();
+ String type = "fh";
+ String username = ResourceUtil.getSessionUserName().getRealName();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);
} catch (Exception e) {
@@ -325,6 +332,13 @@ public class WmToDownGoodsController extends BaseController {
try {
MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
systemService.saveOrUpdate(t);
+ try{
+ String orderId = t.getOrderId();
+ String type = "fh";
+ String username = ResourceUtil.getSessionUserName().getRealName();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -354,6 +368,15 @@ public class WmToDownGoodsController extends BaseController {
MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
t.setDownSta(Constants.wm_sta5);
systemService.saveOrUpdate(t);
+
+ try{
+ String orderId = t.getOrderId();
+ String type = "fh";
+ String username = ResourceUtil.getSessionUserName().getRealName();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
+
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) {
e.printStackTrace();
@@ -759,6 +782,16 @@ public class WmToDownGoodsController extends BaseController {
}
+
+ try{
+ String orderId = wmOmQmIEntity.getOmNoticeId();
+ String type = "jh";
+ String username = wmToDownGoods.getCreateBy();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
+
+
wmToDownGoodsService.save(wmToDownGoods);
D0.setOK(true);
}else{
@@ -791,7 +824,19 @@ public class WmToDownGoodsController extends BaseController {
MyBeanUtils.copyBeanNotNull2Bean(wmToDownGoods, t);
t.setDownSta(Constants.wm_sta5);
t.setUpdateDate(now());
+
+
+
wmToDownGoodsService.saveOrUpdate(t);
+
+ try{
+ String orderId = t.getOrderId();
+ String type = "fh";
+ String username = wmToDownGoods.getUpdateBy();
+ updateUser(orderId,type,username);
+ }catch (Exception e){
+ }
+
D0.setOK(true);
} catch (Exception e) {
e.printStackTrace();
@@ -801,7 +846,21 @@ 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);
+ if ("jh".equals(type)){
+ wmOmNoticeHEntity.setJhUser(userName);
+ }
+ if ("fh".equals(type)){
+ wmOmNoticeHEntity.setFhUser(userName);
+ }
+ systemService.updateEntitie(wmOmNoticeHEntity);
+ }catch (Exception e){
+ }
+
+ }
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ResponseStatus(HttpStatus.NO_CONTENT)
public void delete(@PathVariable("id") String id) {
diff --git a/src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java b/src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java
index ad710bf8..44af46d9 100644
--- a/src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java
+++ b/src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java
@@ -115,7 +115,10 @@ public class WmOmNoticeHEntity implements java.io.Serializable {
private String delvMethod;
private String storeCode;
-
+ @Excel(name = "拣货人")
+ private String jhUser;
+ @Excel(name = "复核人")
+ private String fhUser;
@Column(name ="store_code",nullable=true,length=50)
public String getStoreCode() {
@@ -620,4 +623,23 @@ public class WmOmNoticeHEntity implements java.io.Serializable {
public void setPiMaster(String piMaster) {
this.piMaster = piMaster;
}
+
+
+ @Column(name ="jh_user",nullable=true,length=32)
+ public String getJhUser() {
+ return jhUser;
+ }
+
+ public void setJhUser(String jhUser) {
+ this.jhUser = jhUser;
+ }
+
+ @Column(name ="fh_user",nullable=true,length=32)
+ public String getFhUser() {
+ return fhUser;
+ }
+
+ public void setFhUser(String fhUser) {
+ this.fhUser = fhUser;
+ }
}
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
index 1054a733..60ebf8f6 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
@@ -9,7 +9,9 @@
-
+
+
+