Skip to content

T
topsun-bpm
Commit 141108bf authored by wanghang's avatar wanghang
Browse files
Options

主页展示 流程

parent 339a0997
Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 798 deletions
.idea/dataSources.xml
View file @ 141108bf
......@@ -8,7 +8,7 @@
<jdbc-url>jdbc:mysql://192.168.222.122:3406/topsun</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="topsun@192.168.3.91" uuid="f1671338-53c3-4164-87ff-b7dbcec2fd91">
<data-source source="LOCAL" name="bsn@192.168.3.91" uuid="f1671338-53c3-4164-87ff-b7dbcec2fd91">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
......
.idea/mybatisx/templates.xml
View file @ 141108bf
......@@ -48,8 +48,12 @@
<option name="tableUIInfoList">
<list>
<TableUIInfo>
<option name="className" value="BsnMessage" />
<option name="tableName" value="bsn_message" />
<option name="className" value="SapCostReimbursementBaseInfo" />
<option name="tableName" value="sap_cost_reimbursement_base_info" />
</TableUIInfo>
<TableUIInfo>
<option name="className" value="SapCostReimbursementDetail" />
<option name="tableName" value="sap_cost_reimbursement_detail" />
</TableUIInfo>
</list>
</option>
......
huigou-xt/src/main/webapp/system/taskCenter/TasksTracking.jsp
View file @ 141108bf
......@@ -7,10 +7,12 @@
taskId="<c:out value="${task.id}"/>"
bizId="<c:out value="${task.businessId}"/>"
name="<c:out value="${task.title}"/>"
active="<c:out value="${task.active}"/>"
url="<c:out value="${task.executorUrl}"/>">
<div class="title-view">
<a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>" title="<c:out value="${task.title}" />">
<c:out value="${task.title}" />
<c:out value="${task.title}" />:
<c:out value="${task.taskDescribe}" />
</a>
</div>
<div class="date-view">
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 141108bf
......@@ -14,6 +14,25 @@ $(document).ready(function () {
function initializate() {
switch ($("#active").val()) {
case '0'://已分发未完成
$("#buttonBox").show();
$("#showChart").remove();
break;
case '1'://完成/审核
$("#auditForm").show();
break;
case '2'://保存未分发
$("#buttonBox").show();
break;
case '3'://被驳回
$("#causeBox").show();
break;
default://其他/详情
$("#buttonBox").show();
break;
}
// let isInitiator = ($("#isInitiator").val() === "true");
// if (isInitiator) {
......@@ -114,7 +133,7 @@ function loadGrid() {
],
dataAction: "server",
url: web_app.name + '/sapNonProdApplyNext/slicedDeptList.ajax',
parms: {dept: $("#businessUsage").val()},
parms: {dept: $("#businessUsage").val(),id:$("#applyDeptId").val()},
pageSize: 20,
usePager: false,
enabledEdit: true,
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ 141108bf
......@@ -10,12 +10,13 @@
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="isInitiator" value="false"/> <!--是否是详情页-->
<x:hidden name="active" value=""/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<div style="float: right; margin-right: 10px" class="btn-group" id="buttonBox">
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
......@@ -28,7 +29,7 @@
</div>
<br/>
<%-- <div class=" border-left-top" style="margin-top: 20px;">--%>
<%-- <div class=" border-left-top" style="margin-top: 20px;display: none;" id="causeBox">--%>
<%-- <div class=" gray-bg">--%>
<%-- <div class="col-xs-2 " style="text-align: center;margin-top: 30px">--%>
<%-- <h4>驳回历史</h4>--%>
......@@ -295,7 +296,7 @@
<%-- </div>--%>
<%-- </div>--%>
</form>
<%-- <form class="hg-form" method="post" action="" id="auditForm">--%>
<%-- <form class="hg-form" method="post" action="" style="display: none;" id="auditForm">--%>
<%-- <div class=" border-left-top" style="margin-top: 20px;">--%>
<%-- <div class=" gray-bg">--%>
<%-- <div class="col-xs-2 " style="text-align: center;margin-top: 30px">--%>
......
topsun/src/main/java/com/huigou/topsun/base/WorkflowApplicationImplOverride.java
View file @ 141108bf
......@@ -2,6 +2,8 @@ package com.huigou.topsun.base;
import com.huigou.context.Operator;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.ActiveStatus;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
import com.huigou.uasp.bmp.opm.application.OrgApplication;
import com.huigou.uasp.bpm.BatchAdvanceParameter;
import com.huigou.uasp.bpm.TaskStatus;
......@@ -22,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -37,7 +41,25 @@ public class WorkflowApplicationImplOverride extends WorkflowApplicationImpl {
@Override
public Map<String, Object> queryTrackingTasks() {
Operator operator = getOperator();//获取当前操作员的详情信息
//当前登录用户是否以任务发起人的身份发起过任务
List<Map<String, Object>> maps = bsnMessageApplication.queryFinishBsnMessage();
List<BsnMessage> bsnMessages = new ArrayList<>();
//若有发起过任务且所有的执行人执行完毕，则由系统创建一份审批任务给当前用户
for (Map<String, Object> map : maps) {
BsnMessage bsnMessage = new BsnMessage();
bsnMessage.setTaskSponsor("system");
bsnMessage.setListners(this.getOperator().getUserId());
// bsnMessage.setBusinessCode("system");
bsnMessage.setActive(ActiveStatus.UNFINISHED.getValue());
bsnMessage.setCreateDate(new Date());
bsnMessage.setTitle(map.get("title")+"[完成]");
bsnMessage.setTaskDescribe("请审批");
bsnMessage.setExecutorUrl((String)map.get("businessId"));
bsnMessage.setBusinessId((String)map.get("executorUrl"));
bsnMessages.add(bsnMessage);
}
bsnMessageApplication.saveBsnMessage(bsnMessages);
//获取任务执行人为当前用户的任务
return this.bsnMessageApplication.queryBsnMessage();
}
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java
View file @ 141108bf
package com.huigou.topsun.base.bsnMessage.appliction;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
import com.huigou.topsun.base.bsnMessage.domain.query.BsnMessageQueryRequest;
import org.apache.poi.ss.formula.functions.T;
import java.util.List;
import java.util.Map;
public interface BsnMessageApplication {
......@@ -9,4 +12,10 @@ public interface BsnMessageApplication {
String QUERY_XML_FILE_PATH = "config/topsun/base/bsnMessage.xml";
Map<String,Object> queryBsnMessage();
List<Map<String,Object>> queryFinishBsnMessage();
List<BsnMessage> getBsnMessageByBusinessId(String businessId);
List<BsnMessage> getBsnMessageByListner(String listner);
void saveBsnMessage(List<BsnMessage> bsnMessages);
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java
View file @ 141108bf
......@@ -5,7 +5,9 @@ import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.exception.ApplicationException;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
import com.huigou.topsun.base.bsnMessage.domain.query.BsnMessageQueryRequest;
import com.huigou.topsun.base.bsnMessage.repository.BsnMessageRepository;
import com.huigou.topsun.base.coderule.application.CodeRuleApplication;
import com.huigou.topsun.base.coderule.domain.model.CodeRule;
import com.huigou.topsun.base.coderule.domain.model.CodeRuleKind;
......@@ -26,6 +28,7 @@ import org.springframework.util.Assert;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -41,6 +44,9 @@ import java.util.regex.Pattern;
@Service("bsnMessageApplication")
public class BsnMessageApplicationImpl extends BaseApplication implements BsnMessageApplication {
@Autowired
BsnMessageRepository bsnMessageRepository;
@Override
public Map<String, Object> queryBsnMessage() {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryBsnMessage");
......@@ -53,4 +59,32 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
queryModel.putParam("listners", this.getOperator().getUserId());
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
@Override
public List<Map<String,Object>> queryFinishBsnMessage() {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryFinishBsnMessage");
QueryModel queryModel = new QueryModel();
queryModel.setSql(queryDescriptor.getSql());
queryModel.setPageIndex(1);
queryModel.setPageSize(10);
queryModel.setSortFieldName("createDate");
queryModel.setSortOrder("desc");
queryModel.putParam("taskSponsor", this.getOperator().getUserId());
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return (List<Map<String,Object>>)map.get("Rows");
}
@Override
public List<BsnMessage> getBsnMessageByBusinessId(String businessId) {
return bsnMessageRepository.findAllByBusinessId(businessId);
}
@Override
public List<BsnMessage> getBsnMessageByListner(String listner) {
return bsnMessageRepository.findAllByListners(listner);
}
@Override
public void saveBsnMessage(List<BsnMessage> bsnMessages) {
bsnMessageRepository.save(bsnMessages);
}
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessage.java
View file @ 141108bf
......@@ -33,6 +33,19 @@ public class BsnMessage implements Serializable {
*/
private String title;
/**
* 任务发起人
*/
@Column(name="task_sponsor")
private String taskSponsor;
/**
* 任务发起人
*/
@Column(name="task_describe")
private String taskDescribe;
/**
* 任务执行人
*/
......@@ -62,8 +75,6 @@ public class BsnMessage implements Serializable {
@Column(name = "finished_date")
private Date finishedDate;
/**
*任务执行地址
*/
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/repository/BsnMessageRepository.java
View file @ 141108bf
......@@ -11,5 +11,6 @@ import java.util.List;
public interface BsnMessageRepository extends JpaRepository<BsnMessage,String> {
List<BsnMessage> findAllByBusinessId(String BusinessId);
List<BsnMessage> findAllByListners(String listner);
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ 141108bf
......@@ -45,7 +45,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
throw new RuntimeException("JSON转换失败："+e);
}
Operator operator = getOperator();//获取当前操作员的详情信息
//封装分发数据
List<BsnMessage> bsnMessageList = new ArrayList<>();
for (Map<String, String> stringMap : deptStaffList) {
......@@ -53,11 +52,13 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String userCode = stringMap.get("userCode");
String deptName = stringMap.get("deptName");
String deptCode = stringMap.get("deptCode");
bsnMessage.setTaskSponsor(this.getOperator().getUserId());
bsnMessage.setListners(userCode);
bsnMessage.setBusinessCode(deptCode);
bsnMessage.setActive(ActiveStatus.SAVED.getValue());
bsnMessage.setCreateDate(new Date());
bsnMessage.setTitle("非产品/非本成品类物料："+deptName+"部门数据维护");
bsnMessage.setTitle("非产品/非本成品类物料");
bsnMessage.setTaskDescribe(deptName+"部门数据维护");
bsnMessage.setExecutorUrl("sapNonProdApplyNext/fillInNonProdApplyDept.do");
bsnMessage.setBusinessId(nonProdApplyDept.getApplyDeptId());
bsnMessageList.add(bsnMessage);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 141108bf
......@@ -35,6 +35,7 @@ public class NonProdApplyController extends CommonController {
public String forwardNonProdApplyDetail(){
this.putAttribute("processDefinitionKey", NonProdApplyApplication.PROCESS_DEFINITION_KEY);
this.putAttribute("procUnitId", "Apply");//定义流程环节的id
NonProdApplyBaseInfo nonProdApplyBaseInfo = new NonProdApplyBaseInfo();
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator();//获取当前操作员的详情信息
......@@ -69,8 +70,6 @@ public class NonProdApplyController extends CommonController {
nonProdApplyApplication.deleteNonProdApplyBaseInfoByIds(ids);
return success();
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @ 141108bf
......@@ -4,6 +4,9 @@ package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.cache.DictUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.ActiveStatus;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
import com.huigou.topsun.proofing.domain.workInstructionApply.model.WorkInstructionApply;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
......@@ -36,20 +39,25 @@ public class NonProdApplyNextController extends CommonController {
NonProdApplyApplication nonProdApplyApplication;
@Autowired
NonProdApplyDeptApplication nonProdApplyDeptApplication;
@Autowired
BsnMessageApplication bsnMessageApplication;
public String forwardNonProdApplyNext(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
this.putAttribute("active", ActiveStatus.UNFINISHED.getValue() );//定义流程环节的id
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("nonProdApplyNext",nonProdApplyBaseInfo);
}
//部门相关
public String slicedDeptList(){
SDO sdo = this.getSDO();
String septString = sdo.getString("dept");
// String applyDeptId = sdo.getString("applyDeptId");
// List<BsnMessage> bsnMessageAll = bsnMessageApplication.getBsnMessageByBusinessId(applyDeptId);
List<String> deptList = Arrays.asList(septString.split(","));
Map<String, String> serviceusage = DictUtil.getDictionary("serviceusage");
// 用于存储结果的字典
......@@ -92,10 +100,13 @@ public class NonProdApplyNextController extends CommonController {
public String fillInNonProdApplyDept(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
String active = sdo.getString("active");
String taskSponsor = sdo.getString("taskSponsor");
Map<String, String> map = DictUtil.getDictionary("serviceusage");
this.putAttribute("bu",map);
this.putAttribute("isReadOnly","false");
this.putAttribute("active",active);
this.putAttribute("taskSponsor",taskSponsor);
SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptById(id);
return forward("nonProdApplyNext",nonProdApplyDept);
}
......
topsun/src/main/java/com/huigou/topsun/sap/priceMasterData/domain/BsnMessage.java deleted 100644 → 0
View file @ 339a0997
package com.huigou.topsun.sap.priceMasterData.domain;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName bsn_message
*/
@Table(name="bsn_message")
@Entity
@Data
public class BsnMessage implements Serializable {
/**
*
*/
@Id
private String id;
/**
* 任务描述
*/
private String title;
/**
* 任务执行人
*/
private String listners;
/**
* 业务应用类型
*/
@Column(name = "business_code")
private String businessCode;
/**
* 业务表单id
*/
@Column(name = "business_id")
private String businessId;
/**
* 创建日期
*/
@Column(name = "create_date")
private Date createDate;
/**
* 完成日期
*/
@Column(name = "finished_date")
private Date finishedDate;
/**
* 完成状态（默认为未完成：0，完成为：1，保存未分发：2）
*/
private Integer active;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/resources/config/topsun/base/bsnMessage.xml
View file @ 141108bf
......@@ -3,9 +3,22 @@
<query name="queryBsnMessage" label="bsn业务人员表" table="bsn_message">
<sql-query>
select t.*
select t.*,b.*
from bsn_message t
left join bsn_message_detail b
on(t.id=b.bsn_message_id)
from bsn_message t where t.active=0
</sql-query>
<condition column="listners" name="listners" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="queryFinishBsnMessage" label="bsn业务人员表" table="bsn_message">
<sql-query>
SELECT business_id,executor_url,title
FROM bsn_message
WHERE task_sponsor = ?
GROUP BY business_id,executor_url,title
HAVING COUNT(DISTINCT active) = 1 AND MIN(active) = 1;
</sql-query>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-acceptance.xml deleted 100644 → 0
View file @ 339a0997
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="billCodeChoose" desc="合同选择">
<sql>select t.bill_code as code,t.id,t.fillin_date,a.project_full_code from SSRF_GENERAL_ACCEPTANCE_APPROV t, ssrf_purchase_approval a where 1=1 and t.purchase_approval_id = a.id</sql>
<orderby>fillin_date desc</orderby>
<field name="common.field.code" title="编码" code="code" width="200" />
<!-- <field name="common.field.name" title="名称" code="name" width="200" /> -->
<field name="id" code="id" type='hidden' />
<field name="projectFullCode" code="projectFullCode" type='hidden' />
</easy-search>
<easy-search name="purchaseContractCode" desc="单个/批量验收合同选择">
<sql>
select t.ID as purchaseApprovalId,
t.BILL_CODE as purchaseApprovalCode,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
<!-- t.MONETARY_UNIT_TYPE, -->
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.fillin_date,
c.contract_date,
c.BILL_CODE as code,
c.is_quality_task,
c.is_month_report,
g.acceptance_method,
g.testing_leader,
g.technology_leader,
g.testing_result,
g.technology_result,
g.testing_date,
g.total_accept_number,
g.now_accept_number,
g.technology_date,
g.is_prototype,
g.id as apply_acceptance_id
from SSRF_PURCHASE_CONTRACT c
left join SSRF_PURCHASE_APPROVAL t
on t.ID = c.PURCHASE_APPROVAL_ID
left join SSRF_GENERAL_ACCEPTANCE_APPROV g
on c.PURCHASE_APPROVAL_ID = g.PURCHASE_APPROVAL_ID
where c.status = 3
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_ACCEPTANCE_APPROVAL m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_BATCH_ACCEPTANCE_APPROVAL m)
and t.PROJECT_CODE != 'SHINE-Y'
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden' />
<field name="code" code="code" type='hidden' />
<field name="standardKind" code="standardKindTextView" type='hidden' dictionary="standardKind"/>
<field name="standardKind" code="standardKind" type='hidden' dictionary="standardKind"/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200" />
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel" />
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden' dictionary="CurrencyType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden' />
<field name="supplierName" title="供应商" code="supplierName" type='hidden' />
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden' />
<field name="ssrf.acceptance.contractAmount" title="合同金额" code="amountContractSigned" width="200"/>
<field name="ssrf.purchase.contract.contractNumber" title="合同编号" code="contractNumber" width="200" />
<field name="ssrf.acceptance.contractName" title="合同名称" code="contractName" width="200" />
<field name="ssrf.purchase.contract.dateContractSigned" title="合同签订时间" code="contractDate" width="200" />
<field name="totalAcceptNumber" title="总验收次数" code="totalAcceptNumber" width="200" type='hidden'/>
<field name="nowAcceptNumber" title="当前验收次数" code="nowAcceptNumber" width="200" type='hidden'/>
<field name="isQualityTask" title="质量跟踪卡" code="isQualityTask" width="200" type='hidden'/>
<field name="isMonthReport" title="质量月报" code="isMonthReport" width="200" type='hidden'/>
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethodTextView" width="200" type='hidden'/>
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethod" width="200" type='hidden'/>
<field name="testingLeader" title="测试组长" code="testingLeader" width="200" type='hidden'/>
<field name="technologyLeader" title="技术测试组长" code="technologyLeader" width="200" type='hidden'/>
<field name="testingResult" title="测试结果" code="testingResult" width="200" type='hidden'/>
<field name="technologyResult" title="技术测试结果" code="technologyResult" width="200" type='hidden'/>
<field name="testingDate" title="测试日期" code="testingDate" width="200" type='hidden'/>
<field name="technologyDate" title="技术验收日期" code="technologyDate" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototypeTextView" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototype" width="200" type='hidden'/>
<field name="applyAcceptanceId" title="验收申请ID" code="applyAcceptanceId" width="200" type='hidden'/>
</easy-search>
<easy-search name="applyPurchaseContractCode" desc="验收申请合同选择">
<sql>
<!--<![CDATA[
select t.ID as purchaseApprovalId,
t.BILL_CODE as purchaseApprovalCode,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME as professional,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.fillin_date,
c.is_quality_task,
c.is_month_report,
c.BILL_CODE as code
from SSRF_PURCHASE_CONTRACT c
left join SSRF_PURCHASE_APPROVAL t
on t.ID = c.PURCHASE_APPROVAL_ID
where c.status = 3
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_GENERAL_ACCEPTANCE_APPROV m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_ACCEPTANCE_APPROVAL m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_BATCH_ACCEPTANCE_APPROVAL m)
and t.PROJECT_CODE = 'SSRFII'
and (t.standard_kind = 'standard'
and t.budget_mount >= 10000)
or (t.standard_kind = 'nostandard'
and t.budget_mount >= 20000)
]]>-->
select t.* from v_ssrf_yxacceptanceapply t where (t.s1=1 or t.s2=1) and t.PROJECT_CODE='SSRFII'
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden' />
<field name="code" code="code" type='hidden' />
<field name="standardKind" code="standardKindTextView" type='hidden' dictionary="standardKind"/>
<field name="standardKind" code="standardKind" type='hidden' dictionary="standardKind"/>
<field name="professional" code="professional" type='hidden'/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200" />
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel" />
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden' dictionary="CurrencyType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden' />
<field name="supplierName" title="供应商" code="supplierName" type='hidden' />
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden' />
<field name="ssrf.acceptance.contractAmount" title="合同金额" code="amountContractSigned" width="200"/>
<field name="ssrf.purchase.contract.contractNumber" title="合同编号" code="contractNumber" width="200" />
<field name="ssrf.acceptance.contractName" title="合同名称" code="contractName" width="200" />
<field name="ssrf.purchase.contract.dateContractSigned" title="合同签订时间" code="contractDate" width="200" />
<field name="isQualityTask" title="质量跟踪卡" code="isQualityTask" width="200" type='hidden'/>
<field name="isMonthReport" title="质量月报" code="isMonthReport" width="200" type='hidden'/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-budget.xml deleted 100644 → 0
View file @ 339a0997
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="budgetCodeChoose" desc="预算编号选择">
<sql>select t.* from ssrf_budget_record t where STATUS=1 </sql>
<field name="common.field.code" title="编码" code="code" width="200" />
<field name="common.field.name" title="名称" code="name" width="200" />
<field name="requirement" code="requirement" type='hidden' />
<field name="id" code="id" type='hidden' />
<field name="unit" code="unit" type='hidden' />
<condition column="SYSTEM_FULL_ID" name="projectId" symbol="like"
alias="t" />
<orderby> code asc</orderby>
</easy-search>
<easy-search name="subjectCodeChoose" desc="课题号选择">
<sql>select t.financy_subject_code,code,t.project_name from SSRF_PROJECT_SUBJECT t
inner join sa_oporg o on t.project_id=o.id</sql>
<field name="课题卡号" code="financySubjectCode" title="课题卡号" width="200" />
<field name="编码" code="code" title="编码" width="200" />
<field name="projetName" code="project_name" type='hidden' />
<condition column="full_code" name="fullCode" symbol="half_like"
alias="o" />
<orderby> code asc</orderby>
</easy-search>
<easy-search name="budgetChoose" desc="预算编号及课题号选择">
<sql>select t.financy_subject_code,code from SSRF_PROJECT_SUBJECT t
inner join sa_oporg o on t.project_id=o.id</sql>
<field name="课题卡号" code="financySubjectCode" title="课题卡号" width="200" />
<field name="编码" code="code" title="编码" width="200" />
<condition column="full_code" name="fullCode" symbol="half_like"
alias="o" />
<orderby> code asc</orderby>
</easy-search>
<easy-search name="extraBudgetCodeChoose" desc="预算外编号选择">
<!-- and parent_code is not null -->
<sql>select t.* ,(VALUE - IFNULL(FROZEN_VALUE, 0) - IFNULL(USED_VALUE, 0)) as availableValue
from ssrf_budget_record t
where STATUS = 1 and t.IS_LAST_STAGE = 1 </sql>
<field name="common.field.code" title="编码" code="code" width="200" />
<field name="common.field.name" title="名称" code="name" width="200" />
<field name="ssrf.hx.ssrfHxPurchaseApproval.belongYear" title="所属年" code="belongYear" width="200" />
<field name="requirement" code="requirement" type='hidden' />
<field name="id" code="id" type='hidden' />
<field name="unit" code="unit" type='hidden' />
<field name="数量" code="quantity" type='hidden' />
<field name="购买金额" code="frozenValue" type='hidden' />
<field name="可用金额" code="availableValue" type='hidden' />
<field name="system_name" code="systemName" type='hidden' />
<field name="collectivity_name" code="collectivityName" type='hidden' />
<field name="COLLECTIVITY_CODE" code="collectivityCode" type='hidden' />
<field name="vindicate_type" code="vindicateTypeTextView" dictionary="vindicateType" type='hidden' />
<field name="financy_subject_code" code="financySubjectCode" type='hidden' />
<condition column="SYSTEM_FULL_ID" name="projectId" symbol="like"
alias="t" />
<!-- <condition column="FINANCY_SUBJECT_CODE" name="subjectCode" symbol="="
alias="t" />-->
<condition name="subjectCode" column="FINANCY_SUBJECT_CODE" alias="t"
symbol="" type="java.lang.String">
FIND_IN_SET(:subjectCode,FINANCY_SUBJECT_CODE)>0
</condition>
<condition column="BELONG_YEAR" name="belongYear" symbol="="
alias="t" />
<orderby> code asc</orderby>
</easy-search>
<easy-search name="systemSearch" desc="系统选择">
<sql>
select t.id,
t.full_id,
t.name,
t.code
from sa_oporg t
</sql>
<orderby>code asc</orderby>
<field name="systemId" code="id" type='hidden'/>
<field name="systemFullId" code="full_id" type='hidden'/>
<field name="systemName" code="name" width="220"/>
<field name="systemCode" code="code" type='hidden'/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-contract.xml deleted 100644 → 0
View file @ 339a0997
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="contractChoose" desc="合同选择">
<sql>select t.bill_code as code,
t.contract_name as name,
t.id,
t.purchase_approval_code,
t.fillin_date,
a.project_full_code,
t.PURCHASE_APPROVAL_ID
from ssrf_purchase_contract t, ssrf_purchase_approval a
where 1 = 1
and t.purchase_approval_id = a.id
and t.status = 3
and t.id not in (select s.PURCHASE_CONTRACT_ID from SSRF_QUALITY_ISSUE s )
</sql>
<orderby>fillin_date desc</orderby>
<field name="common.field.name" title="名称" code="name" width="200"/>
<field name="common.field.code" title="编码" code="code" width="200"/>
<field name="id" code="id" type='hidden'/>
<field name="projectFullCode" code="projectFullCode" type='hidden'/>
<field name="purchaseApprovalId" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" code="purchaseApprovalCode" type='hidden'/>
</easy-search>
<easy-search name="traceReportContractCode" desc="质量月报合同选择">
<sql>
select t.ID as purchaseApprovalId,
t.PURCHASE_APPROVAL_CODE,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME as professional,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.contract_limit,
c.contract_date,
c.fillin_date,
c.contract_type,
c.month_report_type,
c.BILL_CODE as code
from SSRF_PURCHASE_APPROVAL t
left join (select c.* from SSRF_PURCHASE_CONTRACT c where (c.CHANGE_TYPE = 0 or (c.CHANGE_TYPE = 3 and c.ID_OLD is not null))) c
on t.ID = c.PURCHASE_APPROVAL_ID
left join SSRF_CONTRACT_LEDGER l
on l.CONTRACT_ID = c.ID
where c.status = 3
and (t.PROJECT_TYPE = 'DKXGC' and c.AMOUNT_CONTRACT_SIGNED >= 500000 or (t.PROJECT_CODE = 'SHINE-Y' and c.is_month_report = '0'))
and c.id not in (select t.CONTRACT_ID
from SSRF_CONTRACT_TRACE_REPORT t
where t.status != 5
and DATE_FORMAT(t.fillin_date,'%Y%m') = DATE_FORMAT( CURDATE( ) , '%Y%m' )
)
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden'/>
<field name="standardKind" code="standardKind" type='hidden'/>
<field name="professional" code="professional" type='hidden'/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200"/>
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel"/>
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden'
dictionary="monetaryUnitType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden'/>
<field name="supplierName" title="供应商" code="supplierName" type='hidden'/>
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden'/>
<field name="amountContractSigned" code="amountContractSigned" type='hidden'/>
<field name="monthReportType" code="monthReportType" title="月报类型" width="200" type='hidden'/>
<field name="contractNumber" code="contractNumber" width="200" type='hidden'/>
<field name="采购流水号" title="采购流水号" code="purchaseApprovalCode" width="100"/>
<field name="合同名称" title="合同名称" code="contractName" width="200"/>
<field name="合同编号" code="code" title="合同编号" width="200"/>
<field name="合同类型" title="合同类型" code="contractType" type='hidden'/>
<field name="合同类型" title="合同类型" code="contractTypeTextView" dictionary="contractType" width="100"/>
<field name="标准" title="标准" code="standardKindTextView" dictionary="standardKind" width="100"/>
<field name="ssrf.acceptance.contractDate" title="合同签订时间" code="contractDate" width="200"/>
<field name="ssrf.acceptance.contractLimit" title="合同规定交付时间" code="contractLimit" width="200"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-hxAcceptance.xml deleted 100644 → 0
View file @ 339a0997
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="YXpurchaseContractCode" desc="重大专项验收申请合同选择">
<sql>
<!--<![CDATA[
select t.ID as purchaseApprovalId,
t.BILL_CODE as purchaseApprovalCode,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME as professional,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.fillin_date,
c.BILL_CODE as code
from SSRF_PURCHASE_CONTRACT c
left join SSRF_PURCHASE_APPROVAL t
on t.ID = c.PURCHASE_APPROVAL_ID
where c.status = 3
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_GENERAL_ACCEPTANCE_APPROV m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_ACCEPTANCE_APPROVAL m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_BATCH_ACCEPTANCE_APPROVAL m)
and t.PROJECT_CODE = 'YXZDZX'
and (t.standard_kind = 'standard'
and t.budget_mount >= 10000)
or (t.standard_kind = 'nostandard'
and t.budget_mount >= 20000)
]]>-->
select t.* from v_ssrf_yxacceptanceapply t where t.PROJECT_CODE='SHINE-Y' and (t.s1=1 or t.s2=1 or t.s3=1)
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden' />
<field name="code" code="code" type='hidden' />
<field name="standardKind" code="standardKindTextView" type='hidden' dictionary="standardKind"/>
<field name="standardKind" code="standardKind" type='hidden' dictionary="standardKind"/>
<field name="professional" code="professional" type='hidden'/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200" />
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel" />
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden' dictionary="CurrencyType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden' />
<field name="supplierName" title="供应商" code="supplierName" type='hidden' />
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden' />
<field name="ssrf.acceptance.contractAmount" title="合同金额" code="amountContractSigned" width="200"/>
<field name="ssrf.purchase.contract.contractNumber" title="合同编号" code="contractNumber" width="200" />
<field name="ssrf.acceptance.contractName" title="合同名称" code="contractName" width="200" />
<field name="ssrf.purchase.contract.dateContractSigned" title="合同签订时间" code="contractDate" width="200" />
</easy-search>
<easy-search name="YXOnePurchaseContractCode" desc="重大专项单个验收合同选择">
<sql>
select t.ID as purchaseApprovalId,
t.BILL_CODE as purchaseApprovalCode,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
<!-- t.MONETARY_UNIT_TYPE, -->
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME as professional,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.fillin_date,
c.contract_date,
c.BILL_CODE as code,
g.total_accept_number,
g.now_accept_number,
g.acceptance_method,
g.testing_leader,
g.technology_leader,
g.testing_result,
g.technology_result,
g.testing_date,
g.technology_date,
g.is_prototype,
g.id as apply_acceptance_id
from SSRF_PURCHASE_CONTRACT c
left join SSRF_PURCHASE_APPROVAL t
on t.ID = c.PURCHASE_APPROVAL_ID
left join SSRF_GENERAL_ACCEPTANCE_APPROV g
on c.PURCHASE_APPROVAL_ID = g.PURCHASE_APPROVAL_ID
where c.status = 3
<!--and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_GENERAL_ACCEPTANCE_APPROV m)-->
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_ACCEPTANCE_APPROVAL m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_BATCH_ACCEPTANCE_APPROVAL m)
<!--and c.AMOUNT_CONTRACT_SIGNED <![CDATA[ >= ]]> 1000000-->
and t.PROJECT_CODE = 'SHINE-Y'
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden' />
<field name="code" code="code" type='hidden' />
<field name="standardKind" code="standardKindTextView" type='hidden' dictionary="standardKind"/>
<field name="standardKind" code="standardKind" type='hidden' dictionary="standardKind"/>
<field name="professional" code="professional" type='hidden'/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200" />
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel" />
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden' dictionary="CurrencyType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden' />
<field name="supplierName" title="供应商" code="supplierName" type='hidden' />
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden' />
<field name="ssrf.acceptance.contractAmount" title="合同金额" code="amountContractSigned" width="200"/>
<field name="ssrf.purchase.contract.contractNumber" title="合同编号" code="contractNumber" width="200" />
<field name="ssrf.acceptance.contractName" title="合同名称" code="contractName" width="200" />
<field name="ssrf.purchase.contract.dateContractSigned" title="合同签订时间" code="contractDate" width="200" />
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethodTextView" width="200" type='hidden'/>
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethod" width="200" type='hidden'/>
<field name="testingLeader" title="测试组长" code="testingLeader" width="200" type='hidden'/>
<field name="technologyLeader" title="技术测试组长" code="technologyLeader" width="200" type='hidden'/>
<field name="testingResult" title="测试结果" code="testingResult" width="200" type='hidden'/>
<field name="technologyResult" title="技术测试结果" code="technologyResult" width="200" type='hidden'/>
<field name="testingDate" title="测试日期" code="testingDate" width="200" type='hidden'/>
<field name="technologyDate" title="技术验收日期" code="technologyDate" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototypeTextView" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototype" width="200" type='hidden'/>
<field name="totalAcceptNumber" title="总验收次数" code="totalAcceptNumber" width="200" type='hidden'/>
<field name="nowAcceptNumber" title="当前验收次数" code="nowAcceptNumber" width="200" type='hidden'/>
<field name="applyAcceptanceId" title="验收申请ID" code="applyAcceptanceId" width="200" type='hidden'/>
</easy-search>
<easy-search name="YXBatchPurchaseContractCode" desc="重大专项批量验收合同选择">
<sql>
select t.ID as purchaseApprovalId,
t.BILL_CODE as purchaseApprovalCode,
t.STANDARD_KIND,
t.PROJECT_NAME,
t.PROJECT_TYPE,
t.PURCHASE_CHANNEL,
t.PRODUCT_NAME_ZH as productName,
t.PRODUCT_NAME_EN as productNameEn,
t.DEVICE_OWNER,
t.DEVICE_OWNER_PHONE,
<!-- t.MONETARY_UNIT_TYPE, -->
t.PURCHASE_KIND,
t.BUDGET_FLAG,
t.PROJECT_CODE,
t.QUANTITY_NUM,
t.PROJECT_FULL_CODE,
t.SUPPLIER_NAME,
t.PROJECT_ORG_ID,
t.SYSTEM_ID,
t.SYSTEM_NAME as professional,
c.ID as purchaseContractId,
c.PROVIDER_SELLER,
c.AMOUNT_CONTRACT_SIGNED,
c.AMOUNT_FOREIGN_CURRENCY,
c.currency,
c.CONTRACT_NUMBER,
c.CONTRACT_NAME,
c.fillin_date,
c.contract_date,
g.total_accept_number,
g.now_accept_number,
c.BILL_CODE as code,
g.acceptance_method,
g.testing_leader,
g.technology_leader,
g.testing_result,
g.technology_result,
g.testing_date,
g.technology_date,
g.is_prototype,
g.id as apply_acceptance_id
from SSRF_PURCHASE_CONTRACT c
left join SSRF_PURCHASE_APPROVAL t
on t.ID = c.PURCHASE_APPROVAL_ID
left join SSRF_GENERAL_ACCEPTANCE_APPROV g
on c.PURCHASE_APPROVAL_ID = g.PURCHASE_APPROVAL_ID
where c.status = 3
<!--and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_GENERAL_ACCEPTANCE_APPROV m)-->
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_ACCEPTANCE_APPROVAL m)
and c.id not in
(select m.PURCHASE_CONTRACT_ID from SSRF_BATCH_ACCEPTANCE_APPROVAL m)
<!--and c.AMOUNT_CONTRACT_SIGNED <![CDATA[ >= ]]> 1000000-->
and t.PROJECT_CODE = 'SHINE-Y'
</sql>
<orderby>fillin_date desc</orderby>
<field name="purchaseApprovalId" title="采购申请id" code="purchaseApprovalId" type='hidden'/>
<field name="purchaseApprovalCode" title="采购申请code" code="purchaseApprovalCode" type='hidden'/>
<field name="id" code="purchaseContractId" type='hidden' />
<field name="code" code="code" type='hidden' />
<field name="standardKind" code="standardKindTextView" type='hidden' dictionary="standardKind"/>
<field name="standardKind" code="standardKind" type='hidden' dictionary="standardKind"/>
<field name="professional" code="professional" type='hidden'/>
<field name="ssrf.acceptance.projectName" title="项目名称" code="projectName" width="200" />
<field name="projectType" title="项目分类" code="projectType" width="200" type='hidden'/>
<field name="purchaseChannel" code="purchaseChannelTextView" type='hidden' dictionary="purchaseChannel" />
<field name="productName" title="产品名称" code="productName" width="200" type='hidden'/>
<field name="productNameEn" title="产品名称" code="productNameEn" width="200" type='hidden'/>
<field name="deviceOwner" title="设备负责人" code="deviceOwner" width="200" type='hidden'/>
<field name="deviceOwnerPhone" title="设备负责人电话" code="deviceOwnerPhone" width="200" type='hidden'/>
<field name="monetaryUnitType" title="外币币种" code="currencyTextView" type='hidden' dictionary="CurrencyType"/>
<field name="purchaseKind" title="采购方式" code="purchaseKind" width="200" type='hidden'/>
<field name="budgetFlag" title="预算标志" code="budgetFlag" width="200" type='hidden'/>
<field name="projectCode" title="项目code" code="projectCode" type='hidden' />
<field name="supplierName" title="供应商" code="supplierName" type='hidden' />
<field name="projectOrgId" title="编码" code="projectOrgId" width="200" type='hidden'/>
<field name="providerSeller" title="承制方名称" code="providerSeller" width="200" type='hidden'/>
<field name="amountForeignCurrency" code="amountForeignCurrency" type='hidden' />
<field name="ssrf.acceptance.contractAmount" title="合同金额" code="amountContractSigned" width="200"/>
<field name="ssrf.purchase.contract.contractNumber" code="contractNumber" title="合同编号" width="200" type='hidden'/>
<field name="ssrf.acceptance.contractName" title="合同名称" code="contractName" width="200" />
<field name="ssrf.purchase.contract.dateContractSigned" title="合同签订时间" code="contractDate" width="200" />
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethodTextView" width="200" type='hidden'/>
<field name="acceptanceMethod" title="验收模式" code="acceptanceMethod" width="200" type='hidden'/>
<field name="testingLeader" title="测试组长" code="testingLeader" width="200" type='hidden'/>
<field name="technologyLeader" title="技术测试组长" code="technologyLeader" width="200" type='hidden'/>
<field name="testingResult" title="测试结果" code="testingResult" width="200" type='hidden'/>
<field name="technologyResult" title="技术测试结果" code="technologyResult" width="200" type='hidden'/>
<field name="testingDate" title="测试日期" code="testingDate" width="200" type='hidden'/>
<field name="technologyDate" title="技术验收日期" code="technologyDate" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototypeTextView" width="200" type='hidden'/>
<field name="isPrototype" title="是否样机" code="isPrototype" width="200" type='hidden'/>
<field name="totalAcceptNumber" title="总验收次数" code="totalAcceptNumber" width="200" type='hidden'/>
<field name="nowAcceptNumber" title="当前验收次数" code="nowAcceptNumber" width="200" type='hidden'/>
<field name="applyAcceptanceId" title="验收申请ID" code="applyAcceptanceId" width="200" type='hidden'/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-product.xml
View file @ 141108bf
......@@ -3,19 +3,88 @@
<easy-search name="productCode" desc="产品">
<sql>
select p.product_id,p.product_name,p.product_code,pc.product_category_name,b.brand_code
from product p inner join product_category pc on(p.product_category_id=pc.product_category_id)
select p.product_id,p.product_name,p.product_code,p.product_category_name,b.brand_code
from product p
left join brand b on(b.brand_name=p.brand_name)
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品名称" title="产品名称" code="productName" width="200" />
<field name="产品编码" title="产品编码" code="productCode" width="200" />
<field name="产品类别" title="产品类别" code="productCategoryName" width="200" />
<field name="品牌客户编号" title="品牌客户编号" code="productCategoryName" width="200" />
<field name="品牌客户编号" title="品牌客户编号" code="brandName" width="200" />
<!-- <field name="版面" title="版面" code="productCategoryName" width="200" />-->
</easy-search>
<easy-search name="productCode2" desc="产品">
<sql>
select t.product_category_id, t.product_category_name from product_category t
</sql>
<field name="类型ID" title="类型ID" code="productCategoryId" width="200" />
<field name="产品名称" title="产品名称" code="productCategoryName" width="200" />
</easy-search>
<easy-search name="productTechnologyType" desc="产品">
<sql>
SELECT
t.product_id,
t.product_technology_id,
t.product_technology_name,
t.beer_plate_no,
t.gold_plate_no,
t.die_cut_plate_no,
t.copperp_resin_late_no,
t.net_plate_no,
t.product_technology_require,
t.package_style,
t.physical_test,
t.chemistry_test,
t.copperp_no,
t.color_no_card,
t.product_material,
t.plate_no,
t.plastic_bag_structure
FROM
product_technology t
</sql>
<field name="工艺制程" title="工艺制程" code="productTechnologyName" width="200" />
<field name="工艺ID" title="工艺ID" code="productTechnologyId" width="200" />
<field name="产品ID" title="产品ID" code="productId" type='hidden' />
<field code="beerPlateNo" type='hidden' />
<field code="goldPlateNo" type='hidden' />
<field code="beerPlateNo" type='hidden' />
<field code="dieCutPlateNo" type='hidden' />
<field code="copperpResinLateNo" type='hidden' />
<field code="netPlateNo" type='hidden' />
<field code="productTechnologyRequire" type='hidden' />
<field code="packageStyle" type='hidden' />
<field code="physicalTest" type='hidden' />
<field code="chemistryTest" type='hidden' />
<field code="productMaterial" type='hidden' />
<field code="copperpNo" type='hidden' />
<field code="colorNoCard" type='hidden' />
<field code="plateNo" type='hidden' />
<field code="plasticBagStructure" type='hidden' />
</easy-search>
<easy-search name="productFactoryName" desc="产品">
<sql>
select t.factory_code, t.factory_name from factory t
</sql>
<field name="工厂名称" title="工厂名称" code="factoryName" width="200" />
<field name="工厂编号" title="工厂编号" code="factoryCode" width="200" />
</easy-search>
<easy-search name="color" desc="颜色">
<sql>
select t.color_id, t.color_code, t.color_name from color t
</sql>
<field code="colorId" type='hidden' />
<field name="代码" title="代码" code="colorCode" width="200" />
<field name="颜色" title="颜色" code="colorName" width="200" />
</easy-search>
<easy-search name="productS" desc="产品">
<sql>
select pa.product_id,pm.proofing_make_no
......@@ -25,17 +94,16 @@
<field name="产品id" title="产品id" code="productId" width="200" />
</easy-search>
<easy-search name="productDetail" desc="产品详情">
<sql>
SELECT
pi.*,p.product_name,p.product_status,p.product_unit,p.brand_name,
pi.*,p.product_name,p.product_status,p.product_unit as product_buy_unit,p.brand_name,
p.is_build_bom, p.confirm_date,
p.comfirm_person, p.is_free_inspection, p.is_no_quality_loss, p.sample_order_no,
p.stock_no, p.stock_name, p.file_no,
pd.product_english_name,
wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group_id,
wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,wa.product_unit,
wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_name,
pl.proofing_make_looked_id, pl.is_output, pl.is_out, pl.is_change,
pl.plastic_bag_structure, pl.product_length, pl.product_width, pl.product_height,
......@@ -78,6 +146,9 @@
<field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
<field name="尺码组" title="尺码组" code="sizeGroupId" width="200" type='hidden'/>
<field name="采购换算值" title="采购换算值" code="matrixingValue" width="200" type='hidden'/>
<field name="采购单位" title="采购单位" code="productUnit" width="200" type='hidden'/>
<field name="单位" title="单位" code="productBuyUnit" width="200" type='hidden'/>
<field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
<field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
......@@ -95,7 +166,7 @@
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
<field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/>
<field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
<field name="模数" title="模数" code="modulus" width="200" type='hidden'/>
......
topsun/target/classes/config/content/easysearch/easy-search-provider.xml deleted 100644 → 0
View file @ 339a0997
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="providerNameChoose" desc="供应商选择" >
<sql>select t.* from ssrf_provider t </sql>
<!-- <field name="biz.ssrf.provider.entityName" title="供应商名称" code="entityName" width="200"/> -->
<field name="common.field.name" title="名称" code="name" width="300"/>
<field name="biz.ssrf.provider.isGyyCompany" title="是否高研院所属公司" code="isGyyCompany" type="hidden" width="300"/>
<field name="biz.ssrf.provider.isGyyCompany" title="是否高研院所属公司" code="isGyyCompanyTextView" dictionary="isGyyCompany" width="200"/>
<field name="关联法人单位" title="关联法人单位" code="relatedEntity" type="hidden" width="300"/>
<field name="关联法人单位" title="关联法人单位" code="relatedEntityTextView" dictionary="relatedEntity" width="200"/>
<field name="id" code="id" type='hidden' />
<condition column="name" name="entityName" symbol="like" alias="t"/>
</easy-search>
<easy-search name="agentChoose" desc="代理商选择" >
<sql>select t.* from ssrf_provider t where ENTITY_TYPE='AGENT'</sql>
<!-- <field name="biz.ssrf.provider.entityName" title="供应商名称" code="entityName" width="200"/> -->
<field name="common.field.name" title="名称" code="name" width="300"/>
<field name="id" code="id" type='hidden' />
<condition column="name" name="entityName" symbol="like" alias="t"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/customer/customerMapper.xml
View file @ 141108bf
......@@ -93,4 +93,27 @@
select t.* from monthly_settlement_method t where 1=1 order by t.sequence
</sql-query>
</query>
<query name="customerBrandList" label="查询用户品牌" table="customer_brand">
<sql-query>
select cd.* from customer_brand cd where customer_id = ?
</sql-query>
</query>
<query name="customerBankList" label="查询客户银行列表" table="customer_bank_list">
<sql-query>
select cbl.* from customer_bank_list cbl where customer_id = ?
</sql-query>
</query>
<query name="customerCompanyCodeList" label="公司代码列表" table="customer_company_code">
<sql-query>
select c.* from customer_company_code c where customer_id = ?
</sql-query>
</query>
<query name="customerSalesOrganizationList" label="销售组织列表" table="customer_sales_organization">
<sql-query>
select c.* from customer_sales_organization c where customer_id = ?
</sql-query>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/proofing/proofingApply.xml
View file @ 141108bf
......@@ -19,7 +19,7 @@
select
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
pa.customer_code,
pa.proofing_apply_page_need_time,
pa.proofing_apply_complete_date,
pa.proofing_apply_sample_cn_name,
......@@ -66,4 +66,10 @@
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingApplyBom" table="proofing_apply_bom">
<sql-query>
select t.* from proofing_apply_bom t
</sql-query>
<condition column="proofing_apply_id" name="proofingApplyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/proofing/proofingMake.xml
View file @ 141108bf
......@@ -39,4 +39,11 @@
<!-- work_instruction_apply wa-->
<!-- </sql-query>-->
<!-- </query>-->
<query name="slicedProofingMakeBom" table="proofing_make_bom">
<sql-query>
select t.* from proofing_make_bom t
</sql-query>
<condition column="proofing_make_id" name="proofingMakeId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/technology/technologyProcess.xml
View file @ 141108bf
......@@ -33,4 +33,17 @@
</sql-query>
</query>
<query name="slicedProcessForProduct" label="产品选择工艺制程带出工序">
<sql-query>
SELECT
tp.technology_id,
tp.sort_num as production_sequence,
p.process_name,
p.process_remark,
p.work_hours
FROM technology_process tp LEFT JOIN process p ON tp.process_id = p.process_id WHERE 1=1
</sql-query>
<condition column="technology_id" name="technologyId" symbol="=" alias="tp"/>
</query>
</query-mappings>
\ No newline at end of file
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