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

三方客户

master
e 2018-09-16 21:44:23 +08:00
parent 9046136153
commit 2e4af5e2f1
9 changed files with 65 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java
View File

@ -174,7 +174,8 @@ public class WmToMoveGoodsController extends BaseController {
WmToMoveGoodsEntity wmToMoveGoods = systemService.getEntity(WmToMoveGoodsEntity.class,
id
);
wmToMoveGoodsService.delete(wmToMoveGoods);
wmToMoveGoods.setMoveSta("已删除");
wmToMoveGoodsService.updateEntitie(wmToMoveGoods);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}
}catch(Exception e){

10
src/main/java/com/zzjee/wm/controller/WvStockController.java
View File

@ -274,7 +274,6 @@ public class WvStockController extends BaseController {
/**
* 添加生成盘点单
*
* @param ids
* @return
*/
@RequestMapping(params = "doAdd")
@ -473,6 +472,7 @@ public class WvStockController extends BaseController {
public AjaxJson doBatchStttpzy(String ids, HttpServletRequest request) {
String message = null;
AjaxJson j = new AjaxJson();
String moveTinid = request.getParameter("moveTinid");
message = "生成托盘转移单成功";
try {
for (String id : ids.split(",")) {
@ -494,7 +494,12 @@ public class WvStockController extends BaseController {
wmtomove.setGoodsUnit(t.getGoodsUnit());
wmtomove.setBaseGoodscount(t.getGoodsQua().toString());
wmtomove.setBaseUnit(t.getGoodsUnit());
wmtomove.setMoveSta("计划中");
if(StringUtil.isEmpty(moveTinid)){
wmtomove.setMoveSta("计划中");
}else{
wmtomove.setMoveSta("已完成");
wmtomove.setTinId(moveTinid);
}
wmtomove.setTinFrom(t.getBinId());
systemService.save(wmtomove);
systemService.addLog(message, Globals.Log_Type_UPDATE,
@ -562,7 +567,6 @@ public class WvStockController extends BaseController {
/**
* 更新生成盘点单
*
* @param ids
* @return
*/
@RequestMapping(params = "doUpdate")

13
src/main/java/com/zzjee/wm/entity/WmToDownGoodsEntity.java
View File

@ -36,29 +36,24 @@ public class WmToDownGoodsEntity implements java.io.Serializable {
@Excel(name="创建人名称")
private java.lang.String createName;
/**创建人登录名称*/
@Excel(name="创建人登录名称")
private java.lang.String createBy;
/**创建日期*/
@Excel(name="创建日期",format = "yyyy-MM-dd hh:mm:ss")
private java.util.Date createDate;
/**更新人名称*/
@Excel(name="更新人名称")
private java.lang.String updateName;
/**更新人登录名称*/
@Excel(name="更新人登录名称")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name="更新日期",format = "yyyy-MM-dd hh:mm:ss")
private java.util.Date updateDate;
/**所属部门*/
@Excel(name="所属部门")
private java.lang.String sysOrgCode;
/**所属公司*/
@Excel(name="所属公司")
private java.lang.String sysCompanyCode;
/**商品编码*/
@Excel(name="商品编码")
private java.lang.String goodsId;
@Excel(name="商品名称")
private java.lang.String goodsName;
/**数量*/
@Excel(name="数量")
private java.lang.String goodsQua;
@ -81,7 +76,6 @@ public class WmToDownGoodsEntity implements java.io.Serializable {
@Excel(name="生产日期")
private java.lang.String goodsProData;
/**批次*/
@Excel(name="批次")
private java.lang.String goodsBatch;
/**作业类型*/
@Excel(name="作业类型")
@ -107,8 +101,7 @@ public class WmToDownGoodsEntity implements java.io.Serializable {
/**基本单位数量*/
@Excel(name="基本单位数量")
private java.lang.String baseGoodscount;
@Excel(name="商品名称")
private java.lang.String goodsName;
/**客户订单号*/
@Excel(name="客户订单号")
private java.lang.String imCusCode;

22
src/main/java/org/jeecgframework/core/online/util/CgReportQueryParamUtil.java
View File

@ -14,6 +14,7 @@ import net.sf.json.JSONObject;
import org.jeecgframework.core.online.def.CgReportConstant;
import org.jeecgframework.core.util.DBTypeUtil;
import org.jeecgframework.core.util.ResourceUtil;
import org.jeecgframework.core.util.StringUtil;
/**
@ -62,7 +63,13 @@ public class CgReportQueryParamUtil
value = value.replaceAll("\\*", "%");
params.put(filedName, CgReportConstant.OP_LIKE+value);
}else{
params.put(filedName, CgReportConstant.OP_EQ+value);
if(ResourceUtil.getConfigByName("sysfuzseach").equals("on")){
params.put(filedName, CgReportConstant.OP_LIKE+ "'"+"%"+value+"%"+ "'");//模糊查询
}else{
params.put(filedName, CgReportConstant.OP_EQ+value);//模糊查询
}
}
}
}else if("group".equals(queryMode)){
@ -117,7 +124,6 @@ public class CgReportQueryParamUtil
/**
* 将结果集转化为列表json格式(不含分页信息)
* @param result 结果集
* @param size 总大小
* @return 处理好的json格式
*/
public static String getJson(List<Map<String, Object>> result){
@ -199,8 +205,18 @@ public class CgReportQueryParamUtil
//if(ResourceUtil.fuzzySearch&&(!value.contains("*"))){
// value="*"+value+"*";
//}
if(ResourceUtil.getConfigByName("sysfuzseach").equals("on")){
if(value.contains("*")){
result = "'" +value+ "'";
}else{
result = value;
}
}else{
result = "'" +value+ "'";
}
result = "'" +value+ "'";
}else if(CgReportConstant.TYPE_DATE.equalsIgnoreCase(fieldType)){
result = getDateFunction(value, "yyyy-MM-dd");
}else if(CgReportConstant.TYPE_DOUBLE.equalsIgnoreCase(fieldType)){

2
src/main/resources/sysConfig.properties
View File

@ -39,7 +39,7 @@ categoryCodeLengthType=2
#on \u542F\u7528\u6A21\u7CCA off*\u53F7\u4EE3\u8868\u6A21\u7CCA
#on \u542F\u7528\u6A21\u7CCA off *\u53F7\u4EE3\u8868\u6A21\u7CCA
sysfuzseach=on
mail.smtpHost=smtp.163.com

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

@ -49,7 +49,7 @@
<t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar>
<t:dgToolBar operationCode="uasimpomn" title="第三方系统导入" icon="icon-put" funname="otherimp"></t:dgToolBar>
<%--<t:dgToolBar title="导出" icon="icon-putout" funname="ExportXls"></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 name="searchColums1" style="float: left; padding-left: 0px;padding-top: 5px;">

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

@ -40,7 +40,7 @@
<%-- <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="ExportXls"></t:dgToolBar>
<%-- <t:dgToolBar title="模板下载" icon="icon-putout" funname="ExportXlsByT"></t:dgToolBar> --%>
</t:datagrid>
</div>

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

@ -35,14 +35,14 @@
<t:dgDelOpt title="删除" url="wmToMoveGoodsController.do?doDel&id={id}" urlclass="ace_button" exp="moveSta#ne#已完成" urlfont="fa-trash-o"/>
<%-- <t:dgToolBar title="录入" icon="icon-add" url="wmToMoveGoodsController.do?goAdd" funname="add"></t:dgToolBar> --%>
<t:dgToolBar title="编辑" icon="icon-edit" url="wmToMoveGoodsController.do?goUpdate" funname="update" ></t:dgToolBar>
<t:dgToolBar title="质押" icon="icon-edit" url="wmToMoveGoodsController.do?goUpdate" funname="update" ></t:dgToolBar>
<%--<t:dgToolBar title="质押" icon="icon-edit" url="wmToMoveGoodsController.do?goUpdate" funname="update" ></t:dgToolBar>--%>
<t:dgToolBar title="选择批量更改" icon="icon-edit" funname="editRow"></t:dgToolBar>
<t:dgToolBar title="批量保存" icon="icon-save" url="wmToMoveGoodsController.do?saveRows" funname="saveData"></t:dgToolBar>
<t:dgToolBar title="取消批量更改" icon="icon-undo" funname="reject"></t:dgToolBar>
<%-- <t:dgToolBar title="批量删除" icon="icon-remove" url="wmToMoveGoodsController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
<t:dgToolBar title="批量删除" icon="icon-remove" url="wmToMoveGoodsController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar>
<t:dgToolBar title="查看" icon="icon-search" url="wmToMoveGoodsController.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>

35
src/main/webapp/webpage/com/zzjee/wm/wvStocktmoveList.jsp
View File

@ -23,9 +23,9 @@
<t:dgCol title="单位" field="goodsUnit" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="状态" field="moveSta" queryMode="group" width="50"></t:dgCol>
<t:dgFunOpt title="生成托盘转移" funname="dostttpzy(id)" urlclass="ace_button" exp="moveSta#ne#计划中" />
<t:dgToolBar title="批量生成托盘转移" url="wvStockController.do?doBatchStttpzy" funname="dosttALLSelect"></t:dgToolBar>
<t:dgFunOpt title="生成托盘转移任务" funname="dostttpzy(id)" urlclass="ace_button" exp="moveSta#ne#计划中" />
<t:dgToolBar title="批量生成托盘转移任务" funname="dosttALLSelect"></t:dgToolBar>
<t:dgToolBar title="立即批量转移" funname="dosttokALLSelect"></t:dgToolBar>
<%-- <t:dgDelOpt title="删除" url="wvStockController.do?doDel&id={id}" urlclass="ace_button" urlfont="fa-trash-o"/> --%>
<%-- <t:dgToolBar title="录入" icon="icon-add" url="wvStockController.do?goAdd" funname="add"></t:dgToolBar> --%>
<%-- <t:dgToolBar title="编辑" icon="icon-edit" url="wvStockController.do?goUpdate" funname="update"></t:dgToolBar> --%>
@ -36,6 +36,14 @@
<%-- <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>
<%--<input type="text" name="batchbin" style="width: 100px; height: 30px;">--%>
托盘：<input type="text" name="moveTinid" class="form-control" style="width: 100px; height: 30px;">
</div>
</div>
</div>
<script src = "webpage/com/zzjee/wm/wvStockList.js"></script>
@ -43,8 +51,23 @@
$(document).ready(function(){
});
function dosttALLSelect(){
function dosttokALLSelect() {
var moveTinid;
moveTinid = $('input[name="moveTinid"]').attr("value");
if(moveTinid==""){
alert("托盘不能为空");
}else{
dosttALLSelectbatch(moveTinid);
}
}
function dosttALLSelect() {
dosttALLSelectbatch("");
}
function dosttALLSelectbatch(moveTinid){
var ids = [];
var rows = $('#wvStockList').datagrid('getSelections');
@ -55,7 +78,7 @@
ids.push(rows[i].id);
}
}
var url = "wvStockController.do?doBatchStttpzy&ids="+ids;
var url = "wvStockController.do?doBatchStttpzy&ids="+ids+"&moveTinid="+moveTinid;
$.ajax({
async : false,
cache : false,