任务接收人设置

src/main/java/com/zzjee/wm/controller/WmOmQmIController.java

@@ -522,7 +522,30 @@ public class WmOmQmIController extends BaseController {
 		j.setMsg(message);
 		return j;
 	}
-	
+	/**
+	 * 更新下架任务
+	 *
+	 * @return
+	 */
+	@RequestMapping(params = "dobatchassgnto")
+	@ResponseBody
+	public AjaxJson dobatchassgnto(String id,String assgnTo, HttpServletRequest request) {
+		String message = null;
+		AjaxJson j = new AjaxJson();
+		message = "下架任务更新成功";
+		WmOmQmIEntity t = wmOmQmIService.get(WmOmQmIEntity.class, id);
+		try {
+				t.setAssignTo(assgnTo);
+				wmOmQmIService.saveOrUpdate(t);
+				systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
+		} catch (Exception e) {
+			e.printStackTrace();
+			message = "下架任务更新失败";
+			throw new BusinessException(e.getMessage());
+		}
+		j.setMsg(message);
+		return j;
+	}
 
 	/**
 	 * 下架任务新增页面跳转

src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java

@@ -346,6 +346,9 @@ public class WvGiNoticeController extends BaseController {
 		D0.setObj(listWvGiNotices);
 		return new ResponseEntity(D0, HttpStatus.OK);
 	}
+
+
+	//下架任务
 	@RequestMapping(value = "/search",method = RequestMethod.GET)
 	@ResponseBody
 	public ResponseEntity<?>  lists( @RequestParam(value="username", required=false) String username, @RequestParam(value="searchstr", required=false)String searchstr, @RequestParam(value="searchstr2", required=false)String searchstr2, @RequestParam(value="searchstr3", required=false)String searchstr3) {
@@ -373,6 +376,7 @@ public class WvGiNoticeController extends BaseController {
 			hql=hql+"  and binId like '%" + searchstr3 + "%'";
 		}
 
+
 		List<WvGiNoticeEntity> listWvGiNotices=wvGiNoticeService.findHql(hql);
 		if(listWvGiNotices==null||listWvGiNotices.size()==0){
 			  hql = " from WvGiNoticeEntity where 1 = 1 ";
@@ -393,6 +397,11 @@ public class WvGiNoticeController extends BaseController {
 		List<WvGiNoticeEntity> result = new ArrayList<WvGiNoticeEntity>();
 		int i = 0;
 		for (WvGiNoticeEntity t :listWvGiNotices){
+			if(StringUtil.isNotEmpty(username)&&StringUtil.isNotEmpty(t.getAssignTo())){
+				if(!username.equals(t.getAssignTo())){
+					continue;
+				}
+			}
 
 			i++;
 			if(i>100){

src/main/java/com/zzjee/wmapi/entity/WvGiNoticeEntity.java

@@ -39,6 +39,9 @@ public class WvGiNoticeEntity implements java.io.Serializable {
 	/**创建人登录名称*/
 	@Excel(name="创建人登录名称")
 	private String createBy;
+	/**更新日期*/
+	@Excel(name="出货日期",format = "yyyy-MM-dd hh:mm:ss")
+	private java.util.Date updateDate;
 	/**主键*/
 	private String id;
 	/**到货通知单*/
@@ -95,7 +98,44 @@ public class WvGiNoticeEntity implements java.io.Serializable {
 	/**omBeiZhu*/
 	@Excel(name="omBeiZhu")
 	private String omBeiZhu;
-	
+	/**任务接收人*/
+	@Excel(name="任务接收人")
+	private java.lang.String assignTo;
+
+	/**
+	 *方法: 取得java.util.Date
+	 *@return: java.util.Date  更新日期
+	 */
+	@Column(name ="UPDATE_DATE",nullable=true)
+	public java.util.Date getUpdateDate(){
+		return this.updateDate;
+	}
+
+	/**
+	 *方法: 设置java.util.Date
+	 *@param: java.util.Date  更新日期
+	 */
+	public void setUpdateDate(java.util.Date updateDate){
+		this.updateDate = updateDate;
+	}
+
+	/**
+	 *方法: 取得java.lang.String
+	 *@return: java.lang.String  任务接收人
+	 */
+	@Column(name ="ASSIGN_TO",nullable=true,length=50)
+	public java.lang.String getAssignTo(){
+		return this.assignTo;
+	}
+
+	/**
+	 *方法: 设置java.lang.String
+	 *@param: java.lang.String  任务接收人
+	 */
+	public void setAssignTo(java.lang.String assignTo){
+		this.assignTo = assignTo;
+	}
+
 	/**
 	 *方法: 取得java.util.Date
 	 *@return: java.util.Date  创建日期

src/main/webapp/webpage/com/zzjee/wm/wmOmQmI-update.jsp

@@ -81,12 +81,11 @@
 			          	<b>任务接收人：</b>
 			          </div>
 			          <div class="col-xs-3">
-							   
+							   								   	<%--<t:dictSelect field="assignTo" type="radio" extendJson="{class:'form-control'}" --%>
-								   	<t:dictSelect field="assignTo" type="radio" extendJson="{class:'form-control'}" 
+								<%--typeGroupCode="assgin" defaultVal="${wmOmQmIPage.assignTo}" hasLabel="false"  title="任务接收人"></t:dictSelect>--%>
-								typeGroupCode="assgin" defaultVal="${wmOmQmIPage.assignTo}" hasLabel="false"  title="任务接收人"></t:dictSelect>     
+						  <t:dictSelect field="assignTo" type="list" extendJson="{class:'form-control'}"
-			
+										 		dictTable="t_s_base_user" dictField="username" dictText="username"  defaultVal='${wmOmQmIPage.assignTo}'  hasLabel="false"  title="任务接收人"></t:dictSelect>
-								   
+										<span class="Validform_checktip" style="float:left;height:0px;"></span>
-						<span class="Validform_checktip" style="float:left;height:0px;"></span>
 						<label class="Validform_label" style="display: none">任务接收人</label>
 			          </div>
 						</div>

src/main/webapp/webpage/com/zzjee/wm/wmOmQmIList.jsp

@@ -29,7 +29,7 @@
     <t:dgCol title="生产日期"  field="proData"      queryMode="group"  width="80"></t:dgCol>
     <t:dgCol title="托盘"  field="tinId"   query="true"   queryMode="single"  width="70"></t:dgCol>
    
-<%--     <t:dgCol title="批次"  field="goodsBatch"    queryMode="group"  width="120"></t:dgCol> --%>
+     <t:dgCol title="任务接收人"  field="assgnTo"    queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="仓位"  field="binId"   query="true"   queryMode="single"  width="90"></t:dgCol>
 <%--     <t:dgCol title="体积"  field="tinTj"    queryMode="group"  width="70"></t:dgCol> --%>
 <%--     <t:dgCol title="重量"  field="tinZhl"    queryMode="group"  width="70"></t:dgCol> --%>
@@ -49,12 +49,17 @@
       <t:dgToolBar title="选择批量更改" icon="icon-edit"  funname="editRow"></t:dgToolBar>
       <t:dgToolBar  title="批量保存" icon="icon-save" url="wmOmQmIController.do?saveRows" funname="saveData"></t:dgToolBar>
       <t:dgToolBar   title="取消批量更改" icon="icon-undo" funname="reject"></t:dgToolBar>
-      <%--    <t:dgToolBar title="批量删除"  icon="icon-remove" url="wmOmQmIController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
+
+    <%--    <t:dgToolBar title="批量删除"  icon="icon-remove" url="wmOmQmIController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
    <t:dgToolBar title="查看" icon="icon-search" url="wmOmQmIController.do?goUpdate" funname="detail"></t:dgToolBar>
 <%--    <t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar> --%>
    <t:dgToolBar title="导出" icon="icon-putout" funname="ExportXls"></t:dgToolBar>
 <%--    <t:dgToolBar title="模板下载" icon="icon-putout" funname="ExportXlsByT"></t:dgToolBar> --%>
   </t:datagrid>
+
+
+
+
   </div>
  </div>
  <script src = "webpage/com/zzjee/wm/wmOmQmIList.js"></script>		
@@ -62,6 +67,8 @@
  $(document).ready(function(){
  });
 
+
+
  function doalltodown(){
 
      var ids = [];

src/main/webapp/webpage/com/zzjee/wm/wmOmQmIassignList.jsp

@@ -46,6 +46,8 @@
    <t:dgDelOpt title="删除" url="wmOmQmIController.do?doDel&id={id}"  exp="binSta#ne#Y" urlclass="ace_button"  urlfont="fa-trash-o"/>
 <%--    <t:dgToolBar title="录入" icon="icon-add" url="wmOmQmIController.do?goAdd" funname="add"></t:dgToolBar> --%>
       <t:dgToolBar title="编辑" icon="icon-edit" url="wmOmQmIController.do?goUpdate" funname="update"></t:dgToolBar>
+      <t:dgToolBar title="批量设置任务接收人"    funname="batchassgnto"></t:dgToolBar>
+
       <t:dgFunOpt title="任务确认" funname="taskassign(id)"  urlclass="ace_button"  exp="binSta#eq#I"  />
       <t:dgToolBar title="批量确认"   url="wmOmQmIController.do?doassignbatch" funname="doassignALLSelect"></t:dgToolBar>
       <t:dgToolBar title="波次生成"   url="wmOmQmIController.do?doassignwave" funname="dowaveALLSelect"></t:dgToolBar>
@@ -61,11 +63,56 @@
    <t:dgToolBar title="导出" icon="icon-putout" funname="ExportXls"></t:dgToolBar>
 <%--    <t:dgToolBar title="模板下载" icon="icon-putout" funname="ExportXlsByT"></t:dgToolBar> --%>
   </t:datagrid>
+
+      <div name="searchColums1" style="float: left; padding-left: 0px;padding-top: 5px;">
+          <span style="vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 90px;text-align:right;" title="任务接收人">任务接收人为: </span>
+
+          <t:autocomplete   entityName="TSBaseUser" searchField="userName" name="assgnuserName"></t:autocomplete>
+
+
+      </div>
+
   </div>
  </div>
  <script src = "webpage/com/zzjee/wm/wmOmQmIList.js"></script>		
  <script type="text/javascript">
 
+
+
+     function batchassgnto() {
+         var batchassgn;
+         batchassgn = $('input[name="assgnuserName"]').attr("value");
+         if(batchassgn==""){
+             alert("任务接收人不能为空");
+         }else{
+             var rows = $('#wmOmQmIList').datagrid('getSelections');
+             if(rows.length > 0){
+                 for(var i=0; i<rows.length; i++){
+
+                     var url = "wmOmQmIController.do?dobatchassgnto&id="+rows[i].id+"&assgnTo="+batchassgn;
+                     $.ajax({
+                         async : false,
+                         cache : false,
+                         type : 'POST',
+                         url : url,// 请求的action路径
+                         error : function() {// 请求失败处理函数
+                         },
+                         success : function(data) {
+                             var d = $.parseJSON(data);
+                             if (d.success) {
+
+                             }
+                         }
+                     });
+
+                 }
+                 tip("批量设置成功");
+                 $('#wmOmQmIList').datagrid('reload',{});
+             }
+
+         }
+     }
+
  function dowaveALLSelect(){
 
 	 var ids = [];