Skip to content

T
topsun-bpm
Commit 11fd06cc authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

工序外协查询条件

parent b3938d8c
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 7 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js
View file @ 11fd06cc
...@@ -320,7 +320,7 @@ function initClientGrid() { ...@@ -320,7 +320,7 @@ function initClientGrid() {
var dates = clientGridManager.getData(); var dates = clientGridManager.getData();
if (dates != null && dates.length > 0){ if (dates != null && dates.length > 0){
for (let j = 0; j < dates.length; j++) { for (let j = 0; j < dates.length; j++) {
var data = dates[i]; var data = dates[j];
if (data.produceNo == row.AUFNR){ if (data.produceNo == row.AUFNR){
Public.tip("生产单号："+row.AUFNR+" 已选择，请取消勾选！"); Public.tip("生产单号："+row.AUFNR+" 已选择，请取消勾选！");
return false; return false;
......
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js
View file @ 11fd06cc
...@@ -4,6 +4,7 @@ var refreshFlag = false; ...@@ -4,6 +4,7 @@ var refreshFlag = false;
$(document).ready(function () { $(document).ready(function () {
initializateUI() initializateUI()
loadProcessOutsourceOrderListGrid(); loadProcessOutsourceOrderListGrid();
bindEvent();
}) })
function initializateUI() { function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3}); UICtrl.layout("#layout", {leftWidth: 3});
...@@ -24,6 +25,9 @@ function loadProcessOutsourceOrderListGrid() { ...@@ -24,6 +25,9 @@ function loadProcessOutsourceOrderListGrid() {
{display: "订单行项目号", name: "ebelp", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "订单行项目号", name: "ebelp", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "序号", name: "sequence", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "序号", name: "sequence", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "原工单", name: "aufnr", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "原工单", name: "aufnr", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "产品类别", name: "productTypeName", width: 140, minWidth: 60, type: "string", align: "left",},
{display: "产品编码", name: "productCode", width: 140, minWidth: 60, type: "string", align: "left",},
{display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left",},
{display: "工序号", name: "wempf", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "工序号", name: "wempf", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "工序描述", name: "txz01", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "工序描述", name: "txz01", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "补数工单", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "补数工单", name: "ablad", width: 140, minWidth: 60, type: "string", align: "left"},
...@@ -62,6 +66,36 @@ function loadProcessOutsourceOrderListGrid() { ...@@ -62,6 +66,36 @@ function loadProcessOutsourceOrderListGrid() {
UICtrl.setSearchAreaToggle(gridManager); UICtrl.setSearchAreaToggle(gridManager);
} }
function bindEvent(){
$("#deptName").orgTree({
filter: "dpt", excludePos: 0, param: {orgKindId: "ogn,dpt",orgRoot: '14636F3F48934EE7811768692A0AC5E1'},
back: {
text: "#deptName",
value : '#deptName'
},
});
$("#personMemberName").orgTree({
filter: "psm", excludePos: 0, param: {orgKindId: "ogn,dpt,pos,psm",orgRoot: '14636F3F48934EE7811768692A0AC5E1'},
back: {
text: "#personMemberName",
value : '#personMemberId'
},
});
//产品类别
$('#productTypeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MATKL"}
},
onChange: function (value, data) {
$('#productType').val(data.MATKL);
$('#productTypeName').val(data.WGBEZ);
}
});
}
function query(obj) { function query(obj) {
var param = $(obj).formToJSON(); var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param); UICtrl.gridSearch(gridManager, param);
......
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.jsp
View file @ 11fd06cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html> <html>
<head> <head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/> <x:base include="layout,dialog,grid,tree,dateTime,combox,attachment,commonTree,comboDialog"/>
<x:script src='/biz/topsun/sap/processOutsource/processOutsourceList.js'/> <x:script src='/biz/topsun/sap/processOutsource/processOutsourceList.js'/>
</head> </head>
<body> <body>
...@@ -12,7 +12,31 @@ ...@@ -12,7 +12,31 @@
<div position="center" title="工序外协申请查询"> <div position="center" title="工序外协申请查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/> <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm"> <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<div class="hg-form-row">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/> <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="deptName" required="false" label="申请部门" labelCol="1" wrapper="select"/>
<x:hidden name="deptId"/>
<x:inputC name="personMemberName" required="false" label="申请人" labelCol="1" wrapper="select"/>
<x:hidden name="personMemberId"/>
<x:inputC name="aufnr" required="false" label="原工单" labelCol="1"/>
</div>
<div class="hg-form-row">
<x:selectC name="productType" label="产品类别" required="false" labelCol="1" dictionary="suppliesType"/>
<%-- <x:inputC name="productTypeName" required="false" label="产品类别" labelCol="1" wrapper="select"/>--%>
<%-- <x:hidden name="productType"/>--%>
<x:inputC name="productCode" required="false" label="产品编码" labelCol="1"/>
<x:inputC name="productName" required="false" label="产品名称" labelCol="1" fieldCol="5"/>
</div>
<div class="hg-form-row">
<x:inputC name="eeindBegin" required="false" label="需求日期" labelCol="1" wrapper="date"/>
<x:inputC name="eeindEnd" required="false" label="-" labelCol="0" wrapper="date"/>
<x:inputC name="fillinDateBegin" required="false" label="录入日期" labelCol="1" wrapper="date"/>
<x:inputC name="fillinDateEnd" required="false" label="-" labelCol="0" wrapper="date"/>
</div>
<div class="hg-form-row">
<x:checkboxListC name="statusKind" label="单据状态" list="statusKindsList" labelCol="1" fieldCol="3"/>
</div>
<x:searchButtons/> <x:searchButtons/>
</form> </form>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
View file @ 11fd06cc
...@@ -44,14 +44,15 @@ ...@@ -44,14 +44,15 @@
<x:selectC name="waers" label="货币码" labelCol="1" fieldCol="2" required="true" dictionary="waers"/> <x:selectC name="waers" label="货币码" labelCol="1" fieldCol="2" required="true" dictionary="waers"/>
<x:inputC name="peinh" label="价格单位" labelCol="1" fieldCol="2" required="true" mask="9999999"/> <x:inputC name="peinh" label="价格单位" labelCol="1" fieldCol="2" required="true" mask="9999999"/>
<x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" required="false" readonly="true"/>
<x:hidden name="bprme"/> <x:hidden name="bprme"/>
<x:inputC name="bprmeName" label="订单价格单位(采购)" labelCol="2" fieldCol="2" wrapper="select" required="true" /> <x:inputC name="bprmeName" label="订单价格单位(采购)" labelCol="2" fieldCol="2" wrapper="select" required="true" />
<x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="1" required="false" readonly="true"/> <x:selectC name="mwskz" label="销售/购买税代码" labelCol="2" fieldCol="3" required="true" dictionary="purchaseMwskz"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:hidden name="meins"/> <x:hidden name="meins"/>
<x:selectC name="mwskz" label="销售/购买税代码" labelCol="2" fieldCol="1" required="true" dictionary="purchaseMwskz"/>
<x:inputC name="norbm" label="标准采购订单数量" labelCol="2" fieldCol="1" required="true" mask="99999999.99"/> <x:inputC name="norbm" label="标准采购订单数量" labelCol="2" fieldCol="1" required="true" mask="99999999.99"/>
<x:inputC name="umren" label="单位转换分母" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/> <x:inputC name="umren" label="单位转换分母" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
<x:inputC name="aplfz" label="计划交货时间(天)" labelCol="2" fieldCol="1" required="true" mask="9999999"/> <x:inputC name="aplfz" label="计划交货时间(天)" labelCol="2" fieldCol="1" required="true" mask="9999999"/>
<x:selectC name="webre" label="基于收货的发票验证" labelCol="2" fieldCol="1" required="true" dictionary="webre"/> <x:selectC name="webre" label="基于收货的发票验证" labelCol="2" fieldCol="1" required="true" dictionary="webre"/>
<x:selectC name="stfkz" label="等级类型" labelCol="1" fieldCol="2" required="true" dictionary="stfkz"/> <x:selectC name="stfkz" label="等级类型" labelCol="1" fieldCol="5" required="true" dictionary="stfkz"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="kstbm" label="等级数量1" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/> <x:inputC name="kstbm" label="等级数量1" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
......
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/controller/ProcessOutsourceController.java
View file @ 11fd06cc
...@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.processOutsource.controller; ...@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.processOutsource.controller;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.common.BillStatus;
import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceApplication; import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceApplication;
import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceMaterialApplication; import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceMaterialApplication;
import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceOrderItemApplication; import com.huigou.topsun.sap.processOutsource.application.ProcessOutsourceOrderItemApplication;
...@@ -38,6 +39,7 @@ public class ProcessOutsourceController extends CommonController { ...@@ -38,6 +39,7 @@ public class ProcessOutsourceController extends CommonController {
private ProcessOutsourceOrderItemApplication processOutsourceOrderItemApplication; private ProcessOutsourceOrderItemApplication processOutsourceOrderItemApplication;
public String forwardProcessOutsourceList(){ public String forwardProcessOutsourceList(){
this.putAttribute("statusKindsList", BillStatus.getValidMap());
return forward("processOutsourceList"); return forward("processOutsourceList");
} }
......
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/query/ProcessOutsourceQueryRequest.java
View file @ 11fd06cc
...@@ -3,6 +3,9 @@ package com.huigou.topsun.sap.processOutsource.domain.query; ...@@ -3,6 +3,9 @@ package com.huigou.topsun.sap.processOutsource.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest; import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/** /**
* @Auther: xin.lu * @Auther: xin.lu
* @Date: 2024/08/02/10:04 * @Date: 2024/08/02/10:04
...@@ -13,4 +16,33 @@ public class ProcessOutsourceQueryRequest extends QueryAbstractRequest { ...@@ -13,4 +16,33 @@ public class ProcessOutsourceQueryRequest extends QueryAbstractRequest {
private String billCode; private String billCode;
private String processOutsourceId; private String processOutsourceId;
private String deptId;
private String deptName;
private String personMemberId;
private String personMemberName;
private String aufnr;
private Date eeindBegin;
private Date eeindEnd;
private String productType;
/**
* 产品编码
*/
private String productCode;
/**
* 产品名称
*/
private String productName;
private String statusKind;
private Date fillinDateBegin;
private Date fillinDateEnd;
} }
topsun/src/main/resources/config/topsun/sap/processOutsource/processOutsource.xml
View file @ 11fd06cc
...@@ -8,11 +8,25 @@ ...@@ -8,11 +8,25 @@
t.fillin_date, t.fillin_date,
t.bill_code, t.bill_code,
t.`status`, t.`status`,
t.person_member_name t.person_member_name,
t.dept_name
FROM sap_process_outsource_order_item ot FROM sap_process_outsource_order_item ot
LEFT JOIN sap_process_outsource t ON t.id = ot.process_outsource_id where 1=1 LEFT JOIN sap_process_outsource t ON t.id = ot.process_outsource_id where 1=1
</sql-query> </sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/> <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="dept_id" name="deptId" type="java.lang.String" symbol="=" alias="t"/>
<condition column="person_member_id" name="personMemberId" type="java.lang.String" symbol="=" alias="t"/>
<condition column="aufnr" name="aufnr" type="java.lang.String" symbol="like" alias="ot"/>
<condition column="eeind" name="eeindBegin" type="java.util.Date" symbol="&gt;=" alias="ot"/>
<condition column="eeind" name="eeindEnd" type="java.util.Date" symbol="&lt;=" alias="ot"/>
<condition column="product_type" name="productType" type="java.lang.String" symbol="=" alias="ot"/>
<condition column="product_code" name="productCode" type="java.lang.String" symbol="like" alias="ot"/>
<condition column="product_name" name="productName" type="java.lang.String" symbol="like" alias="ot"/>
<condition column="fillin_date" name="fillinDateBegin" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinDateEnd" type="java.util.Date" symbol="&lt;=" alias="t"/>
<condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
</query> </query>
<query name="processOutsourceMaterialItems" label="组件明细" table="sap_process_outsource_material"> <query name="processOutsourceMaterialItems" label="组件明细" table="sap_process_outsource_material">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment