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

出库通知修改

master
e 2018-09-19 21:30:35 +08:00
parent 12411953d2
commit 2df62b503b
5 changed files with 266 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,6 +301,40 @@ public class WmToDownGoodsController extends BaseController {
}
/**
* gengxin
* @param page
* @return
*/
@RequestMapping(params = "updateRows")
@ResponseBody
public AjaxJson updateRows(Delrowpage page){
String message = null;
List<WmToDownGoodsEntity> demos=page.getDownrows();
AjaxJson j = new AjaxJson();
if(CollectionUtils.isNotEmpty(demos)){
for(WmToDownGoodsEntity jeecgDemo:demos){
if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
WmToDownGoodsEntity t =systemService.get(WmToDownGoodsEntity.class, jeecgDemo.getId());
try {
MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
systemService.saveOrUpdate(t);
// systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
return j;
}
/**
* 装车复核
* @param page

37
src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java
View File

@ -3,7 +3,10 @@ import com.alibaba.fastjson.JSON;
import com.zzjee.api.ResultDO;
import com.zzjee.md.entity.MvGoodsEntity;
import com.zzjee.wm.entity.WmInQmIEntity;
import com.zzjee.wm.entity.WmToDownGoodsEntity;
import com.zzjee.wm.entity.WmToUpGoodsEntity;
import com.zzjee.wm.page.Delrowpage;
import com.zzjee.wm.page.wmtoupgoodspage;
import com.zzjee.wm.service.WmToUpGoodsServiceI;
import java.util.ArrayList;
@ -14,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zzjee.wmapi.entity.WvNoticeEntity;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.CopyUtils;
import org.apache.log4j.Logger;
import org.jeecgframework.core.util.*;
@ -272,7 +276,38 @@ public class WmToUpGoodsController extends BaseController {
j.setMsg(message);
return j;
}
/**
* gengxin
* @param page
* @return
*/
@RequestMapping(params = "updateRows")
@ResponseBody
public AjaxJson updateRows(wmtoupgoodspage page){
String message = null;
List<WmToUpGoodsEntity> demos=page.getUprows();
AjaxJson j = new AjaxJson();
if(CollectionUtils.isNotEmpty(demos)){
for(WmToUpGoodsEntity jeecgDemo:demos){
if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
WmToUpGoodsEntity t =systemService.get(WmToUpGoodsEntity.class, jeecgDemo.getId());
try {
MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
systemService.saveOrUpdate(t);
// systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
return j;
}
/**
* 上架列表新增页面跳转

21
src/main/java/com/zzjee/wm/page/wmtoupgoodspage.java Normal file
View File

@ -0,0 +1,21 @@
package com.zzjee.wm.page;
import com.zzjee.wm.entity.WmToDownGoodsEntity;
import com.zzjee.wm.entity.WmToUpGoodsEntity;
import java.util.List;
/**
*/
public class wmtoupgoodspage {
private List<WmToUpGoodsEntity> uprows;
public List<WmToUpGoodsEntity> getUprows() {
return uprows;
}
public void setUprows(List<WmToUpGoodsEntity> uprows) {
this.uprows = uprows;
}
}

105
src/main/webapp/webpage/com/zzjee/wm/wmToDownGoodsList.jsp
View File

@ -5,43 +5,48 @@
<div region="center" style="padding:0px;border:0px">
<t:datagrid name="wmToDownGoodsList" checkbox="true" pagination="true" fitColumns="false" title="下架商品明细" actionUrl="wmToDownGoodsController.do?datagrid" idField="id" fit="true" queryMode="group">
<t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" hidden="true" queryMode="single" width="80"></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="createDate" hidden="true" formatter="yyyy-MM-dd" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="更新人名称" field="updateName" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新人登录名称" field="updateBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新日期" field="updateDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="原始单据编码" field="orderId" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="原始单据编码" field="orderId" query="true" queryMode="single" width="110"></t:dgCol>
<t:dgCol title="商品编码" field="goodsId" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="商品名称" field="goodsName" query="true" queryMode="single" width="200"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="备注" field="omBeizhu" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="数量" field="goodsQua" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="复核数量" field="goodsQuaok" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="数量" field="goodsQua" extendParams="editor:'text'" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="复核数量" field="goodsQuaok" extendParams="editor:'text'" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="基本单位" field="baseGoodscount" extendParams="editor:'text'" queryMode="single" width="80"></t:dgCol>
<%-- <t:dgCol title="原始单据行项目" field="orderIdI" hidden="true" queryMode="single" width="120"></t:dgCol> --%>
<%-- <t:dgCol title="原始单据类型" field="orderType" queryMode="single" width="120"></t:dgCol> --%>
<t:dgCol title="单位" field="goodsUnit" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="源托盘码" field="binIdFrom" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="库位编码" field="kuWeiBianMa" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="单位" field="goodsUnit" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="生产日期" field="goodsProData" extendParams="editor:'text'" formatter="yyyy-MM-dd" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" hidden="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="源托盘码" field="binIdFrom" extendParams="editor:'text'" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="库位编码" field="kuWeiBianMa" extendParams="editor:'text'" query="true" queryMode="single" width="80"></t:dgCol>
<%-- <t:dgCol title="作业类型" field="actTypeCode" query="true" queryMode="single" width="120"></t:dgCol> --%>
<t:dgCol title="货主" field="cusCode" dictionary="mv_cus,cus_code,cus_name" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="目标托盘" field="binIdTo" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="货主" field="cusCode" dictionary="mv_cus,cus_code,cus_name" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="目标托盘" field="binIdTo" hidden="true" query="true" queryMode="single" width="80"></t:dgCol>
<%-- <t:dgCol title="状态" field="downSta" queryMode="single" width="120"></t:dgCol> --%>
<%-- <t:dgCol title="操作" field="opt" width="100"></t:dgCol> --%>
<%-- <t:dgDelOpt title="删除" url="wmToDownGoodsController.do?doDel&id={id}" urlclass="ace_button" urlfont="fa-trash-o"/> --%>
<t:dgToolBar title="下架" icon="icon-add" url="wmToDownGoodsController.do?goAdd" funname="add"></t:dgToolBar>
<%--<t:dgToolBar title="手工添加下架" icon="icon-add" url="wmToDownGoodsController.do?goAdd" funname="add"></t:dgToolBar>--%>
<t:dgToolBar title="编辑" icon="icon-edit" url="wmToDownGoodsController.do?goUpdate" funname="update"></t:dgToolBar>
<%-- <t:dgToolBar title="批量删除" icon="icon-remove" url="wmToDownGoodsController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
<t:dgToolBar title="查看" icon="icon-search" url="wmToDownGoodsController.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:dgToolBar operationCode="edit" title="选择修改" icon="icon-edit" funname="editRow"></t:dgToolBar>
<t:dgToolBar operationCode="save" title="修改保存" icon="icon-save" url="wmToDownGoodsController.do?updateRows" funname="saveData"></t:dgToolBar>
<t:dgToolBar operationCode="undo" title="取消修改" icon="icon-undo" funname="reject"></t:dgToolBar>
<%-- <t:dgToolBar title="模板下载" icon="icon-putout" funname="ExportXlsByT"></t:dgToolBar> --%>
</t:datagrid>
</div>
</div>
@ -49,8 +54,76 @@
<script type="text/javascript">
$(document).ready(function(){
});
//添加行
function addRow(title,addurl,gname){
$('#'+gname).datagrid('appendRow',{});
var editIndex = $('#'+gname).datagrid('getRows').length-1;
$('#'+gname).datagrid('selectRow', editIndex)
.datagrid('beginEdit', editIndex);
}
//保存数据
function saveData(title,addurl,gname){
if(!endEdit(gname))
return false;
var rows=$('#'+gname).datagrid("getChanges","inserted");
var uprows=$('#'+gname).datagrid("getChanges","updated");
rows=rows.concat(uprows);
if(rows.length<=0){
tip("没有需要保存的数据！")
return false;
}
var result={};
for(var i=0;i<rows.length;i++){
for(var d in rows[i]){
result["downrows["+i+"]."+d]=rows[i][d];
}
}
$.ajax({
url:"<%=basePath%>/"+addurl,
type:"post",
data:result,
dataType:"json",
success:function(data){
tip(data.msg);
if(data.success){
reloadTable();
}
}
})
}
//结束编辑
function endEdit(gname){
var editIndex = $('#'+gname).datagrid('getRows').length-1;
for(var i=0;i<=editIndex;i++){
if($('#'+gname).datagrid('validateRow', i))
$('#'+gname).datagrid('endEdit', i);
else
return false;
}
return true;
}
//编辑行
function editRow(title,addurl,gname){
var rows=$('#'+gname).datagrid("getChecked");
if(rows.length==0){
tip("请选择条目");
return false;
}
for(var i=0;i<rows.length;i++){
var index= $('#'+gname).datagrid('getRowIndex', rows[i]);
$('#'+gname).datagrid('beginEdit', index);
}
}
//取消编辑
function reject(title,addurl,gname){
$('#'+gname).datagrid('clearChecked');
$('#'+gname).datagrid('rejectChanges');
}
//导入
function ImportXls() {

99
src/main/webapp/webpage/com/zzjee/wm/wmToUpGoodsList.jsp
View File

@ -6,29 +6,29 @@
<t:datagrid name="wmToUpGoodsList" checkbox="true" pagination="true" fitColumns="false" title="上架列表" actionUrl="wmToUpGoodsController.do?datagrid" idField="id" fit="true" queryMode="group">
<t:dgCol title="主键" field="id" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createDate" formatter="yyyy-MM-dd" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createDate" formatter="yyyy-MM-dd" query="true" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="更新人名称" field="updateName" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="更新人登录名称" field="updateBy" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新日期" field="updateDate" formatter="yyyy-MM-dd" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新人登录名称" field="updateBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新日期" field="updateDate" hidden="true" formatter="yyyy-MM-dd" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="商品编码" field="goodsId" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="商品名称" field="goodsName" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="数量" field="goodsQua" queryMode="group" width="60"></t:dgCol>
<t:dgCol title="商品名称" field="goodsName" query="true" queryMode="single" width="250"></t:dgCol>
<t:dgCol title="数量" field="goodsQua" extendParams="editor:'text'" queryMode="group" width="60"></t:dgCol>
<t:dgCol title="原始单据类型" field="orderTypeCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="原始单据编码" field="orderId" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="原始单据编码" field="orderId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="原始单据行项目" field="orderIdI" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="上架ID" field="wmToUpId" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="单位" field="goodsUnit" queryMode="group" width="60"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="生产日期" field="goodsProData" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="生产日期" field="goodsProData" extendParams="editor:'text'" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="作业类型" field="actTypeCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="库位编码" field="kuWeiBianMa" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="托盘码" field="binId" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="库位编码" field="kuWeiBianMa" extendParams="editor:'text'" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="托盘码" field="binId" extendParams="editor:'text'" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="货主" field="cusCode" query="true" dictionary="mv_cus,cus_code,cus_name" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="基本单位" field="baseUnit" queryMode="group" width="60"></t:dgCol>
<t:dgCol title="基本单位数量" field="baseGoodscount" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="基本单位数量" field="baseGoodscount" extendParams="editor:'text'" queryMode="group" width="80"></t:dgCol>
<%-- <t:dgCol title="操作" field="opt" width="100"></t:dgCol> --%>
<%-- <t:dgDelOpt title="删除" url="wmToUpGoodsController.do?doDel&id={id}" urlclass="ace_button" urlfont="fa-trash-o"/> --%>
<t:dgToolBar title="录入" icon="icon-add" url="wmToUpGoodsController.do?goAdd" funname="add"></t:dgToolBar>
@ -38,6 +38,11 @@
<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:dgToolBar operationCode="edit" title="选择修改" icon="icon-edit" funname="editRow"></t:dgToolBar>
<t:dgToolBar operationCode="save" title="修改保存" icon="icon-save" url="wmToUpGoodsController.do?updateRows" funname="saveData"></t:dgToolBar>
<t:dgToolBar operationCode="undo" title="取消修改" icon="icon-undo" funname="reject"></t:dgToolBar>
</t:datagrid>
</div>
</div>
@ -45,8 +50,76 @@
<script type="text/javascript">
$(document).ready(function(){
});
//添加行
function addRow(title,addurl,gname){
$('#'+gname).datagrid('appendRow',{});
var editIndex = $('#'+gname).datagrid('getRows').length-1;
$('#'+gname).datagrid('selectRow', editIndex)
.datagrid('beginEdit', editIndex);
}
//保存数据
function saveData(title,addurl,gname){
if(!endEdit(gname))
return false;
var rows=$('#'+gname).datagrid("getChanges","inserted");
var uprows=$('#'+gname).datagrid("getChanges","updated");
rows=rows.concat(uprows);
if(rows.length<=0){
tip("没有需要保存的数据！")
return false;
}
var result={};
for(var i=0;i<rows.length;i++){
for(var d in rows[i]){
result["uprows["+i+"]."+d]=rows[i][d];
}
}
$.ajax({
url:"<%=basePath%>/"+addurl,
type:"post",
data:result,
dataType:"json",
success:function(data){
tip(data.msg);
if(data.success){
reloadTable();
}
}
})
}
//结束编辑
function endEdit(gname){
var editIndex = $('#'+gname).datagrid('getRows').length-1;
for(var i=0;i<=editIndex;i++){
if($('#'+gname).datagrid('validateRow', i))
$('#'+gname).datagrid('endEdit', i);
else
return false;
}
return true;
}
//编辑行
function editRow(title,addurl,gname){
var rows=$('#'+gname).datagrid("getChecked");
if(rows.length==0){
tip("请选择条目");
return false;
}
for(var i=0;i<rows.length;i++){
var index= $('#'+gname).datagrid('getRowIndex', rows[i]);
$('#'+gname).datagrid('beginEdit', index);
}
}
//取消编辑
function reject(title,addurl,gname){
$('#'+gname).datagrid('clearChecked');
$('#'+gname).datagrid('rejectChanges');
}
//导入
function ImportXls() {