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

操作人

master
cez 2021-12-13 00:12:48 +08:00
parent a01dabab1c
commit 8c711d4a48
4 changed files with 118 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
View File

@ -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) {

59
src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
View File

@ -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) {

24
src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java
View File

@ -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;
}
}

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

@ -9,7 +9,9 @@
<t:dgCol title="打印状态" field="printStatus" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="操作" field="opt" width="220"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="制单人" field="createName" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="拣货人" field="jhUser" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="复核人" field="fhUser" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createDate" formatter="yyyy-MM-dd" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="更新人名称" field="updateName" hidden="true" queryMode="single" width="120"></t:dgCol>