Skip to content

T
topsun-bpm
Commit 05120e95 authored by 覃振观's avatar 覃振观 👶
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 2b170650 a803dce1
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 518 deletions
topsun-xt/src/main/resources/i18n/attachmentExplain/application/AttachmentExplainApplication.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.application;
import com.huigou.topsun.base.attachmentExplain.domain.model.AttachmentExplain;
import com.huigou.topsun.base.attachmentExplain.domain.query.AttachmentExplainQueryRequest;
import java.util.List;
import java.util.Map;
/**
* 附件上传说明接口层
*
* @author
* @date 2018-04-02 14:20
*/
public interface AttachmentExplainApplication {
/*
* 查询文件
*/
String QUERY_XML_FILE_PATH = "config/topsun/base/attachmentExplain.xml";
/*
* 查询表 hxAttachmentExplain
*/
String QUERY_SSRF_ATTACHMENT_EXPLAIN = "attachmentExplain";
/**
* 保存 附件上传说明
*
* @author
* @param params
*/
String saveAttachmentExplain(AttachmentExplain attachmentExplain);
/**
* 加载 附件上传说明
*
* @author
* @return SDO
*/
AttachmentExplain loadAttachmentExplain(String id);
/**
* 删除 附件上传说明
*
* @author
*/
void deleteAttachmentExplain(List<String> ids);
/**
* 修改状态
*/
void updateAttachmentExplainStatus(List<String> ids, Integer status);
/**
* 查询 附件上传说明
*
* @author
* @return SDO
*/
Map<String, Object> slicedQueryAttachmentExplain(AttachmentExplainQueryRequest queryRequest);
AttachmentExplain loadAttachmentExplainByCode(String code);
}
topsun-xt/src/main/resources/i18n/attachmentExplain/application/impl/AttachmentExplainApplicationImpl.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.application.impl;
import com.huigou.context.MessageSourceContext;
import com.huigou.data.domain.model.CommonDomainConstants;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.base.attachmentExplain.application.AttachmentExplainApplication;
import com.huigou.topsun.base.attachmentExplain.domain.model.AttachmentExplain;
import com.huigou.topsun.base.attachmentExplain.domain.query.AttachmentExplainQueryRequest;
import com.huigou.topsun.base.attachmentExplain.repository.AttachmentExplainRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.List;
import java.util.Map;
/**
* 附件上传说明实现层
*
* @ClassName: SsrfAttachmentExplainApplicationImpl
* @author
* @date 2018-04-02 14:20
* @version V1.0
*/
@Service("attachmentExplainApplication")
public class AttachmentExplainApplicationImpl extends BaseApplication implements AttachmentExplainApplication {
@Autowired
private AttachmentExplainRepository attachmentExplainRepository;
@Override
@Transactional
public String saveAttachmentExplain(AttachmentExplain attachmentExplain) {
Assert.notNull(attachmentExplain, CommonDomainConstants.OBJECT_NOT_NULL);
attachmentExplain = (AttachmentExplain) this.commonDomainService.loadAndFillinProperties(attachmentExplain);
attachmentExplain = (AttachmentExplain) this.commonDomainService.saveBaseInfoEntity(attachmentExplain, attachmentExplainRepository);
return attachmentExplain.getId();
}
@Override
public AttachmentExplain loadAttachmentExplain(String id) {
Assert.hasText(id, CommonDomainConstants.ID_NOT_BLANK);
return attachmentExplainRepository.findOne(id);
}
@Override
@Transactional
public void deleteAttachmentExplain(List<String> ids) {
List<AttachmentExplain> objs = attachmentExplainRepository.findAll(ids);
attachmentExplainRepository.delete(objs);
}
@Override
public Map<String, Object> slicedQueryAttachmentExplain(AttachmentExplainQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, QUERY_SSRF_ATTACHMENT_EXPLAIN);
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor, queryRequest);
}
@Transactional(rollbackFor = RuntimeException.class)
@Override
public void updateAttachmentExplainStatus(List<String> ids, Integer status) {
this.checkIdsNotEmpty(ids);
Assert.notNull(status, MessageSourceContext.getMessage("status.not.blank"));
this.commonDomainService.updateStatus(AttachmentExplain.class, ids, status);
}
@Override
public AttachmentExplain loadAttachmentExplainByCode(String code) {
Assert.hasText(code, CommonDomainConstants.CODE_NOT_BLANK);
List<AttachmentExplain> datas = attachmentExplainRepository.findByCode(code);
Assert.notEmpty(datas, String.format("未找到%s对应的附件说明!", code));
return datas.get(0);
}
}
topsun-xt/src/main/resources/i18n/attachmentExplain/controller/AttachmentExplainController.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.controller;
import com.huigou.topsun.base.attachmentExplain.application.AttachmentExplainApplication;
import com.huigou.topsun.base.attachmentExplain.domain.model.AttachmentExplain;
import com.huigou.topsun.base.attachmentExplain.domain.query.AttachmentExplainQueryRequest;
import com.huigou.topsun.common.YesOrNo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.uasp.log.annotation.LogInfo;
import com.huigou.uasp.log.domain.model.LogType;
import com.huigou.uasp.log.domain.model.OperationType;
import com.huigou.util.SDO;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.List;
import java.util.Map;
/**
* 附件上传说明控制层
*
* @ClassName: AttachmentExplainController
* @author
* @date 2018-04-02 14:20
* @version V1.0
*/
@Controller
@ControllerMapping("attachmentExplain")
public class AttachmentExplainController extends CommonController {
@Autowired
private AttachmentExplainApplication attachmentExplainApplication;
protected String getPagePath() {
return "/biz/topsun/base/attachmentExplain/";
}
@RequiresPermissions("AttachmentExplain:query")
public String forwardListAttachmentExplain() {
return forward("topsunAttachmentExplainList");
}
@RequiresPermissions("AttachmentExplain:query")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询附件上传说明")
public String slicedQueryAttachmentExplain() {
SDO sdo = this.getSDO();
AttachmentExplainQueryRequest queryRequest = sdo.toQueryRequest(AttachmentExplainQueryRequest.class);
Map<String, Object> data = attachmentExplainApplication.slicedQueryAttachmentExplain(queryRequest);
return toResult(data);
}
@RequiresPermissions("AttachmentExplain:create")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.DETALL, description = "跳转到新增附件上传说明")
public String showInsertAttachmentExplain() {
this.putAttribute("status", YesOrNo.YES.getId());
return forward("topsunAttachmentExplainDetail");
}
@RequiresPermissions("AttachmentExplain:create")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.ADD, description = "新增保存附件上传说明")
public String insertAttachmentExplain() {
SDO sdo = this.getSDO();
AttachmentExplain attachmentExplain = sdo.toObject(AttachmentExplain.class);
String id = attachmentExplainApplication.saveAttachmentExplain(attachmentExplain);
return success(id);
}
@RequiresPermissions("AttachmentExplain:update")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.DETALL, description = "跳转到编辑附件上传说明")
public String showLoadAttachmentExplain() {
SDO sdo = this.getSDO();
String id = sdo.getId();
AttachmentExplain attachmentExplain = attachmentExplainApplication.loadAttachmentExplain(id);
return forward("attachmentExplainDetail", attachmentExplain);
}
@RequiresPermissions("AttachmentExplain:update")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.UPDATE, description = "新增修改附件上传说明")
public String updateAttachmentExplain() {
SDO sdo = this.getSDO();
AttachmentExplain attachmentExplain = sdo.toObject(AttachmentExplain.class);
attachmentExplainApplication.saveAttachmentExplain(attachmentExplain);
return success();
}
@RequiresPermissions("AttachmentExplain:delete")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.DELETE, description = "删除附件上传说明")
public String deleteAttachmentExplain() {
SDO sdo = this.getSDO();
List<String> ids = sdo.getStringList("ids");
attachmentExplainApplication.deleteAttachmentExplain(ids);
return success();
}
@RequiresPermissions("AttachmentExplain:update")
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.DELETE, description = "修改附件上传状态")
public String updateAttachmentExplainStatus() {
SDO sdo = this.getSDO();
List<String> ids = sdo.getStringList("ids");
Integer status = sdo.getInteger("status");
attachmentExplainApplication.updateAttachmentExplainStatus(ids, status);
return success();
}
public String showAttachmentExplain() {
SDO sdo = this.getSDO();
String code = sdo.getString("code");
AttachmentExplain attachmentExplain = attachmentExplainApplication.loadAttachmentExplainByCode(code);
return forward("attachmentExplain", attachmentExplain);
}
public String showAttachmentExplainList() {
this.putAttribute("bizId", "attachmentExplainId");
return forward("attachmentExplainList");
}
public String showViewAttachmentExplainList() {
this.putAttribute("bizId", "attachmentExplainId");
this.putAttribute("isReadOnly", "true");
return forward("attachmentExplainList");
}
public String showAttachmentManagementMethods() {
this.putAttribute("bizId", "attachmentManagementMethods");
this.putAttribute("bizCode", "managementMethods");
this.putAttribute("isWrap", true);
return forward("/biz/topsun/common/attachment.jsp");
}
}
topsun-xt/src/main/resources/i18n/attachmentExplain/domain/model/AttachmentExplain.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.domain.model;
import com.huigou.data.domain.model.BaseInfoAbstractEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 附件上传说明
*
* @author
* SSRF_ATTACHMENT_EXPLAIN
* @date 2018-04-02 14:20
*/
@Entity
@Table(name = "ATTACHMENT_EXPLAIN")
public class AttachmentExplain extends BaseInfoAbstractEntity {
private static final long serialVersionUID = 1L;
/**
* content
**/
@Column(name = "content", length = 2500)
private String content;
public String getContent() {
return this.content;
}
public void setContent(String content) {
this.content = content;
}
}
topsun-xt/src/main/resources/i18n/attachmentExplain/domain/query/AttachmentExplainQueryRequest.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
/**
* 附件上传说明
*
* @author
* TECH_HX_ATTACHMENT_EXPLAIN
* @date 2018-04-02 14:20
*/
public class AttachmentExplainQueryRequest extends QueryAbstractRequest {
/**
* code
**/
protected String code;
/**
* name
**/
protected String name;
/**
* status
**/
protected Integer status;
public String getCode() {
return this.code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public Integer getStatus() {
return this.status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
topsun-xt/src/main/resources/i18n/attachmentExplain/repository/AttachmentExplainRepository.java deleted 100644 → 0
View file @ 2b170650
package com.huigou.topsun.base.attachmentExplain.repository;
import com.huigou.topsun.base.attachmentExplain.domain.model.AttachmentExplain;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* 附件上传说明Repository
*
* @author
* @date 2018-04-02 14:20
*/
public interface AttachmentExplainRepository extends JpaRepository<AttachmentExplain, String> {
List<AttachmentExplain> findByCode(String code);
}
topsun-xt/src/main/resources/i18n/topsun_en.properties
View file @ 05120e95
topsun.AttachmentExplain.title=Description of Filling in Document and Uploading Attachment
topsun.AttachmentExplain.link=URL for Downloading Attachment Template
\ No newline at end of file
topsun.AttachmentExplain.link=URL for Downloading Attachment Template
#工艺管理
topsun.technology.manager=Technology Manager
topsun.technology.add=Add Technology
topsun.technology.update=Update Technology
topsun.technology.detail=Technology Detail
topsun.technology.technologyName=Technology Route Name
topsun.technology.productName=Product
topsun.technology.technologyVersion=Technology Version
topsun.technology.technologyType=Technology Type
#工序管理
topsun.process.manager=Process Manager
topsun.process.add=Add Process
topsun.process.update=Update Process
topsun.process.detail=Process Detail
topsun.process.sortNum=Process sortNum
topsun.process.processName=Process Name
topsun.process.processType=Process Type
topsun.process.workHours=Process Work Hours
topsun.process.processContent=Process Content
topsun.process.processRemark=Process Remark
topsun.process.resource=Process Resource
topsun.process.material=Process Material
topsun.process.resource.name=Process Resource Name
topsun.process.resource.version=Process Resource Version
topsun.process.material.name=Material Name
topsun.process.material.unit=Material Unit
topsun.process.material.number=Material Used Number
topsun.process.material.content=Material Content
topsun-xt/src/main/resources/i18n/topsun_zh.properties
View file @ 05120e95
topsun.AttachmentExplain.title=单据填写及附件上传说明
topsun.AttachmentExplain.link=附件模板下载链接
\ No newline at end of file
topsun.AttachmentExplain.link=附件模板下载链接
#工艺管理
topsun.technology.manager=工艺管理
topsun.technology.add=新增工艺
topsun.technology.update=修改工艺
topsun.technology.detail=工艺详情
topsun.technology.technologyName=工艺路线名称
topsun.technology.productName=产品
topsun.technology.technologyVersion=工艺版本
topsun.technology.technologyType=工艺类型
#工序管理
topsun.process.manager=工序管理
topsun.process.add=新增工序
topsun.process.update=修改工序
topsun.process.detail=工序详情
topsun.process.sortNum=序号
topsun.process.processName=工序名称
topsun.process.processType=工序类型
topsun.process.workHours=工时
topsun.process.processContent=工序内容
topsun.process.processRemark=工序说明
topsun.process.resource=工序资源
topsun.process.material=工序物料
topsun.process.resource.name=资源名称
topsun.process.resource.version=资源版本
topsun.process.material.name=物料名称
topsun.process.material.unit=物料计量单位
topsun.process.material.number=物料使用数量
topsun.process.material.content=物料相关内容
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.js
View file @ 05120e95
......@@ -154,10 +154,10 @@ function loadProofingApplyListGrid() {
}
function query(obj) {
debugger
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
......@@ -166,50 +166,6 @@ function resetForm(obj) {
$(obj).formClean();
}
// function addHandler() {
// UICtrl.showAjaxDialog({
// url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
// title: "新增打样制造单",
// width: 1000,
// ok: function (div) {
// var _self = this;
// $('#submitForm', div).ajaxSubmit({
// url: web_app.name + '/proofingMake/saveProofingMake.ajax',
// success: function () {
// _self.close();
// reloadGrid();
// }
// });
// }
// });
// }
// function updateHandler(proofingMakeId) {
// if (!proofingMakeId) {
// console.log(gridManager)
// //获取所选行id
// proofingMakeId = DataUtil.getUpdateRowId(gridManager);
// if (!proofingMakeId) {
// return;
// }
// }
// UICtrl.showAjaxDialog({
// url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
// title: "修改打样制造单",
// width: 1000,
// param: {id: proofingMakeId},
// ok: function (div) {
// var _self = this;
// $('#submitForm', div).ajaxSubmit({
// url: web_app.name + '/proofingMake/saveProofingMake.ajax',
// success: function () {
// _self.close();
// reloadGrid();
// }
// });
// }
// });
// }
//重写DataUtil的getUpdateRowId函数、它默认取行的id列
DataUtil.getUpdateRowId = function (gridManager) {
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.jsp
View file @ 05120e95
......@@ -16,7 +16,7 @@
<div position="center" title="打样申请查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.jsp
View file @ 05120e95
......@@ -16,7 +16,7 @@
<div position="center" title="打样制造">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="制造单号" labelCol="1"/>
<x:inputC name="proofingMakeNo" required="false" label="制造单号" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.jsp
View file @ 05120e95
......@@ -42,9 +42,9 @@
fieldCol="2"/>
<x:inputC name="sizeGroupId" label="尺码组" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:inputC name="isOnlyCode" label="唯一码产品" maxLength="32" labelCol="1"
<x:selectC name="isOnlyCode" label="唯一码产品" dictionary="yesorno" labelCol="1"
fieldCol="2"/>
<x:inputC name="isBodyColor" label="不考虑形体配色" maxLength="32" labelCol="1"
<x:selectC name="isBodyColor" label="不考虑形体配色" dictionary="yesorno" labelCol="1"
fieldCol="2"/>
<x:selectC name="isDisable" label="是否禁用" dictionary="yesorno" labelCol="1"
fieldCol="2"/>
......@@ -65,7 +65,7 @@
fieldCol="2"/>
<x:inputC name="fileNo" label="存档编号" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:inputC name="barnd" label="品牌" maxLength="32" labelCol="1"
<x:inputC name="brand" label="品牌" maxLength="32" labelCol="1"
fieldCol="2"/>
</div>
<x:title title="可选属性" name="group"/>
......@@ -117,11 +117,11 @@
fieldCol="2"/>
<x:inputC name="productSysCertification" label="体系认证" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:inputC name="storeName" label="仓库" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:selectC name="storeHouse" label="仓库" labelCol="1" dictionary="storeName"
fieldCol="2"/>
<x:inputC name="productBuyUnit" label="单位" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:inputC name="isBodyColor" label="采购换算值" maxLength="32" labelCol="1"
<x:inputC name="matrixingValue" label="采购换算值" maxLength="32" labelCol="1"
fieldCol="2"/>
<x:inputC name="isBodyColor" label="系数" maxLength="32" labelCol="1"
fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.jsp
View file @ 05120e95
......@@ -42,7 +42,7 @@
fieldCol="2"/>
<x:inputC name="productEnName" label="产品英文名称" maxLength="32" labelCol="2"
fieldCol="2"/>
<x:inputC name="storeHouse" label="仓库" maxLength="32" labelCol="2"
<x:selectC name="storeHouse" label="仓库" labelCol="2" dictionary="storeName"
fieldCol="2"/>
<x:inputC name="sizeGroup" label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/>
<x:selectC name="isDisable" label="是否禁用" dictionary="yesorno" labelCol="2" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApplyList.js
View file @ 05120e95
......@@ -18,6 +18,7 @@ function loadWorkInstructionApplyListGrid() {
});
gridManager = UICtrl.grid("#workInstructionApplyTableGrid", {
columns: [
{display: "指导申请书编号", name: "workInstructionApplyId", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格书编号", name: "specificationNo", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "换算值", name: "matrixingValue", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "尺码组", name: "sizeGroup", width: 120, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApplyList.jsp
View file @ 05120e95
......@@ -16,7 +16,7 @@
<div position="center" title="作业申请书">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="作业指导申请书" labelCol="1"/>
<x:inputC name="workInstructionApplyId" required="false" label="作业指导申请书" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionList.jsp
View file @ 05120e95
......@@ -16,7 +16,7 @@
<div position="center" title="作业指导书">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="作业指导书" labelCol="1"/>
<x:inputC name="workInstructionBaseInfoId" required="false" label="作业指导书" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/technology/processDetail.js
View file @ 05120e95
......@@ -32,7 +32,7 @@ function loadResourceGrid() {
});
resourceGridManager = UICtrl.grid("#resourceGrid", {
columns: [
{ display: "资源名称", name: "resourceName", width: 200, minWidth: 60, type: "string", align: "left",
{ display: "topsun.process.resource.name", name: "resourceName", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
......@@ -49,7 +49,7 @@ function loadResourceGrid() {
},
}
},
{ display: "版本", name: "version", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.resource.version", name: "version", width: 200, minWidth: 60, type: "string", align: "left" },
],
dataAction: "server",
url: web_app.name + '/process/slicedProcessResourceList.ajax',
......@@ -95,7 +95,7 @@ function loadProcessMaterialGrid() {
});
processMaterialGridManager = UICtrl.grid("#processMaterialGrid", {
columns: [
{ display: "物料名称", name: "materialName", width: 200, minWidth: 60, type: "string", align: "left",
{ display: "topsun.process.material.name", name: "materialName", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
......@@ -110,15 +110,15 @@ function loadProcessMaterialGrid() {
},
}
},
{ display: "物料计量单位", name: "materialUnit", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "使用物料数量", name: "materialNumber", width: 100, minWidth: 60, type: "string", align: "left" ,
{ display: "topsun.process.material.unit", name: "materialUnit", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.material.number", name: "materialNumber", width: 100, minWidth: 60, type: "string", align: "left" ,
editor: {
type: 'text',
mask: 'positiveMoney',
required: true
}
},
{ display: "物料相关内容", name: "materialJson", width: 400, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.material.content", name: "materialJson", width: 400, minWidth: 60, type: "string", align: "left" },
],
dataAction: "server",
url: web_app.name + '/process/slicedProcessMaterialItems.ajax',
......@@ -192,7 +192,7 @@ function saveData(action) {
Public.ajax(web_app.name + '/process/saveProcess.ajax?code=' + action,processDetail,
function (data) {
setId(data.processId);
Public.successTip("数据保存成功");
Public.successTip("common.tip.success");
processGridManager.setParm('processId', data.processId);
processGridManager.loadData();
}
......
topsun-xt/src/main/webapp/biz/topsun/technology/processDetail.jsp
View file @ 05120e95
......@@ -5,9 +5,10 @@
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/>
<x:script src='/biz/topsun/technology/processDetail.js'/>
<x:i18n name="topsun"/>
</head>
<body>
<x:billTitle title="工序详情" needStatus="false" needPerson="true"/>
<x:billTitle title="topsun.process.detail" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div>
<button class="btn btn-default" type="button" id="close" style="left: 200px;float:right;bottom: 10px;">关闭</button>
<button class="btn btn-warning" type="button" id="submit" style="left: 200px;float:right;bottom: 10px;">提交</button>
......@@ -15,17 +16,17 @@
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="processId"/>
<div class="hg-form-row">
<x:inputC name="processName" required="true" label="工序名称" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="processType" required="true" label="工序类别" labelCol="2" dictionary="processType" fieldCol="4"/>
<x:inputC name="processContent" required="true" label="工序内容" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="workHours" required="true" label="工时" labelCol="2" mask="nnnn.nn" dataOptions="min:0" maxLength="32" fieldCol="4"/>
<x:inputC name="processRemark" required="false" label="工序说明" labelCol="2" maxLength="32" fieldCol="10"/>
<x:inputC name="processName" required="true" label="topsun.process.processName" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="processType" required="true" label="topsun.process.processType" labelCol="2" dictionary="processType" fieldCol="4"/>
<x:inputC name="processContent" required="true" label="topsun.process.processContent" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="workHours" required="true" label="topsun.process.workHours" labelCol="2" mask="nnnn.nn" dataOptions="min:0" maxLength="32" fieldCol="4"/>
<x:inputC name="processRemark" required="false" label="topsun.process.processRemark" labelCol="2" maxLength="32" fieldCol="10"/>
</div>
<div class="blank_div clearfix"></div>
<x:title title="工序资源" name="group" hideTable="#info"/>
<x:title title="topsun.process.resource" name="group" hideTable="#info"/>
<div id="resourceGrid" style="margin: 2px;"></div>
<div class="blank_div clearfix"></div>
<x:title title="工序物料" name="group" hideTable="#info"/>
<x:title title="topsun.process.material" name="group" hideTable="#info"/>
<div id="processMaterialGrid" style="margin: 2px;"></div>
</form>
</body>
......
topsun-xt/src/main/webapp/biz/topsun/technology/processList.js
View file @ 05120e95
......@@ -22,11 +22,11 @@ function loadProcessListGrid() {
});
gridManager = UICtrl.grid("#processListGrid", {
columns: [
{ display: "工序名称", name: "processName", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "工序类别", name: "processTypeTextView", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "工时", name: "workHours", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "工序内容", name: "processContent", width: 300, minWidth: 60, type: "string", align: "left" },
{ display: "工序说明", name: "processRemark", width: 300, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.processName", name: "processName", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.processType", name: "processTypeTextView", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.workHours", name: "workHours", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.processContent", name: "processContent", width: 300, minWidth: 60, type: "string", align: "left" },
{ display: "topsun.process.processRemark", name: "processRemark", width: 300, minWidth: 60, type: "string", align: "left" },
],
dataAction: "server",
url: web_app.name + '/process/slicedProcessList.ajax',
......@@ -76,7 +76,7 @@ function addHandler(){
});*/
UICtrl.addTabItem({
tabid: 'processDetail',
text: "新增工序",
text: $.i18nProp("topsun.process.add"),
url: web_app.name + '/process/addProcessDetail.do'
})
}
......@@ -105,7 +105,7 @@ function updateHandler(row){
});*/
UICtrl.addTabItem({
tabid: 'processDetail'+row.processId,
text: "修改工序",
text: $.i18nProp("topsun.process.update"),
url: web_app.name + '/process/showProcessDetail.do?processId='+row.processId
})
}
......
topsun-xt/src/main/webapp/biz/topsun/technology/processList.jsp
View file @ 05120e95
......@@ -3,8 +3,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/technology/processList.js'/>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/technology/processList.js'/>
<x:i18n name="topsun"/>
</head>
<body>
<div class="container-fluid">
......@@ -13,15 +14,13 @@
<x:select name="yesorno" dictionary="yesorno" />
</div>
<div id="layout">
<div position="center" title="工序管理">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="processName" required="false" label="工序名称" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="processListGrid" style="margin: 2px;"></div>
</div>
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="processName" required="false" label="topsun.process.processName" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="processListGrid" style="margin: 2px;"></div>
</div>
</div>
</body>
......
topsun-xt/src/main/webapp/biz/topsun/technology/technologyDetail.js
View file @ 05120e95
......@@ -25,11 +25,11 @@ function loadProcessListGrid() {
});
processGridManager = UICtrl.grid("#processListGrid", {
columns: [
{display: "序号", name: "sortNum", width: 80, minWidth: 60, type: "string", align: "left",
{display: "topsun.process.sortNum", name: "sortNum", width: 80, minWidth: 60, type: "string", align: "left",
editor: { type: 'spinner', min: 1, max: 100, mask: 'nnn'}
},
{
display: "工序名称", name: "processName", width: 120, minWidth: 60, type: "string", align: "left",
display: "topsun.process.processName", name: "processName", width: 120, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
......@@ -48,7 +48,7 @@ function loadProcessListGrid() {
}
},
{
display: "工序类别",
display: "topsun.process.processType",
name: "processTypeTextView",
width: 120,
minWidth: 60,
......@@ -62,7 +62,7 @@ function loadProcessListGrid() {
}*/
},
{
display: "工时", name: "workHours", width: 120, minWidth: 60, type: "number", align: "left",
display: "topsun.process.workHours", name: "workHours", width: 120, minWidth: 60, type: "number", align: "left",
/*editor: {
required: true,
type: 'text',
......@@ -70,14 +70,14 @@ function loadProcessListGrid() {
}*/
},
{
display: "工序内容", name: "processContent", width: 180, minWidth: 60, type: "string", align: "left",
display: "topsun.process.processContent", name: "processContent", width: 180, minWidth: 60, type: "string", align: "left",
/*editor: {
required: true,
type: 'text'
}*/
},
{
display: "工序说明", name: "processRemark", width: 180, minWidth: 60, type: "string", align: "left",
display: "topsun.process.processRemark", name: "processRemark", width: 180, minWidth: 60, type: "string", align: "left",
/*editor: {
required: true,
type: 'text'
......@@ -153,7 +153,7 @@ function saveData(action) {
Public.ajax(web_app.name + '/technology/saveTechnology.ajax?code=' + action,technologyDetail,
function (data) {
setId(data.technologyId);
Public.successTip("数据保存成功");
Public.successTip("common.tip.success");
processGridManager.setParm('technologyId', data.technologyId);
processGridManager.loadData();
}
......
topsun-xt/src/main/webapp/biz/topsun/technology/technologyDetail.jsp
View file @ 05120e95
......@@ -5,10 +5,11 @@
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/technology/technologyDetail.js'/>
<x:i18n name="topsun"/>
</head>
<body>
<%--<div class="container-fluid">--%>
<x:billTitle title="工艺详情" needStatus="false" needPerson="true"/>
<x:billTitle title="topsun.technology.detail" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div>
<button class="btn btn-default" type="button" id="close" style="left: 200px;float:right;bottom: 10px;">关闭</button>
<button class="btn btn-warning" type="button" id="submit" style="left: 200px;float:right;bottom: 10px;">提交</button>
......@@ -17,10 +18,10 @@
<x:hidden name="technologyId" />
<x:hidden name="productId"/>
<div class="hg-form-row">
<x:inputC name="technologyName" required="true" label="工艺路线名称" labelCol="2" maxLength="64" fieldCol="4" />
<x:selectC name="technologyType" required="true" label="工艺类型" labelCol="2" dictionary="technologyType" fieldCol="4" />
<x:inputC name="productName" required="true" label="产品" wrapper="select" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="technologyVersion" required="false" label="工艺版本" labelCol="2" maxLength="32" fieldCol="4" />
<x:inputC name="technologyName" required="true" label="topsun.technology.technologyName" labelCol="2" maxLength="64" fieldCol="4" />
<x:selectC name="technologyType" required="true" label="topsun.technology.technologyType" labelCol="2" dictionary="technologyType" fieldCol="4" />
<x:inputC name="productName" required="true" label="topsun.technology.productName" wrapper="select" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="technologyVersion" required="false" label="topsun.technology.technologyVersion" labelCol="2" maxLength="32" fieldCol="4" />
</div>
<div class="blank_div clearfix"></div>
<x:title title="工序设置" name="group" hideTable="#info" />
......
topsun-xt/src/main/webapp/biz/topsun/technology/technologyList.js
View file @ 05120e95
......@@ -22,11 +22,11 @@ function loadTechnologyListGrid() {
});
gridManager = UICtrl.grid("#technologyListGrid", {
columns: [
{display: "工艺路线名称", name: "technologyName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "产品ID", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "工艺版本", name: "technologyVersion", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "topsun.technology.technologyName", name: "technologyName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "topsun.technology.productName", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "topsun.technology.technologyVersion", name: "technologyVersion", width: 120, minWidth: 60, type: "string", align: "left"},
{
display: "工艺类型",
display: "topsun.technology.technologyType",
name: "technologyTypeTextView",
width: 100,
minWidth: 60,
......@@ -86,7 +86,7 @@ function addHandler() {
});*/
UICtrl.addTabItem({
tabid: 'technologyDetail',
text: "新增工艺",
text: $.i18nProp("topsun.technology.add"),
url: web_app.name + '/technology/addTechnologyDetail.do'
})
}
......@@ -118,8 +118,8 @@ function updateHandler(row) {
}
});*/
UICtrl.addTabItem({
tabid: 'technologyDetail',
text: "新增工艺",
tabid: 'technologyDetail'+row.technologyId,
text: $.i18nProp("topsun.technology.update"),
url: web_app.name + '/technology/showTechnologyDetail.do?technologyId='+row.technologyId
})
}
......
topsun-xt/src/main/webapp/biz/topsun/technology/technologyList.jsp
View file @ 05120e95
......@@ -3,8 +3,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/technology/technologyList.js'/>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/technology/technologyList.js'/>
<x:i18n name="topsun"/>
</head>
<body>
<div class="container-fluid">
......@@ -13,15 +14,13 @@
<x:select name="yesorno" dictionary="yesorno" />
</div>
<div id="layout">
<div position="center" title="工艺管理">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="工艺名称" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="technologyListGrid" style="margin: 2px;"></div>
</div>
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="technologyName" required="false" label="topsun.technology.technologyName" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="technologyListGrid" style="margin: 2px;"></div>
</div>
</div>
</body>
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyQuery.java
View file @ 05120e95
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
import com.topsunit.query.annotations.Dictionary;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
@Data
public class ProofingApplyQuery extends FlowBillSuperQueryRequest {
/**
* 申请单id
*/
private String proofingApplyId;
/**
* 申请单号
*/
private String proofingApplyNo;
/**
* 产品id
*/
private String productCode;
/**
* 产品id
*/
private String productId;
/**
* 品牌客户编号
*/
private String customerCode;
/**
* 客户id
*/
private String customerId;
/**
* 版面
*/
private String page;
/**
* 版面需求时间
*/
private Date proofingApplyPageNeedTime;
/**
* 完成日期
*/
private Date proofingApplyCompleteDate;
/**
* 样品中文名称
*/
private String proofingApplySampleCnName;
/**
* 样品英文名称
*/
private String proofingApplySampleEnName;
/**
* 样品版次
*/
private Integer proofingApplySampleVersion;
/**
* 样品规格
*/
private Integer proofingApplySampleSize;
/**
* 样品数量
*/
private Long proofingApplySampleNum;
/**
* 产量情况
*/
private String proofingApplyOutputSituation;
/**
* 产品代号
*/
private String proofingApplyProductNo;
/**
* 打样形式
*/
private String proofingType;
/**
* 分配方式
*/
private String proofingApplyAllocationType;
/**
* 产品类别名称
*/
private String productCategoryName;
/**
* 表面处理
*/
private String proofingApplySurfaceTreatment;
/**
* NG重新打样原因
*/
private String proofingApplyNgReReason;
/**
* 申请单状态
*/
private String proofingApplyApplicationStatus;
/**
* 测试标准
*/
private String proofingApplyTestStandard;
}
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/WorkInstructionVo.java
View file @ 05120e95
......@@ -110,7 +110,7 @@ public class WorkInstructionVo {
/**
* 品牌
*/
private String barnd;
private String brand;
private String workInstructionMaterialInfoId;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionBaseInfo.java
View file @ 05120e95
......@@ -140,7 +140,7 @@ public class WorkInstructionBaseInfo implements Serializable {
/**
* 品牌
*/
private String barnd;
private String brand;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/query/WorkInstructionBaseInfoQueryRequest.java
View file @ 05120e95
......@@ -117,6 +117,6 @@ public class WorkInstructionBaseInfoQueryRequest extends QueryAbstractRequest {
/**
* 品牌
*/
private String barnd;
private String brand;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/util/MyBaseUtil.java
View file @ 05120e95
......@@ -60,7 +60,7 @@ public class MyBaseUtil {
WorkInstructionMaterialInfo workInstructionMaterialInfo = new WorkInstructionMaterialInfo();
workInstructionMaterialInfo.setBomNo("hhhh");
WorkInstructionBaseInfo workInstructionBaseInfo = new WorkInstructionBaseInfo();
workInstructionBaseInfo.setBarnd("wwwwww");
workInstructionBaseInfo.setBrand("wwwwww");
MyBaseUtil.mergeObjects(workInstructionVo, workInstructionMaterialInfo, workInstructionBaseInfo,null);
......
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml
View file @ 05120e95
......@@ -28,16 +28,6 @@
<easy-search name="productDetail" desc="产品详情">
<sql>
<!-- SELECT-->
<!-- p.product_code,p.product_name, pc.product_category_name,pl.*,-->
<!-- ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf,-->
<!-- pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name-->
<!-- FROM product p-->
<!-- LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id-->
<!-- LEFT JOIN product_detail pd ON pd.product_id = p.product_id-->
<!-- LEFT JOIN product_looked pl ON pl.product_id = p.product_id-->
<!-- LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id-->
<!-- LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id-->
SELECT
pi.*,p.product_name,p.product_status,p.product_unit,p.brand_name,
p.is_build_bom, p.confirm_date,
......@@ -46,7 +36,7 @@
pd.product_english_name,
wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group,
wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
wa.is_attached_sample, wa.is_only_code, wa.is_body_color,
wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_house,
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,
pl.product_thick, pl.product_single_layer, pl.product_layer_num, pl.sample_shape,
......@@ -81,8 +71,8 @@
<field name="库存编码" title="库存编码" code="stockNo" width="200" type='hidden'/>
<field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
<field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
<field name="品牌" title="品牌" code="barnd" width="200" type='hidden'/>
<field name="品牌" title="品牌" code="brand" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeHouse" width="200" type='hidden'/>
<field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
<field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
......@@ -99,8 +89,9 @@
<field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/>
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeName" 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'/>
<field name="行数" title="行数" code="rowNum" width="200" type='hidden'/>
......
topsun/src/main/resources/config/topsun/proofing/proofingApply.xml
View file @ 05120e95
......@@ -4,9 +4,10 @@
<query name="slicedQuery" table="proofing_apply">
<sql-query>
select t.* from proofing_apply_base_info t
<!-- where 1=1-->
where 1=1
</sql-query>
<!-- <permissions>-->
<condition column="proofing_apply_No" name="proofingApplyNo" type="java.lang.String" symbol="like" alias="t"/>
<!-- <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>-->
<!-- <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>-->
<!-- </permissions>-->
......
topsun/src/main/resources/config/topsun/proofing/proofingMake.xml
View file @ 05120e95
......@@ -9,6 +9,7 @@
proofing_make_base_info pm
where pm.is_delete = 0
</sql-query>
<condition column="proofing_make_no" name="proofingMakeNo" type="java.lang.String" symbol="like" alias="pm"/>
</query>
<query name="slicedProofingMakeTechnology" table="proofing_Make_technology">
<sql-query>
......
topsun/src/main/resources/config/topsun/proofing/workInstruction.xml
View file @ 05120e95
......@@ -7,6 +7,8 @@
wi.*
FROM
work_instruction_base_info wi
where 1=1
</sql-query>
<condition column="work_instruction_base_info_id" name="workInstructionBaseInfoId" type="java.lang.String" symbol="like" alias="wi"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/proofing/workInstructionApply.xml
View file @ 05120e95
......@@ -11,5 +11,6 @@
on wa.proofing_make_id= pi.proofing_make_id
where wa.is_delete = 0 and pi.is_delete=0
</sql-query>
<condition column="work_instruction_apply_id" name="workInstructionApplyId" type="java.lang.String" symbol="like" alias="wa"/>
</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