Skip to content

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

工序物料

parent 0b5a985d
Hide whitespace changes
Inline Side-by-side
Showing with 808 additions and 260 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ f030eb31
......@@ -52,29 +52,15 @@ function ajaxRenderDataGoForm(params){
function getExtendedData(processAction) {
debugger
//回退、打回、转交时，不需要验证必填项是否已经填写；
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
|| processAction == ProcessAction.TRANSMIT) {
//不验证
//不验证
$('#submitForm').attr('check', false);
}
return getTableResult();
let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
if(!technologyResult){
alert("请选择工艺！")
return false;
}
let processResult = DataUtil.getGridData({
gridManager: processObj.gridManager,
isAllData: true
});
// let processBomResult = DataUtil.getUpdateRow(processBomObj.gridManager); // 获取选中行
var extendedData = {};
extendedData.technology = Public.encodeJSONURI(technologyResult);
extendedData.process = Public.encodeJSONURI(processResult);
// extendedData.processBom = Public.encodeJSONURI(processBomResult);
}
return extendedData;
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ f030eb31
......@@ -14,12 +14,8 @@ function initialize() {
let isDetailPage = ($("#isDetailPage").val() === "true");
if (isDetailPage) {
let proofingApplyNo = $("#proofingApplyNo").val();
let productId = $("#productId").val();
if (proofingApplyNo != null && proofingApplyNo !== '') {
ajaxRenderDataGoForm(proofingApplyNo);
}
if (productId != null && productId !== '') {
// showTechnologyTable(productId);
showTable({proofingMakeId:$("#proofingMakeId").val()});
}
$("#formButton").hide();
......@@ -33,7 +29,7 @@ function bindQueryEvent() {
onChange: function (value, data) {
$('#productCode').val(data.productCode);
ajaxRenderDataGoForm(data.proofingApplyNo);
showTable(data.proofingApplyId);
showTable({proofingApplyId:data.proofingApplyId});
}
});
}
......@@ -43,19 +39,11 @@ function bindQueryEvent() {
* @returns {boolean}
*/
function saveForm() {
let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
if (!technologyResult) {
alert("请选择工艺！")
return false;
}
let processResult = DataUtil.getGridData({
gridManager: processObj.gridManager,
isAllData: true
});
debugger
let extendedData= getTableResult();
if(!extendedData) return false;
var extendedData = {};
extendedData.technology = Public.encodeJSONURI(technologyResult);
extendedData.process = Public.encodeJSONURI(processResult);
var _self = this;
$('#submitForm').ajaxSubmit({
url: web_app.name + '/proofingMake/saveProofingMake.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.js
View file @ f030eb31
......@@ -17,7 +17,7 @@ function loadTechnologyListGrid() {
gridManager = UICtrl.grid("#proofingMakeTableGrid", {
columns: [
{display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请单号", name: "applicationNo", 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: "customerCode", width: 140, minWidth: 60, type: "string", align: "left"},
{
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ f030eb31
......@@ -92,12 +92,32 @@ var processObj={
var processBomObj={
parms:{},
node:"processBomGrid",
url:"",
url:"slicedProcessMaterialList",
columns:[
{ display: "物料", name: "materialId", width: 140, minWidth: 60, type: "string", align: "left", hidden: true },
{ display: "物料", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "sapMaterialSelect",
back: {
materialId: "materialId",
materialName:"materialName",
materialUnit:"materialUnit",
materialJson:"materialJson",
}
},
}
},
{ display: "SAP物料详细信息", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "使用的物料数量", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "物料计量单位", name: "productName", width: 120, minWidth: 60, type: "string", align: "left" }
{ display: "使用的物料数量", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" ,
editor: {
required: true,
type: 'text',
mask: 'positiveMoney'
}
},
{ display: "物料计量单位", name: "materialUnit", width: 120, minWidth: 60, type: "string", align: "left" }
]
}
......@@ -123,7 +143,7 @@ function loadProofingApplyGrid(obj) {
obj.gridManager = UICtrl.grid("#"+obj.node, {
columns: obj.columns,
dataAction: "server",
url: web_app.name +'/proofingApply/'+obj.url+'.ajax',
url: web_app.name +'/proofingTechnologyRelevancy/'+obj.url+'.ajax',
parms:obj.parms,
pageSize: 10,
toolbar: toolbarOptions,
......@@ -155,7 +175,7 @@ function loadProofingApplyGrid(obj) {
// }
/**
* 详情页初始化调用
* 获取工艺工序等数据生成表格
* 获取申请或制造单的工艺工序等数据生成表格
* @param proofingApplyId
*/
function showTable(params) {
......@@ -184,17 +204,33 @@ function showTable(params) {
});
let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
processObj.parms = {[a+"TechnologyId"]: technologyId}
processBomObj.parms = {[a+"TechnologyId"]: technologyId}
if (processObj.gridManager != null) {
reloadGrid(processObj);
reloadGrid(processBomObj);
} else {
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}
//
// let processResult = DataUtil.getGridData({
// gridManager: processObj.gridManager,
// isAllData: true
// });
// let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
// processObj.parms = {[a+"TechnologyId"]: technologyId}
// if (processObj.gridManager != null) {
// reloadGrid(processObj);
// } else {
// loadProofingApplyGrid(processObj);
// }
});
}
//展示工艺表格
//根据产品编号展示产品的艺表格
function showTechnologyTable(productId){
isDetail=false;
if(technologyObj.gridManager!=null){
......@@ -244,12 +280,56 @@ function technologyClickRequestProcess(){
if(isDetail)return;
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
if (processObj.gridManager != null) {
reloadGrid(processObj);
reloadGrid(processBomObj);
} else {
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}
}, 0);
});
// $(document).on('click', '#process .l-grid-row', function(event) {
// setTimeout(function() {
// if(isDetail)return;
// let result = DataUtil.getUpdateRow(processObj.gridManager); // 获取选中行
// processBomObj.parms = {processId : result.processId};
// if (processBomObj.gridManager != null) {
// reloadGrid(processBomObj);
// } else {
// loadProofingApplyGrid(processBomObj);
// }
// }, 0);
// });
}
/**
* 获取编辑表格中的数据
* @returns {{}|boolean}
*/
function getTableResult(){
debugger
let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
let processResult =processObj.gridManager.getSelectedRows();
let processMaterialResult = processBomObj.gridManager.getSelectedRows();
if(!technologyResult){
alert("请选择工艺！")
return false;
}else if(processResult.length<1){
alert("请选择工序！")
return false;
}else if(processMaterialResult.length<1){
alert("请选择工序物料！")
return false;
}
var extendedData = {};
extendedData.technology = Public.encodeJSONURI(technologyResult);
extendedData.process = Public.encodeJSONURI(processResult);
extendedData.processMaterial = Public.encodeJSONURI(processMaterialResult);
return extendedData;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyLookedApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyLooked;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyLooked;
public interface ProofingApplyLookedApplication {
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyProcessApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyProcessMaterialApplication.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessMaterialQueryRequest;
import java.util.Map;
public interface ProofingApplyProcessMaterialApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingApply.xml";
Map<String, Object> slicedProofingApplyProcessMaterial(ProofingApplyProcessMaterialQueryRequest query);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyTechnologyApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyTechnologyQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeBaseInfo;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.util.SDO;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeProcessApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingMakeProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeProcessMaterialApplication.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessMaterialQueryRequest;
import java.util.Map;
public interface ProofingMakeProcessMaterialApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingMake.xml";
Map<String, Object> slicedProofingMakeProcessMaterial(ProofingMakeProcessMaterialQueryRequest query);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeTechnologyApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeTechnologyQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstructionApplyApplication.java
View file @ f030eb31
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.topsun.proofing.domain.WorkInstructionApply;
public interface WorkInstructionApplyApplication {
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java
View file @ f030eb31
......@@ -7,16 +7,11 @@ import com.huigou.topsun.product.domain.ProductPublishedConf;
import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.domain.model.proofingApply.*;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeProcess;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.proofingApply.model.*;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
import com.huigou.topsun.proofing.repository.ProofingApplyLookedRepository;
import com.huigou.topsun.proofing.repository.ProofingApplyProcessRepository;
import com.huigou.topsun.proofing.repository.ProofingApplyRepository;
import com.huigou.topsun.proofing.repository.ProofingApplyTechnologyRepository;
import com.huigou.topsun.proofing.repository.proofingApply.*;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
......@@ -53,6 +48,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
private ProofingApplyTechnologyRepository proofingTechnologyRepository;
@Autowired
private ProofingApplyProcessRepository proofingApplyProcessRepository;
@Autowired
private ProofingApplyProcessMaterialRepository proofingApplyProcessMaterialRepository;
@Override
......@@ -68,6 +65,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
@SneakyThrows
@Transactional(propagation = Propagation.REQUIRES_NEW)
// @Transactional(propagation = Propagation.NEVER)
@Override
protected String saveBizAndApprovalData() {
super.saveBizAndApprovalData();
......@@ -76,9 +74,13 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
SDO sdo = this.getBizAndApprovalData();
String technologyJSON = sdo.getString("technology");
String processJSON = sdo.getString("process");
String processMaterialJSON = sdo.getString("processMaterial");
ObjectMapper objectMapper = new ObjectMapper();
ProofingApplyTechnology proofingTechnology = objectMapper.readValue(technologyJSON, ProofingApplyTechnology.class);
List<ProofingApplyProcess> processList = objectMapper.readValue(processJSON, new TypeReference<List<ProofingApplyProcess>>() {});
List<ProofingApplyProcessMaterial> processMaterialList = objectMapper.readValue(processMaterialJSON, new TypeReference<List<ProofingApplyProcessMaterial>>() {});
ProofingApplyLooked proofingApplyLooked = getBizEntity(ProofingApplyLooked.class);
if (proofingApply.isNew()) {
......@@ -115,6 +117,9 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
proofingTechnologyRepository.delete(technologyToDelete);
List<ProofingApplyProcess> processesToDelete = proofingApplyProcessRepository.findByProofingApplyTechnologyId(proofingApplyTechnologyId);
proofingApplyProcessRepository.deleteInBatch(processesToDelete);
List<ProofingApplyProcessMaterial> ProofingApplyTechnologyList = proofingApplyProcessMaterialRepository.findByProofingApplyTechnologyId(proofingApplyTechnologyId);
proofingApplyProcessMaterialRepository.deleteInBatch(ProofingApplyTechnologyList);
}
//添加样品及工艺
proofingTechnology.setProofingApplyId(proofingApply.getProofingApplyId());
......@@ -125,6 +130,13 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
proofingApplyProcess.setProofingApplyProcessId(null);
proofingApplyProcess.setProofingApplyTechnologyId(proofingTechnology.getProofingApplyTechnologyId());
proofingApplyProcessRepository.saveAndFlush(proofingApplyProcess);
}
for (ProofingApplyProcessMaterial proofingApplyProcessMaterial : processMaterialList) {
proofingApplyProcessMaterial.setProofingApplyProcessMaterialId(null);
proofingApplyProcessMaterial.setProofingApplyTechnologyId(proofingTechnology.getProofingApplyTechnologyId());
proofingApplyProcessMaterialRepository.saveAndFlush(proofingApplyProcessMaterial);
}
return proofingApply.getId();
}
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyLookedApplicationImpl.java
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.ProofingApplyLookedApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyLooked;
import com.huigou.topsun.proofing.repository.ProofingApplyLookedRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyLooked;
import com.huigou.topsun.proofing.repository.proofingApply.ProofingApplyLookedRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyProcessApplicationImpl.java
View file @ f030eb31
......@@ -2,7 +2,7 @@ package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyProcessApplication;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyProcessMaterialApplicationImpl.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyProcessMaterialApplication;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessMaterialQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ProofingApplyProcessMaterialApplicationImpl extends BaseApplication implements ProofingApplyProcessMaterialApplication {
@Override
public Map<String, Object> slicedProofingApplyProcessMaterial(ProofingApplyProcessMaterialQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingApplyProcessMaterial");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyTechnologyApplicationImpl.java
View file @ f030eb31
......@@ -2,7 +2,7 @@ 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.domain.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java
View file @ f030eb31
......@@ -7,18 +7,17 @@ import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.product.domain.ProductPublishedConf;
import com.huigou.topsun.product.repository.ProductLookedRepository;
import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
import com.huigou.topsun.product.repository.ProductRepository;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.model.proofingMake.*;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcessMaterial;
import com.huigou.topsun.proofing.domain.proofingMake.model.*;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.*;
import com.huigou.topsun.proofing.repository.proofingApply.ProofingApplyRepository;
import com.huigou.topsun.proofing.repository.proofingMake.*;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.util.SDO;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -76,6 +75,7 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
ProofingMakeLooked proofingMakeLooked = sdo.toObject(ProofingMakeLooked.class);
ProofingMakePdPublishedConf proofingMakePdPublishedConf = sdo.toObject(ProofingMakePdPublishedConf.class);
// proofingMakeBaseInfo.setProofingMakeApplicationStatus(StringUtil.isBlank(proofingMakeBaseInfo.getProofingMakeNgReReason())?"normal":"cancel");
proofingMakeBaseInfo = proofingMakeRepository.save(proofingMakeBaseInfo);
......@@ -87,9 +87,11 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
String technologyJSON = sdo.getString("technology");
String processJSON = sdo.getString("process");
String processMaterialJSON = sdo.getString("processMaterial");
ObjectMapper objectMapper = new ObjectMapper();
ProofingMakeTechnology proofingMakeTechnology = objectMapper.readValue(technologyJSON, ProofingMakeTechnology.class);
List<ProofingMakeProcess> ProcessList = objectMapper.readValue(processJSON, new TypeReference<List<ProofingMakeProcess>>() {});
List<ProofingMakeProcessMaterial> processMaterialList = objectMapper.readValue(processMaterialJSON, new TypeReference<List<ProofingMakeProcessMaterial>>() {});
proofingMakeTechnology.setProofingMakeId(proofingMakeBaseInfo.getProofingMakeId());
proofingMakeTechnology = proofingMakeTechnologyRepository.save(proofingMakeTechnology);
......@@ -98,6 +100,10 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
proofingMakeProcess.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingMakeTechnologyId());
proofingMakeProcessRepository.save(proofingMakeProcess);
}
for (ProofingMakeProcessMaterial proofingMakeProcessMaterial : processMaterialList) {
proofingMakeProcessMaterial.setProofingMakeTechnologyId(proofingMakeTechnology.getProofingMakeTechnologyId());
proofingMakeProcessMaterialRepository.save(proofingMakeProcessMaterial);
}
//编辑产品信息
ProductLooked productLooked = sdo.toObject(ProductLooked.class);
......@@ -114,9 +120,14 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
ProofingMakeBaseInfo proofingMake = proofingMakeRepository.findOne(proofingMakeId);
ProofingApplyBaseInfo proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
if (proofingMake==null) return null;
ProofingMakeLooked proofingMakeLooked = proofingMakeLookedRepository.findByProofingMakeId(proofingMakeId);
ProofingMakePdPublishedConf proofingMakePdPublishedConf = proofingMakePdPublishedConfRepository.findByProofingMakeId(proofingMakeId);
// ProofingApplyBaseInfo proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
BeanUtils.copyProperties(proofingMake,proofingMakeVo);
BeanUtils.copyProperties(proofingApply,proofingMakeVo);
BeanUtils.copyProperties(proofingMakeLooked,proofingMakeVo);
BeanUtils.copyProperties(proofingMakePdPublishedConf,proofingMakeVo);
// BeanUtils.copyProperties(proofingApply,proofingMakeVo);
return proofingMakeVo;
}
}
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeProcessApplicationImpl.java
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyProcessApplication;
import com.huigou.topsun.proofing.application.ProofingMakeProcessApplication;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingMakeProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeProcessMaterialApplicationImpl.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingMakeProcessMaterialApplication;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessMaterialQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ProofingMakeProcessMaterialApplicationImpl extends BaseApplication implements ProofingMakeProcessMaterialApplication {
@Override
public Map<String, Object> slicedProofingMakeProcessMaterial(ProofingMakeProcessMaterialQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingMakeProcessMaterial");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeTechnologyApplicationImpl.java
View file @ f030eb31
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.ProofingMakeTechnologyApplication;
import com.huigou.topsun.proofing.domain.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplicationImpl.java
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstructionApplication;
import com.huigou.topsun.proofing.domain.model.workInstruction.*;
import com.huigou.topsun.proofing.repository.*;
import com.huigou.topsun.proofing.domain.workInstruction.model.*;
import com.huigou.topsun.proofing.repository.workInstruction.*;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -36,7 +36,7 @@ public class WorkInstructionApplicationImpl implements WorkInstructionApplicatio
WorkInstructionBaseInfo workInstruction = sdo.toObject(WorkInstructionBaseInfo.class);
WorkInstructionPdPublishedConf workInstructionPdPublishedConf = sdo.toObject(WorkInstructionPdPublishedConf.class);
WorkInstructionMaterialInfo workInstructionMaterialInfo = sdo.toObject(WorkInstructionMaterialInfo.class);
WorkInstructionOptionalAttribute workInstructionOptionalAttribute = sdo.toObject( WorkInstructionOptionalAttribute.class);
WorkInstructionOptionalAttribute workInstructionOptionalAttribute = sdo.toObject( WorkInstructionOptionalAttribute.class);
WorkInstructionPrdLooked workInstructionPrdLooked = sdo.toObject(WorkInstructionPrdLooked.class);
WorkInstructionProductLoss workInstructionProductLoss = sdo.toObject(WorkInstructionProductLoss.class);
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplyApplicationImpl.java
View file @ f030eb31
package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstructionApplyApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.topsun.proofing.domain.WorkInstructionApply;
import com.huigou.topsun.proofing.repository.WorkInstructionApplyRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ f030eb31
......@@ -6,9 +6,13 @@ import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.proofing.application.*;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyLooked;
import com.huigou.topsun.proofing.domain.query.*;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyLooked;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyBaseInfoVo;
import com.huigou.topsun.technology.application.TechnologyApplication;
import com.huigou.topsun.technology.application.TechnologyProcessApplication;
......@@ -35,22 +39,9 @@ public class ProofingApplyController extends CommonController {
@Autowired
ProofingApplyApplication proofingApplyApplication;
@Autowired
TechnologyApplication technologyApplication;
@Autowired
ProofingApplyLookedApplication proofingApplyLookedApplication;
@Autowired
ProductLookedApplication productLookedApplication;
@Resource
private TechnologyProcessApplication technologyProcessApplication;
@Autowired
ProofingApplyTechnologyApplication proofingApplyTechnologyApplication;
@Autowired
ProofingApplyProcessApplication proofingApplyProcessApplication;
@Autowired
ProofingMakeTechnologyApplication proofingMakeTechnologyApplication;
@Autowired
ProofingMakeProcessApplication proofingMakeProcessApplication;
/**
* 打样申请详情
......@@ -112,47 +103,4 @@ public class ProofingApplyController extends CommonController {
}
/**
* 展示工艺
* @return
*/
public String slicedTechnologyList(){
SDO sdo = this.getSDO();
TechnologyQueryRequest queryRequest = sdo.toQueryRequest(TechnologyQueryRequest.class);
ProofingApplyTechnologyQueryRequest proofingApplyTechnologyQueryRequest = sdo.toQueryRequest(ProofingApplyTechnologyQueryRequest.class);
ProofingMakeTechnologyQueryRequest proofingMakeTechnologyQueryRequest = sdo.toQueryRequest(ProofingMakeTechnologyQueryRequest.class);
Map<String, Object> map = new HashMap<>();
//判断需要展示产品工艺还是打样表中工艺
if(!StringUtil.isBlank(proofingApplyTechnologyQueryRequest.getProofingApplyId())){
map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
}else if(!StringUtil.isBlank(queryRequest.getProductId())){
map = technologyApplication.slicedTechnologyList(queryRequest);
}else if(!StringUtil.isBlank(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
map=proofingMakeTechnologyApplication.slicedProofingMakeTechnology(proofingMakeTechnologyQueryRequest);
}
return toResult(map);
}
/**
* 展示工序
* @return
*/
public String slicedTechnologyProcessList(){
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
ProofingApplyProcessQueryRequest proofingApplyProcessQueryRequest = sdo.toQueryRequest(ProofingApplyProcessQueryRequest.class);
ProofingMakeProcessQueryRequest proofingMakeProcessQueryRequest = sdo.toQueryRequest(ProofingMakeProcessQueryRequest.class);
//判断需要展示产品工序还是打样表中工序
if(!StringUtil.isBlank(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId())){
return toResult(proofingApplyProcessApplication.slicedProofingApplyProcess(proofingApplyProcessQueryRequest));
}else if(!StringUtil.isBlank(technologyId)){
return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
}else if(!StringUtil.isBlank(proofingMakeProcessQueryRequest.getProofingMakeTechnologyId())){
return toResult(proofingMakeProcessApplication.slicedProofingMakeProcess(proofingMakeProcessQueryRequest));
}
return toResult(null);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ f030eb31
......@@ -6,7 +6,7 @@ import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingTechnologyRelevancyController.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.proofing.application.*;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessMaterialQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingApply.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessMaterialQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeProcessQueryRequest;
import com.huigou.topsun.proofing.domain.proofingMake.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.topsun.technology.application.TechnologyApplication;
import com.huigou.topsun.technology.application.TechnologyProcessApplication;
import com.huigou.topsun.technology.domain.model.ProcessMaterialItem;
import com.huigou.topsun.technology.domain.query.TechnologyQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@ControllerMapping("/proofingTechnologyRelevancy")
public class ProofingTechnologyRelevancyController extends CommonController {
protected String getPagePath() {
return "/biz/topsun/proofing/";
}
@Autowired
TechnologyApplication technologyApplication;
@Resource
private TechnologyProcessApplication technologyProcessApplication;
@Autowired
ProofingApplyTechnologyApplication proofingApplyTechnologyApplication;
@Autowired
ProofingApplyProcessApplication proofingApplyProcessApplication;
@Autowired
ProofingMakeTechnologyApplication proofingMakeTechnologyApplication;
@Autowired
ProofingMakeProcessApplication proofingMakeProcessApplication;
@Autowired
ProofingApplyProcessMaterialApplication proofingApplyProcessMaterialApplication;
@Autowired
ProofingMakeProcessMaterialApplication proofingMakeProcessMaterialApplication;
/**
* 展示工艺
* @return
*/
public String slicedTechnologyList(){
SDO sdo = this.getSDO();
TechnologyQueryRequest queryRequest = sdo.toQueryRequest(TechnologyQueryRequest.class);
ProofingApplyTechnologyQueryRequest proofingApplyTechnologyQueryRequest = sdo.toQueryRequest(ProofingApplyTechnologyQueryRequest.class);
ProofingMakeTechnologyQueryRequest proofingMakeTechnologyQueryRequest = sdo.toQueryRequest(ProofingMakeTechnologyQueryRequest.class);
Map<String, Object> map = new HashMap<>();
//判断需要展示产品工艺还是打样表中工艺
if(!StringUtil.isBlank(proofingApplyTechnologyQueryRequest.getProofingApplyId())){
map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
}else if(!StringUtil.isBlank(queryRequest.getProductId())){
map = technologyApplication.slicedTechnologyList(queryRequest);
}else if(!StringUtil.isBlank(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
map=proofingMakeTechnologyApplication.slicedProofingMakeTechnology(proofingMakeTechnologyQueryRequest);
}
return toResult(map);
}
/**
* 展示工序
* @return
*/
public String slicedTechnologyProcessList(){
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
ProofingApplyProcessQueryRequest proofingApplyProcessQueryRequest = sdo.toQueryRequest(ProofingApplyProcessQueryRequest.class);
ProofingMakeProcessQueryRequest proofingMakeProcessQueryRequest = sdo.toQueryRequest(ProofingMakeProcessQueryRequest.class);
//判断需要展示产品工序还是打样表中工序
if(!StringUtil.isBlank(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId())){
return toResult(proofingApplyProcessApplication.slicedProofingApplyProcess(proofingApplyProcessQueryRequest));
}else if(!StringUtil.isBlank(technologyId)){
return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
}else if(!StringUtil.isBlank(proofingMakeProcessQueryRequest.getProofingMakeTechnologyId())){
return toResult(proofingMakeProcessApplication.slicedProofingMakeProcess(proofingMakeProcessQueryRequest));
}
return toResult(null);
}
/**
* 展示工序
* @return
*/
public String slicedProcessMaterialList(){
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
ProofingApplyProcessMaterialQueryRequest proofingApplyProcessMaterialQueryRequest = sdo.toQueryRequest(ProofingApplyProcessMaterialQueryRequest.class);
ProofingMakeProcessMaterialQueryRequest proofingMakeProcessMaterialQueryRequest = sdo.toQueryRequest(ProofingMakeProcessMaterialQueryRequest.class);
//判断需要展示产品工序还是打样表中工序
if(!StringUtil.isBlank(proofingApplyProcessMaterialQueryRequest.getProofingApplyTechnologyId())){
return toResult(proofingApplyProcessMaterialApplication.slicedProofingApplyProcessMaterial(proofingApplyProcessMaterialQueryRequest));
}else if(!StringUtil.isBlank(technologyId)){
return toResult(temp());
}else if(!StringUtil.isBlank(proofingMakeProcessMaterialQueryRequest.getProofingMakeTechnologyId())){
return toResult(proofingMakeProcessMaterialApplication.slicedProofingMakeProcessMaterial(proofingMakeProcessMaterialQueryRequest));
}
return toResult(null);
}
public Map<String,Object> temp(){
Map<String, Object> map = new HashMap<>();
List<ProcessMaterialItem> list = new ArrayList<>();
for (int i = 0; i < 5; i++) {
ProcessMaterialItem processMaterialItem = new ProcessMaterialItem();
processMaterialItem.setMaterialId("测试id"+i);
processMaterialItem.setMaterialName("测试name"+i);
processMaterialItem.setMaterialNumber(Double.valueOf(i));
processMaterialItem.setTechnologyProcessId("process_id"+i);
processMaterialItem.setMaterialJson("测试material"+i);
processMaterialItem.setMaterialUnit("测试Unit"+i);
list.add(processMaterialItem);
}
map.put("Rows",list);
return map;
}
}
topsun/src/main/java/com/huigou/topsun/proofing/controller/WorkInstructionApplyController.java
View file @ f030eb31
......@@ -2,7 +2,7 @@ package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.product.application.ProductApplication;
import com.huigou.topsun.proofing.application.WorkInstructionApplyApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.topsun.proofing.domain.WorkInstructionApply;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstructionApply.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/WorkInstructionApply.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model;
package com.huigou.topsun.proofing.domain;
import java.io.Serializable;
import javax.persistence.*;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyBaseInfo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyBaseInfo.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import com.topsunit.query.annotations.Dictionary;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyBom.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyBom.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyLooked.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyLooked.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import com.topsunit.query.annotations.Dictionary;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyProcess.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyProcess.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyProcessMaterial.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyProcessMaterial.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
......@@ -15,14 +14,25 @@ import java.io.Serializable;
@Table(name="proofing_apply_process_material")
@Entity
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ProofingApplyProcessMaterial implements Serializable {
/**
* 打样申请工艺物料ID
*/
@Id
@GeneratedValue(
generator = "system-uuid"
)
@GenericGenerator(
name = "system-uuid",
strategy = "guid"
)
@Column(name = "proofing_apply_process_material_id")
private String proofingApplyProcessMaterialId;
@Column(name = "proofing_apply_technology_id")
private String proofingApplyTechnologyId ;
/**
* 工序ID
*/
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingApply/ProofingApplyTechnology.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/model/ProofingApplyTechnology.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingApply;
package com.huigou.topsun.proofing.domain.proofingApply.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyAndProductQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyAndProductQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyProcessMaterialQueryRequest.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
/**
*
* @TableName proofing_apply_process_material
*/
@Data
public class ProofingApplyProcessMaterialQueryRequest extends QueryAbstractRequest {
/**
* 打样申请工艺物料ID
*/
private String proofingApplyProcessMaterialId;
/**
* 工序ID
*/
private String proofingApplyProcessId;
private String proofingApplyTechnologyId ;
/**
* 物料ID
*/
private String materialId;
/**
* 物料名称
*/
private String materialName;
/**
* 使用的物料数量
*/
private Double materialNumber;
/**
* 物料计量单位
*/
private String materialUnit;
/**
* sap物料相信内容
*/
private String materialJson;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyProcessQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyProcessQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.huigou.data.domain.query.QueryAbstractRequest;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyQuery.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyQuery.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyTechnologyQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingApply/query/ProofingApplyTechnologyQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingApply.query;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.huigou.data.domain.query.QueryAbstractRequest;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeBaseInfo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeBaseInfo.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......@@ -44,8 +44,8 @@ public class ProofingMakeBaseInfo implements Serializable {
/**
* 申请单号
*/
@Column(name = "application_no")
private String applicationNo;
@Column(name = "proofing_apply_no")
private String proofingApplyNo;
/**
* 产品Id
......@@ -53,6 +53,12 @@ public class ProofingMakeBaseInfo implements Serializable {
@Column(name = "product_id")
private String productId;
/**
* 产品Id
*/
@Column(name = "product_Code")
private String productCode;
/**
* 品牌客户编号
*/
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeBom.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeBom.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeLooked.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeLooked.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakePdPublishedConf.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakePdPublishedConf.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeProcess.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeProcess.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeProcessMaterial.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeProcessMaterial.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......@@ -30,6 +30,9 @@ public class ProofingMakeProcessMaterial implements Serializable {
@Column(name = "proofing_make_process_material_id")
private String proofingMakeProcessMaterialId;
@Column(name="proofing_make_technology_id")
private String proofingMakeTechnologyId;
/**
* 物料ID
*/
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeTechnology.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeTechnology.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.proofingMake;
package com.huigou.topsun.proofing.domain.proofingMake.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/query/ProofingMakeProcessMaterialQueryRequest.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.domain.proofingMake.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_make_process_material
*/
@Data
public class ProofingMakeProcessMaterialQueryRequest extends QueryAbstractRequest {
/**
* 打样制作工艺物料ID
*/
private String proofingMakeProcessMaterialId;
private String proofingMakeTechnologyId;
/**
* 物料ID
*/
private String materialId;
/**
* 物料名称
*/
private String materialName;
/**
* 使用的物料数量
*/
private Double materialNumber;
/**
* 物料计量单位
*/
private String materialUnit;
/**
* sap物料相信内容
*/
private String materialJson;
/**
* 工序ID
*/
private String proofingMakeProcessId;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeProcessQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/query/ProofingMakeProcessQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingMake.query;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.huigou.data.domain.query.QueryAbstractRequest;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/query/ProofingMakeQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingMake.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeTechnologyQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/query/ProofingMakeTechnologyQueryRequest.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.query;
package com.huigou.topsun.proofing.domain.proofingMake.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java
View file @ f030eb31
......@@ -2,12 +2,11 @@ package com.huigou.topsun.proofing.domain.vo;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
* 样品制作表展示
* 含ProofingMakeBaseInfo、ProofingMakeLooked、ProofingMakePdPublishedConf
*/
@Data
public class ProofingMakeVo{
......@@ -15,154 +14,290 @@ public class ProofingMakeVo{
/**
* 制作单id
*/
private String proofingMakeId;
/**
* 制作单号
*/
private String proofingMakeNo;
private String proofingMakeNo;
/**
* 申请单的主键id
* proofing_apply表的主键是id列
* 打样申请单id
*/
private String id;
/**
* 申请单id
*/
private String proofingApplyId;
/**
* 申请单号
*/
private String proofingApplyNo;
/**
* 产品id
* 产品Id
*/
private String productId;
/**
* 产品编号
*/
private String productCode;
/**
* 客户id
* 品牌客户编号
*/
private String customerId;
private String customerCode;
/**
* 版面需求时间
*/
private Date proofingApplyPageNeedTime;
private Date proofingMakePageNeedTime;
/**
* 完成日期
*/
private Date proofingApplyCompleteDate;
private Date proofingMakeCompleteDate;
/**
* 中文样品名
* 样品中文名称
*/
private String proofingApplySampleCnName;
private String proofingMakeSampleCnName;
/**
* 英文样品名
* 样品英文名称
*/
private String proofingApplySampleEnName;
private String proofingMakeSampleEnName;
/**
* 样品版次
*/
private Integer proofingApplySampleVersion;
private Integer proofingMakeSampleVersion;
/**
* 样品规格
*/
private Integer proofingApplySampleSize;
private Integer proofingMakeSampleSize;
/**
* 样品款式
*/
private String sampleStyle;
/**
* 样品数量
*/
private Long proofingApplySampleNum;
private Long proofingMakeSampleNum;
/**
* 产量情况
*/
private String proofingApplyOutputSituation;
private String proofingMakeOutputSituation;
/**
* 产品代号
*/
private String proofingApplyProductNo;
/**
* 打样形式
*/
private String proofingType;
private String proofingMakeProductNo;
/**
* 版面
* 打样形式
*/
private String proofingType;
/**
* 分配方式
*/
private String proofingApplyAllocationType;
/**
* 产品类别
*/
private String proofingMakeAllocationType;
/**
* 表面处理
*/
private String proofingApplySurfaceTreatment;
private String proofingMakeSurfaceTreatment;
/**
* NG重新打样原因
*/
private String proofingApplyNgReReason;
private String proofingMakeNgReReason;
/**
*申请单状态
* 申请单状态
*/
private String proofingApplyApplicationStatus;
/**
*测试标准
* 测试标准
*/
private String proofingApplyTestStandard;
private String proofingMakeTestStandard;
/**
*颜色种类
* 颜色种类
*/
private String colorType;
/**
*专
* 专
*/
private String expert;
/**
* 网版目数
*/
private Integer printingPlateNum;
/**
*啤版目数
* 啤板模数
*/
private Integer beerPlateNum;
/**
*模切板目数
* 模切板模数
*/
private Integer dieBoardNum;
//产品打样排版参数方面字段
/**
* 标准色号
*/
private String standardColor;
private String proofingMakeLookedId;
/**
* 是否量产
*/
private String isOutput;
/**
* 是否外发
*/
private String isOut;
/**
* 是否改变
*/
private String isChange;
/**
* 塑胶袋结构
*/
private String plasticBagStructure;
/**
* 长;单位cm
*/
private Double productLength;
/**
* 宽;单位cm
*/
private Double productWidth;
/**
* 高;单位cm
*
*/
private Double productHeight;
/**
* 厚度;单位mm
*/
private Double productThick;
/**
* 单层厚(单位丝)
*/
private Integer productSingleLayer;
/**
* 层数
*/
private Integer productLayerNum;
/**
* 样品形状
*/
private String sampleShape;
/**
* 样品形状大小
*/
private Double sampleShapeSize;
/**
* 预定工序流程id
*/
private String plannedFlowId;
/**
* 文件存储位置
*/
private String fileStorageLocation;
/**
* 样品物料
*/
private String sampleMaterial;
/**
* 成品克重;单位g
*/
private Double productWeight;
/**
* 孔径(单位mm)
*/
private Double productAperture;
/**
* 单重(单位KG)
*/
private Double productSingleWeight;
/**
* 样品制作单状态
*/
private String proofingMakeStatus;
/**
* 是否确认
*/
private String isConfirm;
/**
* 打样制作单排版参数id
*/
private String proofingMakePdPublishedConfId;
/**
* 模数
*/
......@@ -171,46 +306,58 @@ public class ProofingMakeVo{
/**
* 行数
*/
private Integer rowNum;
/**
* 列数
*/
private Integer columnNum;
/**
* 搭版数
*/
private Integer contactNum;
/**
* 行双刀位(单位mm)
*/
private Double rowDoubleBlade;
/**
* 列双刀位(单位mm)
*/
private Double columnDoubleBlade;
/**
* 派工倍数
*/
private Integer dispatchMultiple;
/**
* 印张长度(单位cm)
*/
private Double sheetLength;
/**
* 印张宽度(单位cm)
*/
private Double sheetWidth;
/**
* 产品印张设置(product_sheet_conf)
* 印刷正面颜色
*/
private String productSheetConf;
private String printFrontColer;
/**
* 印刷反面颜色
*/
private String printOppositeColor;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionBaseInfo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionBaseInfo.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionMaterialInfo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionMaterialInfo.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionOptionalAttribute.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionOptionalAttribute.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionPdPublishedConf.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionPdPublishedConf.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionPrdLooked.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionPrdLooked.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/workInstruction/WorkInstructionProductLoss.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstruction/model/WorkInstructionProductLoss.java
View file @ f030eb31
package com.huigou.topsun.proofing.domain.model.workInstruction;
package com.huigou.topsun.proofing.domain.workInstruction.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionApplyRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.topsun.proofing.domain.WorkInstructionApply;
import org.springframework.data.jpa.repository.JpaRepository;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyLookedRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyLookedRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingApply;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyLooked;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyLooked;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingApplyLookedRepository extends JpaRepository<ProofingApplyLooked, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyProcessMaterialRepository.java 0 → 100644
View file @ f030eb31
package com.huigou.topsun.proofing.repository.proofingApply;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcessMaterial;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface ProofingApplyProcessMaterialRepository extends JpaRepository<ProofingApplyProcessMaterial, String> {
ProofingApplyProcessMaterial findByProofingApplyProcessId(String proofingApplyProcessId);
List<ProofingApplyProcessMaterial> findByProofingApplyTechnologyId(String proofingApplyTechnologyId);
}
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyProcessRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyProcessRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingApply;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyProcess;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcess;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingApply;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyBaseInfo;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingApplyRepository extends JpaRepository<ProofingApplyBaseInfo, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyTechnologyRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingApply/ProofingApplyTechnologyRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingApply;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyTechnology;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyTechnology;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeLookedRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeLookedRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeLooked;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeLooked;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakeLookedRepository extends JpaRepository<ProofingMakeLooked, String> {
ProofingMakeLooked findByProofingMakeId(String proofingMakeId);
}
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakePdPublishedConfRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakePdPublishedConfRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakePdPublishedConf;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakePdPublishedConf;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakePdPublishedConfRepository extends JpaRepository<ProofingMakePdPublishedConf, String> {
ProofingMakePdPublishedConf findByProofingMakeId(String proofingMakeId);
}
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeProcessMaterialRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeProcessMaterialRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeProcessMaterial;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeProcessMaterial;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakeProcessMaterialRepository extends JpaRepository<ProofingMakeProcessMaterial, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeProcessRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeProcessRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeProcess;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeProcess;
import org.springframework.data.jpa.repository.JpaRepository;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeBaseInfo;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeBaseInfo;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingMakeRepository extends JpaRepository<ProofingMakeBaseInfo, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeTechnologyRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/proofingMake/ProofingMakeTechnologyRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.proofingMake;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyTechnology;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeTechnology;
import com.huigou.topsun.proofing.domain.proofingMake.model.ProofingMakeTechnology;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionMaterialInfoRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionMaterialInfoRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionMaterialInfo;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionMaterialInfo;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionMaterialInfoRepository extends JpaRepository<WorkInstructionMaterialInfo, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionOptionalAttributeRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionOptionalAttributeRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionOptionalAttribute;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionOptionalAttribute;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionOptionalAttributeRepository extends JpaRepository<WorkInstructionOptionalAttribute, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionPdPublishedConfRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionPdPublishedConfRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionPdPublishedConf;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionPdPublishedConf;
import org.springframework.data.jpa.repository.JpaRepository;
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionPrdLookedRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionPrdLookedRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionPrdLooked;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionPrdLooked;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionPrdLookedRepository extends JpaRepository<WorkInstructionPrdLooked, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionProductLossRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionProductLossRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionProductLoss;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionProductLoss;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionProductLossRepository extends JpaRepository<WorkInstructionProductLoss, String> {
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/workInstruction/WorkInstructionRepository.java
View file @ f030eb31
package com.huigou.topsun.proofing.repository;
package com.huigou.topsun.proofing.repository.workInstruction;
import com.huigou.topsun.proofing.domain.model.workInstruction.WorkInstructionBaseInfo;
import com.huigou.topsun.proofing.domain.workInstruction.model.WorkInstructionBaseInfo;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionRepository extends JpaRepository<WorkInstructionBaseInfo, String> {
......
topsun/src/main/resources/config/topsun/proofing/proofingApply.xml
View file @ f030eb31
......@@ -57,5 +57,11 @@
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingApplyProcessMaterial" table="proofing_apply_process_material">
<sql-query>
select t.* from proofing_apply_process_material t
</sql-query>
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/proofing/proofingMake.xml
View file @ f030eb31
......@@ -23,4 +23,11 @@
<condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingMakeProcessMaterial" table="proofing_make_process_material">
<sql-query>
select t.* from proofing_make_process_material t
</sql-query>
<condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/proofing/proofingApply.xml
View file @ f030eb31
......@@ -57,5 +57,11 @@
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingApplyProcessMaterial" table="proofing_apply_process_material">
<sql-query>
select t.* from proofing_apply_process_material t
</sql-query>
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" 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 @ f030eb31
......@@ -23,4 +23,11 @@
<condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingMakeProcessMaterial" table="proofing_make_process_material">
<sql-query>
select t.* from proofing_make_process_material t
</sql-query>
<condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</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