Skip to content

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

改动

parent eb248650
Show whitespace changes
Inline Side-by-side
Showing with 236 additions and 83 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ 55069726
...@@ -15,7 +15,7 @@ function initialize(){ ...@@ -15,7 +15,7 @@ function initialize(){
//绑定selectC //绑定selectC
function bindQueryEvent() { function bindQueryEvent() {
$('#productId').searchbox({ $('#productCode').searchbox({
type: "product", type: "product",
name: "productCode", name: "productCode",
onChange: function (value, data) { onChange: function (value, data) {
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp
View file @ 55069726
...@@ -26,10 +26,11 @@ ...@@ -26,10 +26,11 @@
<div><h3>基本信息</h3></div> <div><h3>基本信息</h3></div>
<div style="margin: 10px;"> <div style="margin: 10px;">
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="proofingApplyNo" label="申请单号" maxLength="32" labelCol="1" <x:inputC name="proofingApplyNo" label="申请单号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:hidden name="productId"/>
<x:inputC name="productId" wrapper="select" label="产品编号" labelCol="1" fieldCol="2"/> <x:inputC name="productCode" wrapper="select" label="产品编号" labelCol="1" fieldCol="2"/>
<x:inputC name="customerId" label="品牌客户编号" labelCol="1" fieldCol="2"/> <x:inputC name="customerId" label="品牌客户编号" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.js
View file @ 55069726
...@@ -18,8 +18,8 @@ function loadProofingApplyListGrid() { ...@@ -18,8 +18,8 @@ function loadProofingApplyListGrid() {
gridManager = UICtrl.grid("#proofingApplyTableGrid", { gridManager = UICtrl.grid("#proofingApplyTableGrid", {
columns: [ columns: [
{display: "申请单号", name: "proofingApplyNo", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "申请单号", name: "proofingApplyNo", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "品牌客户编号", name: "customerId", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "品牌客户编号", name: "customerCode", width: 140, minWidth: 60, type: "string", align: "left"},
{ {
display: "版面需求时间", display: "版面需求时间",
name: "proofingApplyPageNeedTime", name: "proofingApplyPageNeedTime",
...@@ -101,7 +101,7 @@ function loadProofingApplyListGrid() { ...@@ -101,7 +101,7 @@ function loadProofingApplyListGrid() {
type: "string", type: "string",
align: "left" align: "left"
}, },
{display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left"}, // {display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left"},
{ {
display: "表面处理", display: "表面处理",
name: "proofingApplySurfaceTreatment", name: "proofingApplySurfaceTreatment",
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ 55069726
...@@ -30,6 +30,7 @@ function bindQueryEvent() { ...@@ -30,6 +30,7 @@ function bindQueryEvent() {
$('#proofingApplyNo').searchbox({ $('#proofingApplyNo').searchbox({
type: "proofing", name: "proofingApplyCode", type: "proofing", name: "proofingApplyCode",
onChange: function (value, data) { onChange: function (value, data) {
$('#productCode').val(data.productCode);
ajaxRenderDataGoForm(data.proofingApplyNo); ajaxRenderDataGoForm(data.proofingApplyNo);
showTechnologyTable(data.productId); showTechnologyTable(data.productId);
} }
...@@ -38,10 +39,19 @@ function bindQueryEvent() { ...@@ -38,10 +39,19 @@ function bindQueryEvent() {
function saveForm(){ function saveForm(){
let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
let processResult = DataUtil.getGridData({
gridManager: processObj.gridManager,
isAllData: true
});
var extendedData = {};
extendedData.technology = Public.encodeJSONURI(technologyResult);
extendedData.process = Public.encodeJSONURI(processResult);
var _self=this; var _self=this;
$('#submitForm').ajaxSubmit({ $('#submitForm').ajaxSubmit({
url : web_app.name + '/proofingMake/saveProofingMake.ajax', url : web_app.name + '/proofingMake/saveProofingMake.ajax',
param:{}, param:extendedData,
success : function(data) { success : function(data) {
if (data == "1"){ if (data == "1"){
Public.successTip("保存成功！"); Public.successTip("保存成功！");
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @ 55069726
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<x:billTitle title="打样制造单" needStatus="false" needPerson="true"/> <x:billTitle title="打样制造单" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<div><h3>基本信息</h3></div> <div><h3>基本信息</h3></div>
<div style="margin: 10px;"> <div style="margin: 10px;">
<div class="hg-form-cols"> <div class="hg-form-cols">
...@@ -20,10 +21,10 @@ ...@@ -20,10 +21,10 @@
<x:inputC name="proofingMakeNo" label="制造单号" labelCol="1" fieldCol="2"/> <x:inputC name="proofingMakeNo" label="制造单号" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyNo" wrapper="select" label="申请单号" maxLength="32" labelCol="1" <x:inputC name="proofingApplyNo" wrapper="select" label="申请单号" labelCol="1" fieldCol="2"/>
fieldCol="2"/>
<x:inputC name="productId" label="产品编号" labelCol="1" fieldCol="2"/>
<x:hidden name="productId"/>
<x:inputC name="productCode" label="产品编号" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="customerId" label="品牌客户编号" labelCol="1" fieldCol="2"/> <x:inputC name="customerId" label="品牌客户编号" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingMakePageNeedTime" label="版面需求时间" wrapper="date" <x:inputC name="proofingMakePageNeedTime" label="版面需求时间" wrapper="date"
labelCol="1" fieldCol="2"/> labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.js
View file @ 55069726
...@@ -17,12 +17,12 @@ function loadTechnologyListGrid() { ...@@ -17,12 +17,12 @@ function loadTechnologyListGrid() {
gridManager = UICtrl.grid("#proofingMakeTableGrid", { gridManager = UICtrl.grid("#proofingMakeTableGrid", {
columns: [ columns: [
{display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请单号", name: "proofingApplyNo", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "申请单号", name: "applicationNo", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "品牌客户编号", name: "customerId", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "品牌客户编号", name: "customerCode", width: 140, minWidth: 60, type: "string", align: "left"},
{ {
display: "版面需求时间", display: "版面需求时间",
name: "proofingApplyPageNeedTime", name: "proofingMakePageNeedTime",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -30,7 +30,7 @@ function loadTechnologyListGrid() { ...@@ -30,7 +30,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "完成日期", display: "完成日期",
name: "proofingApplyCompleteDate", name: "proofingMakeCompleteDate",
width: 140, width: 140,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -38,7 +38,7 @@ function loadTechnologyListGrid() { ...@@ -38,7 +38,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "样品中文名称", display: "样品中文名称",
name: "proofingApplySampleCnName", name: "proofingMakeSampleCnName",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -46,7 +46,7 @@ function loadTechnologyListGrid() { ...@@ -46,7 +46,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "样品英文名称", display: "样品英文名称",
name: "proofingApplySampleEnName", name: "proofingMakeSampleEnName",
width: 140, width: 140,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -54,7 +54,7 @@ function loadTechnologyListGrid() { ...@@ -54,7 +54,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "样品版次", display: "样品版次",
name: "proofingApplySampleVersion", name: "proofingMakeSampleVersion",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -62,7 +62,7 @@ function loadTechnologyListGrid() { ...@@ -62,7 +62,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "样品规格", display: "样品规格",
name: "proofingApplySampleSize", name: "proofingMakeSampleSize",
width: 140, width: 140,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -70,7 +70,7 @@ function loadTechnologyListGrid() { ...@@ -70,7 +70,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "样品数量", display: "样品数量",
name: "proofingApplySampleNum", name: "proofingMakeSampleNum",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -78,7 +78,7 @@ function loadTechnologyListGrid() { ...@@ -78,7 +78,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "产量情况", display: "产量情况",
name: "proofingApplyOutputSituation", name: "proofingMakeOutputSituation",
width: 140, width: 140,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -86,7 +86,7 @@ function loadTechnologyListGrid() { ...@@ -86,7 +86,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "产品代号", display: "产品代号",
name: "proofingApplyProductNo", name: "proofingMakeProductNo",
width: 140, width: 140,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -101,7 +101,7 @@ function loadTechnologyListGrid() { ...@@ -101,7 +101,7 @@ function loadTechnologyListGrid() {
type: "string", type: "string",
align: "left" align: "left"
}, },
{display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left"}, // {display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left"},
{ {
display: "表面处理", display: "表面处理",
name: "proofingApplySurfaceTreatment", name: "proofingApplySurfaceTreatment",
...@@ -112,7 +112,7 @@ function loadTechnologyListGrid() { ...@@ -112,7 +112,7 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "NG重新打样原因", display: "NG重新打样原因",
name: "proofingApplyNgReReason", name: "proofingMakeNgReReason",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
...@@ -128,18 +128,18 @@ function loadTechnologyListGrid() { ...@@ -128,18 +128,18 @@ function loadTechnologyListGrid() {
}, },
{ {
display: "申请单状态", display: "申请单状态",
name: "proofingApplyApplicationStatus", name: "proofingMakeApplicationStatus",
width: 120, width: 120,
minWidth: 60, minWidth: 60,
type: "string", type: "string",
align: "left" align: "left"
}, }
{display: "颜色种类", name: "colorType", width: 120, minWidth: 60, type: "string", align: "left"}, // ,{display: "颜色种类", name: "colorType", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "专", name: "expert", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "专", name: "expert", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "网版目数", name: "printingPlateNum", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "网版目数", name: "printingPlateNum", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "啤版目数", name: "beerPlateNum", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "啤版目数", name: "beerPlateNum", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "模切板模数", name: "dieBoardNum", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "模切板模数", name: "dieBoardNum", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "标准色号", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left"}, // {display: "标准色号", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left"},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/proofingMake/slicedQueryProofingList.ajax', url: web_app.name + '/proofingMake/slicedQueryProofingList.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ 55069726
...@@ -156,6 +156,15 @@ function loadProofingApplyGrid(obj) { ...@@ -156,6 +156,15 @@ function loadProofingApplyGrid(obj) {
// } // }
function showTable(proofingApplyId){
technologyObj.parms={proofingApplyId:proofingApplyId}
technologyObj.url="";
loadProofingApplyGrid(technologyObj);
loadProofingApplyGrid(processObj);
}
//展示工艺表格 //展示工艺表格
function showTechnologyTable(productId){ function showTechnologyTable(productId){
if(technologyObj.gridManager!=null){ if(technologyObj.gridManager!=null){
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.js
View file @ 55069726
...@@ -4,7 +4,7 @@ $(document).ready(function () { ...@@ -4,7 +4,7 @@ $(document).ready(function () {
//绑定selectC //绑定selectC
function bindQueryEvent() { function bindQueryEvent() {
$('#productId').searchbox({ $('#productCode').searchbox({
type: "product", name: "productDetail", type: "product", name: "productDetail",
onChange: function (value, data) { onChange: function (value, data) {
$('#submitForm').formSet(data); $('#submitForm').formSet(data);
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.jsp
View file @ 55069726
...@@ -8,12 +8,15 @@ ...@@ -8,12 +8,15 @@
<x:script src='/biz/topsun/proofing/workInstruction.js'/> <x:script src='/biz/topsun/proofing/workInstruction.js'/>
<div class="container-fluid" style="padding: 10px;"> <div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:billTitle title="作业指导书" needStatus="false" needPerson="true"/> <x:billTitle title="作业指导书" needStatus="false" needPerson="true"/>
<div style="margin: 10px;"> <div style="margin: 10px;">
<x:title title="基本信息" name="group"/> <x:title title="基本信息" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:hidden name="workInstructionApplyId"/> <x:hidden name="workInstructionApplyId"/>
<x:inputC name="productId" label="产品编号" wrapper="select" labelCol="1" fieldCol="2"/>
<x:hidden name="productId"/>
<x:inputC name="productCode" label="产品编号" wrapper="select" labelCol="1" fieldCol="2"/>
<x:inputC name="productName" label="产品名称" labelCol="1" fieldCol="2"/> <x:inputC name="productName" label="产品名称" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.js
View file @ 55069726
...@@ -4,7 +4,7 @@ $(document).ready(function () { ...@@ -4,7 +4,7 @@ $(document).ready(function () {
//绑定selectC //绑定selectC
function bindQueryEvent() { function bindQueryEvent() {
$('#productId').searchbox({ $('#productCode').searchbox({
type: "proofing", name: "proofingMakeCode", type: "proofing", name: "proofingMakeCode",
onChange: function (value, data) { onChange: function (value, data) {
$('#submitForm').formSet(data); $('#submitForm').formSet(data);
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.jsp
View file @ 55069726
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
<x:hidden name="proofingMakeId"/> <x:hidden name="proofingMakeId"/>
<x:inputC name="workInstructionApplyId" readonly="true" label="指导书编号" labelCol="2" fieldCol="2"/> <x:inputC name="workInstructionApplyId" readonly="true" label="指导书编号" labelCol="2" fieldCol="2"/>
<x:inputC name="productId" label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/> <x:hidden name="productId"/>
<x:inputC name="productCode" label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/>
<x:inputC name="specificationNo" label="规格书编号" labelCol="2" fieldCol="2"/> <x:inputC name="specificationNo" label="规格书编号" labelCol="2" fieldCol="2"/>
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyTechnologyApplication.java 0 → 100644
View file @ 55069726
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import java.util.Map;
public interface ProofingApplyTechnologyApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingApply.xml";
Map<String, Object> slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest query);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java
View file @ 55069726
...@@ -21,6 +21,7 @@ import com.huigou.uasp.bmp.common.BizBillStatus; ...@@ -21,6 +21,7 @@ import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker; import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper; import com.huigou.util.ClassHelper;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
...@@ -87,6 +88,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -87,6 +88,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
} }
String id = UUID.randomUUID().toString().replace("-", ""); String id = UUID.randomUUID().toString().replace("-", "");
proofingApply.setProofingApplyId(id); proofingApply.setProofingApplyId(id);
proofingApply.setProofingApplyApplicationStatus(StringUtil.isBlank(proofingApply.getProofingApplyNgReReason())?"normal":"cancel");
proofingApply = proofingApplyRepository.save(proofingApply); proofingApply = proofingApplyRepository.save(proofingApply);
proofingApplyLooked.setProofingApplyId(proofingApply.getProofingApplyId()); proofingApplyLooked.setProofingApplyId(proofingApply.getProofingApplyId());
...@@ -180,4 +182,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -180,4 +182,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
public ProofingApplyBaseInfo selectProofingApplyByProofingApplyNo(String proofingApplyNo) { public ProofingApplyBaseInfo selectProofingApplyByProofingApplyNo(String proofingApplyNo) {
return proofingApplyRepository.findByProofingApplyNo(proofingApplyNo); return proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
} }
} }
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyTechnologyApplicationImpl.java 0 → 100644
View file @ 55069726
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import java.util.Map;
public class ProofingApplyTechnologyApplicationImpl extends BaseApplication implements ProofingApplyTechnologyApplication {
@Override
public Map<String, Object> slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingApplyTechnology");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java
View file @ 55069726
package com.huigou.topsun.proofing.application.impl; package com.huigou.topsun.proofing.application.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.data.query.model.QueryDescriptor; import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingMakeApplication; import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo; import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeBaseInfo; import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyProcess;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeLooked; import com.huigou.topsun.proofing.domain.model.proofingApply.proofingApplyTechnology;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakePdPublishedConf; import com.huigou.topsun.proofing.domain.model.proofingMake.*;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest; import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo; import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingApplyRepository; import com.huigou.topsun.proofing.repository.*;
import com.huigou.topsun.proofing.repository.ProofingMakeLookedRepository;
import com.huigou.topsun.proofing.repository.ProofingMakePdPublishedConfRepository;
import com.huigou.topsun.proofing.repository.ProofingMakeRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication; import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -40,7 +42,12 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo ...@@ -40,7 +42,12 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
ProofingMakeLookedRepository proofingMakeLookedRepository; ProofingMakeLookedRepository proofingMakeLookedRepository;
@Autowired @Autowired
ProofingMakePdPublishedConfRepository proofingMakePdPublishedConfRepository; ProofingMakePdPublishedConfRepository proofingMakePdPublishedConfRepository;
@Autowired
ProofingMakeTechnologyRepository proofingMakeTechnologyRepository;
@Autowired
ProofingMakeProcessRepository proofingMakeProcessRepository;
@Autowired
ProofingMakeProcessMaterialRepository proofingMakeProcessMaterialRepository;
@Override @Override
...@@ -53,14 +60,16 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo ...@@ -53,14 +60,16 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
* 编辑打样制造及相关信息 * 编辑打样制造及相关信息
* @param sdo 打样制造及相关信息 * @param sdo 打样制造及相关信息
*/ */
@SneakyThrows
@Transactional(propagation = Propagation.REQUIRES_NEW) @Transactional(propagation = Propagation.REQUIRES_NEW)
@Override @Override
public void saveProofingMake(SDO sdo) { public void saveProofingMake(SDO sdo) {
ProofingMakeBaseInfo proofingMake = sdo.toObject(ProofingMakeBaseInfo.class); ProofingMakeBaseInfo proofingMakeBaseInfo = sdo.toObject(ProofingMakeBaseInfo.class);
ProofingMakeLooked proofingMakeLooked = sdo.toObject(ProofingMakeLooked.class); ProofingMakeLooked proofingMakeLooked = sdo.toObject(ProofingMakeLooked.class);
ProofingMakePdPublishedConf proofingMakePdPublishedConf = sdo.toObject(ProofingMakePdPublishedConf.class); ProofingMakePdPublishedConf proofingMakePdPublishedConf = sdo.toObject(ProofingMakePdPublishedConf.class);
ProofingMakeBaseInfo proofingMakeBaseInfo = proofingMakeRepository.save(proofingMake); proofingMakeBaseInfo.setProofingMakeApplicationStatus(StringUtil.isBlank(proofingMakeBaseInfo.getProofingMakeNgReReason())?"normal":"cancel");
proofingMakeBaseInfo = proofingMakeRepository.save(proofingMakeBaseInfo);
proofingMakeLooked.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId()); proofingMakeLooked.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
proofingMakeLookedRepository.save(proofingMakeLooked); proofingMakeLookedRepository.save(proofingMakeLooked);
...@@ -68,6 +77,19 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo ...@@ -68,6 +77,19 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
proofingMakePdPublishedConf.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId()); proofingMakePdPublishedConf.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
proofingMakePdPublishedConfRepository.save(proofingMakePdPublishedConf); proofingMakePdPublishedConfRepository.save(proofingMakePdPublishedConf);
String technologyJSON = sdo.getString("technology");
String processJSON = sdo.getString("process");
ObjectMapper objectMapper = new ObjectMapper();
ProofingMakeTechnology proofingMakeTechnology = objectMapper.readValue(technologyJSON, ProofingMakeTechnology.class);
List<ProofingMakeProcess> ProcessList = objectMapper.readValue(processJSON, new TypeReference<List<ProofingMakeProcess>>() {});
proofingMakeTechnology.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
proofingMakeTechnology = proofingMakeTechnologyRepository.save(proofingMakeTechnology);
for (ProofingMakeProcess proofingMakeProcess : ProcessList) {
proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingTechnologyId());
proofingMakeProcessRepository.save(proofingMakeProcess);
}
} }
@Override @Override
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ 55069726
...@@ -42,7 +42,10 @@ public class ProofingApplyController extends CommonController { ...@@ -42,7 +42,10 @@ public class ProofingApplyController extends CommonController {
@Resource @Resource
private TechnologyProcessApplication technologyProcessApplication; private TechnologyProcessApplication technologyProcessApplication;
/**
* 打样申请详情
* @return
*/
public String slicedProofingApplyList(){ public String slicedProofingApplyList(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
ProofingApplyQuery queryRequest = sdo.toQueryRequest(ProofingApplyQuery.class); ProofingApplyQuery queryRequest = sdo.toQueryRequest(ProofingApplyQuery.class);
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ 55069726
...@@ -104,4 +104,11 @@ public class ProofingMakeController extends CommonController { ...@@ -104,4 +104,11 @@ public class ProofingMakeController extends CommonController {
} }
public String queryProofingApplyTechnology(){
SDO sdo = this.getSDO();
String proofingApplyNo = sdo.getString("proofingApplyNo");
}
} }
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeBaseInfo.java
View file @ 55069726
...@@ -48,10 +48,10 @@ public class ProofingMakeBaseInfo implements Serializable { ...@@ -48,10 +48,10 @@ public class ProofingMakeBaseInfo implements Serializable {
private String applicationNo; private String applicationNo;
/** /**
* 产品编号 * 产品Id
*/ */
@Column(name = "product_code") @Column(name = "product_id")
private String productCode; private String productId;
/** /**
* 品牌客户编号 * 品牌客户编号
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeTechnology.java
View file @ 55069726
package com.huigou.topsun.proofing.domain.model.proofingMake; package com.huigou.topsun.proofing.domain.model.proofingMake;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
...@@ -13,6 +14,7 @@ import java.io.Serializable; ...@@ -13,6 +14,7 @@ import java.io.Serializable;
@Table(name="proofing_make_technology") @Table(name="proofing_make_technology")
@Entity @Entity
@Data @Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ProofingMakeTechnology implements Serializable { public class ProofingMakeTechnology implements Serializable {
/** /**
* 打样工艺id * 打样工艺id
...@@ -25,7 +27,7 @@ public class ProofingMakeTechnology implements Serializable { ...@@ -25,7 +27,7 @@ public class ProofingMakeTechnology implements Serializable {
name = "system-uuid", name = "system-uuid",
strategy = "guid" strategy = "guid"
) )
@Column(name = "proofing_technology_id") @Column(name = "proofing_apply_technology_id")
private String proofingTechnologyId; private String proofingTechnologyId;
/** /**
...@@ -34,6 +36,12 @@ public class ProofingMakeTechnology implements Serializable { ...@@ -34,6 +36,12 @@ public class ProofingMakeTechnology implements Serializable {
@Column(name = "technology_id") @Column(name = "technology_id")
private String technologyId; private String technologyId;
/**
* 工艺名称
*/
@Column(name = "technology_name")
private String technologyName;
/** /**
* 打样制作单id * 打样制作单id
*/ */
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/proofingApplyTechnologyQueryRequest.java 0 → 100644
View file @ 55069726
package com.huigou.topsun.proofing.domain.query;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
* 打样申请工艺
* @TableName proofing_technology
*/
@Data
public class proofingApplyTechnologyQueryRequest extends QueryAbstractRequest {
/**
* 打样工艺id
*/
private String proofingApplyTechnologyId;
/**
* 打样申请单id
*/
private String proofingApplyId;
/**
* 工艺id
*/
private String technologyId;
/**
* 工艺名称
*/
private String technologyName;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeProcessMaterialRepository.java 0 → 100644
View file @ 55069726
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeProcessMaterial;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakeProcessMaterialRepository extends JpaRepository<ProofingMakeProcessMaterial, String> {
}
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeTechnologyRepository.java 0 → 100644
View file @ 55069726
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeTechnology;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakeTechnologyRepository extends JpaRepository<ProofingMakeTechnology,String> {
}
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml
View file @ 55069726
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
<easy-search name="productCode" desc="产品"> <easy-search name="productCode" desc="产品">
<sql> <sql>
select p.product_id,p.product_name,pc.product_category_name,b.brand_code 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) from product p inner join product_category pc on(p.product_category_id=pc.product_category_id)
left join brand b on(b.brand_name=p.brand_name) left join brand b on(b.brand_name=p.brand_name)
</sql> </sql>
<field name="产品id" title="产品id" code="productId" width="200" /> <field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品名称" title="产品名称" code="productName" 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="productCategoryName" width="200" /> <field name="品牌客户编号" title="品牌客户编号" code="productCategoryName" width="200" />
<!-- <field name="版面" title="版面" code="productCategoryName" width="200" />--> <!-- <field name="版面" title="版面" code="productCategoryName" width="200" />-->
......
topsun/src/main/resources/config/content/easysearch/easy-search-proofing.xml
View file @ 55069726
...@@ -2,9 +2,15 @@ ...@@ -2,9 +2,15 @@
<easy-search-mappings> <easy-search-mappings>
<easy-search name="proofingApplyCode" desc="订单"> <easy-search name="proofingApplyCode" desc="订单">
<sql>select p.proofing_apply_no,p.product_id from proofing_apply_base_info p</sql> <sql>
select pa.proofing_apply_no,pa.product_id,p.product_code
from proofing_apply_base_info pa
inner join product p on(pa.product_id=p.product_id)
where pa.proofing_apply_application_status ='normal'
</sql>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" /> <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="产品编号" title="产品编号" code="productId" width="200" /> <field name="产品Id" title="产品Id" code="productId" width="200" type="hidden"/>
<field name="产品编号" title="产品编号" code="productCode" width="200" />
</easy-search> </easy-search>
<easy-search name="proofingMakeCode" desc="订单"> <easy-search name="proofingMakeCode" desc="订单">
...@@ -34,19 +40,23 @@ ...@@ -34,19 +40,23 @@
pm.proofing_make_id, pm.proofing_make_id,
pm.product_id, pm.product_id,
pm.proofing_make_sample_cn_name, pm.proofing_make_sample_cn_name,
pm.proofing_make_sample_en_name pm.proofing_make_sample_en_name,
p.product_code
FROM FROM
proofing_make_base_info pm proofing_make_base_info pm
inner join product p on(pm.product_id=p.product_id)
where pm.proofing_make_application_status ="normal"
</sql> </sql>
<field name="产品编号" title="产品编号" code="productId" width="200" /> <field name="产品Id" title="产品Id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" />
<field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" /> <field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" />
<field name="制作id" title="制作id" code="proofingMakeId" width="200" type="hidden"/> <field name="制作id" title="制作id" code="proofingMakeId" width="200" type="hidden"/>
<!-- <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />--> <!-- <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />-->
<!-- <field name="类型" title="类型" code="productType" width="200" type="hidden"/>--> <!-- <field name="类型" title="类型" code="productType" width="200" type="hidden"/>-->
<!-- <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>--> <!-- <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>-->
<field name="名称" title="名称" code="productName" width="200" type="hidden"/> <field name="名称" title="名称" code="proofingMakeSampleCnName" width="200" type="hidden"/>
<field name="英文名称" title="英文名称" code="productEnglishName" width="200" type="hidden"/> <field name="英文名称" title="英文名称" code="proofingMakeSampleEnName" width="200" type="hidden"/>
<!-- <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>--> <!-- <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>-->
</easy-search> </easy-search>
......
topsun/src/main/resources/config/topsun/proofing/proofingApply.xml
View file @ 55069726
...@@ -103,5 +103,14 @@ ...@@ -103,5 +103,14 @@
</query> </query>
<query name="slicedProofingApplyTechnology" table="proofing_make_technology">
<sql-query>
select t.* from proofing_make_technology t where 1=1
</sql-query>
<permissions>
<condition column="proofing_apply_id" name="proofingApplyId" type="java.lang.String" symbol="=" alias="t"/>
</permissions>
</query>
</query-mappings> </query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/proofing/proofingMake.xml
View file @ 55069726
...@@ -4,32 +4,9 @@ ...@@ -4,32 +4,9 @@
<query name="slicedProofingMakeList" table="proofing_apply"> <query name="slicedProofingMakeList" table="proofing_apply">
<sql-query> <sql-query>
SELECT SELECT
pm.*, pm.*
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
pa.proofing_apply_page_need_time,
pa.proofing_apply_complete_date,
pa.proofing_apply_sample_cn_name,
pa.proofing_apply_sample_en_name,
pa.proofing_apply_sample_version,
pa.proofing_apply_sample_size,
pa.proofing_apply_sample_num,
pa.proofing_apply_output_situation,
pa.proofing_apply_product_no,
pa.proofing_type,
pa.proofing_apply_allocation_type,
pa.proofing_apply_surface_treatment,
pa.proofing_apply_ng_re_reason,
pa.proofing_apply_application_status,
pa.proofing_apply_test_standard,
pa.is_output,
pa.is_out,
pa.is_change
FROM FROM
proofing_make_base_info pm proofing_make_base_info pm
JOIN
proofing_apply_base_info pa ON pm.proofing_apply_id = pa.proofing_apply_id
</sql-query> </sql-query>
</query> </query>
......
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