diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js
index 56b2de46..15cb61e8 100644
--- a/erp_web/js/pages/bill/in_out.js
+++ b/erp_web/js/pages/bill/in_out.js
@@ -635,7 +635,7 @@
$("#saveDepotHead").click();
}
//搜索按钮添加快捷键
- if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber"||obj.id=="searchMaterial"))
+ if(k == "13"&&(obj.id=="searchNumber"||obj.id=="searchMaterial"))
{
$("#searchBtn").click();
}
@@ -1003,7 +1003,7 @@
type: listType,
subType: listSubType,
roleType: roleType,
- state: $.trim($("#searchState").val()),
+ status: "",
number: $.trim($("#searchNumber").val()),
beginTime: beginTime,
endTime: endTime,
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index b306111f..265b2bba 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -82,7 +82,7 @@
| 关联订单 |
-
+
|
|
@@ -286,6 +286,15 @@
保存
取消
+
+
@@ -425,17 +434,7 @@
$(".window-mask").css({ width: webW ,height: webH});
depotHeadID = 0;
var res = sessionStorage.getItem("rowInfo");
- if(pageType == "skip" && res) { //从订单跳转过来
- res = JSON.parse(res);
- $('#OrganId').combobox('setValue', res.organId);
- $("#LinkNumber").val(res.number); //关联订单号
- $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
- $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
- depotHeadID = res.id;
- initTableData_material("edit",res.totalPrice); //商品列表
- } else {
- initTableData_material("add"); //商品列表
- }
+ initTableData_material("add"); //商品列表
function supplierDlgFun(type) {
$('#supplierDlg').dialog('open').dialog('setTitle','
增加' + type + '信息');
$('#supplierFM').form('clear');
@@ -455,8 +454,92 @@
$('#accountFM').form('clear');
bindAccountEvent();
});
+ //关联订单的选择事件
+ $('#LinkNumber').textbox({
+ onClickButton:function(){
+ $('#linkBillDlg').dialog('open').dialog('setTitle', ' 选择关联单据');
+ $("#linkBillDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-400) * 0.5});
+ initLinkBillTableData();
+ }
+ });
url = '/depotHead/addDepotHeadAndDetail';
}
+ function initLinkBillTableData() {
+ $('#linkBillData').datagrid({
+ height:300,
+ rownumbers: false,
+ //动画效果
+ animate:false,
+ //选中单行
+ singleSelect: true,
+ collapsible: false,
+ pagination: true,
+ //交替出现背景
+ striped : true,
+ pageSize: 10,
+ pageList: initPageNum,
+ columns:[[
+ { field: 'id',width:35,align:"center",checkbox:true},
+ { title: '供应商名称', field: 'organName',width:120},
+ { title: '单据编号',field: 'number',width:155},
+ { title: '商品信息',field: 'materialsList',width:200,formatter:function(value){
+ if(value) {
+ return value.replace(",","，");
+ }
+ }
+ },
+ { title: '单据日期',field: 'operTimeStr',width:145},
+ { title: '操作员',field: 'userName',width:60},
+ { title: '金额合计',field: 'totalPrice',width:70}
+ ]],
+ onLoadError:function() {
+ $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+ return;
+ }
+ });
+ $.ajax({
+ type: "get",
+ url: "/depotHead/list",
+ dataType: "json",
+ data: ({
+ search: JSON.stringify({
+ type: "其它",
+ subType: "采购订单",
+ roleType: roleType,
+ status: "1",
+ number: "",
+ beginTime: "",
+ endTime: "",
+ materialParam: "",
+ depotIds: depotString
+ }),
+ currentPage: 1,
+ pageSize: initPageSize
+ }),
+ success: function (res) {
+ if(res && res.code === 200){
+ if(res.data && res.data.page) {
+ $("#linkBillData").datagrid('loadData', res.data.page);
+ $("#saveLinkBill").off("click").on("click", function(){
+ var res = $('#linkBillData').datagrid('getChecked')[0];
+ $('#OrganId').combobox('setValue', res.organId);
+ $("#LinkNumber").textbox("setValue",res.number); //关联订单号
+ $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
+ $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
+ depotHeadID = res.id;
+ initTableData_material("edit",res.totalPrice); //商品列表
+ $('#linkBillDlg').dialog('close');
+ });
+ }
+ }
+ },
+ //此处添加错误处理
+ error: function () {
+ $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+ return;
+ }
+ });
+ }
//编辑信息
function editDepotHead(index) {
var res = $("#tableData").datagrid("getRows")[index];
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index 56ff7a94..857c3e0f 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -291,7 +291,7 @@
pageList: initPageNum,
columns:[[
{ field: 'id',width:35,align:"center",checkbox:true},
- { title: '操作',field: 'op',align:"center", width:120,
+ { title: '操作',field: 'op',align:"center", width:90,
formatter:function(value,rec,index) {
var str = '';
var orgId = rec.organId? rec.organId:0;
@@ -300,7 +300,6 @@
str += '
';
str += '
';
}
- str += ' 
';
return str;
}
},
diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 31b5fc73..f4e282de 100644
--- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -344,7 +344,7 @@ public class DepotHeadController {
String rows = body.getRows();
Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString());
Long tenantId = Long.parseLong(request.getSession().getAttribute("tenantId").toString());
- Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null);
+ Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null,null);
if(count>= billsNumLimit) {
throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE,
ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG);
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
index fb897497..38a268f6 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -22,6 +22,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("subType") String subType,
@Param("creatorArray") String[] creatorArray,
+ @Param("status") String status,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@@ -34,6 +35,7 @@ public interface DepotHeadMapperEx {
@Param("type") String type,
@Param("subType") String subType,
@Param("creatorArray") String[] creatorArray,
+ @Param("status") String status,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
index f22ee504..6c69ad6f 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
@@ -33,12 +33,13 @@ public class DepotHeadComponent implements ICommonQuery {
String type = StringUtil.getInfo(search, "type");
String subType = StringUtil.getInfo(search, "subType");
String roleType = StringUtil.getInfo(search, "roleType");
+ String status = StringUtil.getInfo(search, "status");
String number = StringUtil.getInfo(search, "number");
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String materialParam = StringUtil.getInfo(search, "materialParam");
String depotIds = StringUtil.getInfo(search, "depotIds");
- return depotHeadService.select(type, subType, roleType, number, beginTime, endTime, materialParam, depotIds, QueryUtils.offset(map), QueryUtils.rows(map));
+ return depotHeadService.select(type, subType, roleType, status, number, beginTime, endTime, materialParam, depotIds, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
@@ -47,12 +48,13 @@ public class DepotHeadComponent implements ICommonQuery {
String type = StringUtil.getInfo(search, "type");
String subType = StringUtil.getInfo(search, "subType");
String roleType = StringUtil.getInfo(search, "roleType");
+ String status = StringUtil.getInfo(search, "status");
String number = StringUtil.getInfo(search, "number");
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String materialParam = StringUtil.getInfo(search, "materialParam");
String depotIds = StringUtil.getInfo(search, "depotIds");
- return depotHeadService.countDepotHead(type, subType, roleType, number, beginTime, endTime, materialParam, depotIds);
+ return depotHeadService.countDepotHead(type, subType, roleType, status, number, beginTime, endTime, materialParam, depotIds);
}
@Override
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 80c7cdf1..75f1b7d9 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -82,13 +82,13 @@ public class DepotHeadService {
return list;
}
- public List select(String type, String subType, String roleType, String number, String beginTime, String endTime,
+ public List select(String type, String subType, String roleType, String status, String number, String beginTime, String endTime,
String materialParam, String depotIds, int offset, int rows)throws Exception {
List resList = new ArrayList();
List list=null;
try{
String [] creatorArray = getCreatorArray(roleType);
- list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, number, beginTime, endTime, materialParam, depotIds, offset, rows);
+ list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotIds, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -122,12 +122,12 @@ public class DepotHeadService {
return resList;
}
- public Long countDepotHead(String type, String subType, String roleType,String number, String beginTime, String endTime,
+ public Long countDepotHead(String type, String subType, String roleType, String status, String number, String beginTime, String endTime,
String materialParam, String depotIds) throws Exception{
Long result=null;
try{
String [] creatorArray = getCreatorArray(roleType);
- result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, number, beginTime, endTime, materialParam, depotIds);
+ result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotIds);
}catch(Exception e){
JshException.readFail(logger, e);
}
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 8b526ea1..775b289b 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -55,6 +55,9 @@
and dh.sub_type='${subType}'
+
+ and dh.status ='${status}'
+
and dh.number like '%${number}%'
@@ -86,24 +89,27 @@