Skip to content

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

打样制造CRUD

parent eac39b97
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 197 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ df531537
......@@ -200,16 +200,9 @@ function dialogClose(){
//添加按钮
function addHandler() {
// var resourceTypeId=$('#resourceTypeId').val();
// if (Public.isBlank(resourceTypeId)) {
// Public.tip('请选择资源！');
// return;
// }
UICtrl.showAjaxDialog({
title: $.i18nProp('添加BOM'),
url : web_app.name + '/proofingApply/forwardAddBom.load',
//init:initDetailDialog,
// param:{resourceTypeId:resourceTypeId},
ok : insert,
width : 600,
close : dialogClose
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ df531537
var gridManager = null, refreshFlag = false;
//定义控件列
const proofingMake=
[
{ display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left" },

var gridManager = null;
$(document).ready(function() {
initializateUI();
loadTechnologyListGrid();
});
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
}
function loadTechnologyListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function(){
addHandler();
},
updateHandler: function(){
updateHandler();
},
deleteHandler: deleteHandler,
});
gridManager = UICtrl.grid("#proofingMakeTableGrid", {
columns: [
{ display: "制造单号", name: "proofingMakeNo", width: 140, 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: "customerId", width: 140, minWidth: 60, type: "string", align: "left" },
......@@ -28,34 +49,9 @@ const proofingMake=
{ display: "啤版目数", name: "beerPlateNum", 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" },
]
$(document).ready(function() {
loadProofingMakeGrid(null,proofingMake,"proofingMakeTableGrid","slicedQueryProofingMake");//加载表格
});
//创建表格（参数、列、插入的节点、请求地址）
function loadProofingMakeGrid(param,columns,node,url) {
const toolbarOptions =
UICtrl.getDefaultToolbarOptions({
addHandler: addHandler,
updateHandler() {
updateHandler();
},
deleteHandler: deleteHandler,
})
gridManager = UICtrl.grid("#"+node, {
columns: columns,
],
dataAction: "server",
url: web_app.name + '/proofingMake/'+url+'.ajax',
parms:param,
url: web_app.name + '/proofingMake/slicedQueryProofingMake.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
......@@ -65,146 +61,84 @@ function loadProofingMakeGrid(param,columns,node,url) {
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
//双击行响应事件
onDblClickRow : function(data, rowindex, rowobj) {
updateHandler(data.id);
updateHandler(data.proofingMakeId);
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function updateHandler(id){
if(!id){
var id = DataUtil.getUpdateRowId(gridManager);
if (!id){ return; }
}
UICtrl.showAjaxDialog({
url: web_app.name + '/codeRule/showLoadCodeRule.load',
title: "修改BOM",
width: 340,
param:{id:id},
ok: function(div){
var _self=this;
$('#submitForm',div).ajaxSubmit({url: web_app.name + '/codeRule/updateCodeRule.ajax',
success : function() {
_self.close();
reloadGrid();
}
});
}
});
}
// 查询
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
//刷新表格
function reloadGrid() {
gridManager.loadData();
}
//重置表单
function resetForm(obj) {
$(obj).formClean();
}
//关闭对话框
function dialogClose(){
if(refreshFlag){
reloadGrid();
refreshFlag=false;
}
}
//添加按钮
function addHandler() {
debugger
// var resourceTypeId=$('#resourceTypeId').val();
// if (Public.isBlank(resourceTypeId)) {
// Public.tip('请选择资源！');
// return;
// }
function addHandler(){
UICtrl.showAjaxDialog({
title: $.i18nProp('添加BOM'),
url : web_app.name + '/proofingMake/forwardSaveProofingMake.load',
//init:initDetailDialog,
// param:{resourceTypeId:resourceTypeId},
ok : insert,
width : 600,
close : dialogClose
});
}
//新增保存
function insert() {
var _self=this;
$('#submitDetailForm').ajaxSubmit({
url : web_app.name + '/resourceField/saveResourceFiledValue.ajax',
param:{},
success : function(data) {
if (data == "1"){
Public.successTip("保存成功！");
}
_self.close();
reloadGrid();
url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
title: "新增打样制造单",
width: 1000,
ok: function(div){
var _self=this;
$('#submitForm',div).ajaxSubmit({url: web_app.name + '/proofingMake/saveProofingMake.ajax',
success : function() {
_self.close();
reloadGrid();
}
});
}
});
}
//编辑按钮
function updateHandler(id) {
if (!id) {
function updateHandler(proofingMakeId){
debugger
if (!proofingMakeId) {
console.log(gridManager)
//获取所选行id
id = DataUtil.getUpdateRowId(gridManager);
if (!id) {
proofingMakeId = DataUtil.getUpdateRowId(gridManager);
if (!proofingMakeId) {
return;
}
}
UICtrl.showAjaxDialog({
title: $.i18nProp('更新Bom'),
width: 600,
url: web_app.name + '/proofingApply/forwardAddBom.load',
param: {id: id,resourceTypeId: $('#resourceTypeId').val()},
ok: update,
close:dialogClose
});
}
//编辑保存
function update() {
var _self=this;
$('#submitDetailForm').ajaxSubmit({
url : web_app.name + '/proofingApply/updateResourceFiledValue.ajax',
success : function(data) {
if (data == "1"){
Public.successTip("修改成功！");
}
refreshFlag = true;
_self.close();
reloadGrid();
url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
title: "修改打样制造单",
width: 1000,
param:{id:proofingMakeId},
ok: function(div){
var _self=this;
$('#submitForm',div).ajaxSubmit({url: web_app.name + '/proofingMake/saveProofingMake.ajax',
success : function() {
_self.close();
reloadGrid();
}
});
}
});
}
//重写DataUtil的getUpdateRowId函数、它默认取行的id列
DataUtil.getUpdateRowId = function(gridManager){
var result = DataUtil.getUpdateRow(gridManager);
if (result){
return result.proofingMakeId;
}
return result;
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'resourceField/deleteResourceFiledValue.ajax',
param:{
id:DataUtil.getUpdateRowId(gridManager),
resourceTypeId: $('#resourceTypeId').val()
},
gridManager: gridManager, idFieldName: 'id',
onSuccess: function (data) {
if (data == "1"){
Public.successTip("删除成功！");
}
action: 'proofingMake/deleteProofingMakeByProofingMakeId.ajax',
gridManager: gridManager, idFieldName: 'proofingMakeId',
onSuccess: function () {
reloadGrid();
}
});
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @ df531537
<%@ page contentType="text/html; charset=utf-8" language="java"%>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<x:base include="grid,date" />
<x:script src='/biz/topsun/proofing/proofingMake.js'/>
<div class="container-fluid" style="padding: 10px;">
<div><h3>打样制作信息</h3></div>
<div class="hg-form-cols">
<div id="proofingMakeTableGrid" style="margin: 2px;"></div>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/proofing/proofingMake.js'/>
</head>
<body>
<div class="container-fluid">
<div class="ui-hide">
<x:select name="processType" dictionary="processType" />
<x:select name="yesorno" dictionary="yesorno" />
</div>
<div id="layout">
<div position="center" title="打样制造">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="制造单号" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="proofingMakeTableGrid" style="margin: 2px;"></div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeDetail.jsp
View file @ df531537
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ page contentType="text/html; charset=utf-8" language="java"%>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/base/codeRule/codeRuleList.js'/>
</head>
<body>
<div class="container-fluid">
<div id="layout">
<div position="left" title="组织机构树">
<div id="orgTreeWrapper">
<ul id="orgTree"></ul>
<x:base include="grid,date,layout,combox,tree,comboDialog,attachment" />
<x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/proofing/proofingMakeDetail.js'/>
<div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm">
<div><h3>基本信息</h3></div>
<div class="hg-form-cols">
<x:hidden name="proofingMakeId"/>
<x:hidden name="proofingApplyId"/><!--申请单id-->
<x:hidden name="id"/><!--申请单的主键id-->
<x:inputC name="proofingMakeNo" readonly="true" label="制造单号" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyNo" readonly="true" label="申请单号" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productId" readonly="true" label="产品编号" labelCol="2" fieldCol="2"/>
<x:inputC name="customerId" readonly="true" label="品牌客户编号" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyPageNeedTime" readonly="true" label="版面需求时间" wrapper="date" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyCompleteDate" readonly="true" id="completeDate" required="false" label="完成日期" wrapper="date" labelCol="2" />
<x:inputC name="proofingApplySampleCnName" readonly="true" label="样品中文名称" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplySampleEnName" readonly="true" label="样品英文名称" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplySampleVersion" readonly="true" label="样品版次" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplySampleSize" readonly="true" label="样品规格" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplySampleNum" readonly="true" label="样品数量" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyOutputSituation" readonly="true" label="产量情况" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyProductNo" readonly="true" label="产品代号" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingType" readonly="true" label="打样形式" labelCol="2" fieldCol="2"/>
<x:selectC name="page" label="版面" dictionary="prodcutLayout" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyAllocationType" label="分配方式" maxLength="32" labelCol="2" fieldCol="2"/>
<x:selectC name="productType" label="产品类别" dictionary="productType" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplySurfaceTreatment" readonly="true" label="表面处理" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyNgReReason" readonly="true" label="NG重新打样原因" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="a" readonly="true" label="测试标准" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyTestStandard" readonly="true" label="申请单状态" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="colorType" label="颜色种类" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="expert" label="专" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="printingPlateNum" label="网版目数" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="beerPlateNum" label="啤版目数" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="dieBoardNum" label="模切板目数" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyTestStandard" label="申请单状态" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="a" label="测试标准" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="proofingApplyTestStandard" label="申请单状态" maxLength="32" labelCol="2" fieldCol="2"/>
<div class="container-fluid">
<x:title title="附件上传" name="group"/>
<x:fileList bizCode="providerFile" bizId="id" id="DataLibraryList" isClass="true"/>
</div>
</div>
<div position="center" title="编号规则管理">
<x:hidden name="fullId" id="treefullId" />
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:selectC name="ruleKind" required="false" label="编码类别" list="ruleKindList" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="codeRuleListGrid" style="margin: 2px;"></div>
<div><h3>样品外观要求</h3></div>
<div class="hg-form-cols" >
<x:selectC name="isOutput" required="false" label="是否量产" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:selectC name="isOut" required="false" label="是否外发" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:selectC name="isChange" required="false" label="是否改变" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:inputC name="plasticBagType" required="false" label="塑料袋结构类型" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLength" required="false" label="长度（cm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productWidth" required="false" label="宽度（cm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productHeight" required="false" label="高度（cm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productThick" required="false" label="厚度（mm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productSingleLayer" required="false" label="单层厚（丝）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="层数" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="样品形状" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="prodcutShapeSize" required="false" label="样品形状大小（mm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="预定工艺流程id" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="文件存储位置" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="样品物料" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productAperture" required="false" label="孔径（mm）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="成品克重（g）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productSingleWeight" required="false" label="单重（kg）" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="样品制造单状态" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="是否确认" maxLength="32" labelCol="2" fieldCol="2"/>
</div>
</div>
</form>
</div>
</body>
</html>
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/product/repository/ProductLookedRepository.java
View file @ df531537
......@@ -9,4 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
* @Description:
*/
public interface ProductLookedRepository extends JpaRepository<ProductLooked,String> {
ProductLooked getProductLookedByProductId(String productId);
}
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ df531537
......@@ -5,6 +5,7 @@ import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingMakeRepository;
import com.huigou.topsun.proofing.service.BomService;
import com.huigou.topsun.proofing.service.ProofingMakeService;
import com.huigou.topsun.technology.vo.TechnologyVo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
......@@ -41,17 +42,39 @@ public class ProofingMakeController extends CommonController {
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询打样制造表")
public String slicedQueryProofingMake() {
List<ProofingMakeVo> proofingMakeList = proofingMakeService.getProofingMakeList();
List<ProofingMakeVo> proofingMakeList = proofingMakeService.getProofingMakeVoList();
Map<String,Object> map =new HashMap();
map.put("Rows",proofingMakeList);
return toResult(map);
}
//跳转打样编辑页
public String forwardSaveProofingMake(){
//如果有id的话就带参数过去
SDO sdo = this.getSDO();
String id = sdo.getId();
return forward("proofingMakeDetail");
ProofingMakeVo proofingMakeVo =
(id==null||"".equals(id))?null:proofingMakeService.getProofingMakeVoById(id);
return forward("proofingMakeDetail",proofingMakeVo);
}
/**
* 编辑打样制造信息
* @return
*/
public String saveProofingMake(){
SDO sdo = this.getSDO();
ProofingMakeVo proofingMakeVo = sdo.toObject(ProofingMakeVo.class);
proofingMakeService.saveProofingMakeVo(proofingMakeVo);
return success(proofingMakeVo);
}
public String deleteProofingMakeByProofingMakeId(){
SDO sdo = this.getSDO();
String proofingMakeId = sdo.getString("ids");
proofingMakeService.deleteProofingMakeVo(proofingMakeId);
return success();
}
}
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/ProofingMake.java
View file @ df531537
package com.huigou.topsun.proofing.domain.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
......@@ -16,7 +17,15 @@ public class ProofingMake{
/**
* 制作单id
*/
@Id
@GeneratedValue(
generator = "system-uuid"
)
@GenericGenerator(
name = "system-uuid",
strategy = "guid"
)
@Column(name = "proofing_make_id")
private String proofingMakeId;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java
View file @ df531537
......@@ -13,7 +13,6 @@ import java.util.Date;
@Data
public class ProofingMakeVo{
/**
* 制作单id
*/
......@@ -27,6 +26,14 @@ public class ProofingMakeVo{
private String proofingMakeNo;
/**
* 申请单的主键id
* proofing_apply表的主键是id列
*/
@Column(name = "id")
private String id;
/**
* 申请单id
*/
......@@ -35,8 +42,6 @@ public class ProofingMakeVo{
/**
* 申请单号
*/
......@@ -166,22 +171,22 @@ public class ProofingMakeVo{
private String expert;
/**
*网版目数
* 网版目数
*/
@Column(name = "printing_plate_num")
private String printingPlateNum;
private Integer printingPlateNum;
/**
*啤版目数
*/
@Column(name = "beer_plate_num")
private String beerPlateNum;
private Integer beerPlateNum;
/**
*模切板目数
*/
@Column(name = "die_board_num")
private String dieBoardNum;
private Integer dieBoardNum;
......
topsun/src/main/java/com/huigou/topsun/proofing/service/ProofingMakeService.java
View file @ df531537
......@@ -11,6 +11,17 @@ public interface ProofingMakeService {
* @return
*/
// List<ProofingMakeVo> getProofingMakeVoListById(Long id);
public List<ProofingMakeVo> getProofingMakeList();
List<ProofingMakeVo> getProofingMakeVoList();
ProofingMakeVo getProofingMakeVoById(String proofingMakeId);
/**
*编辑打样制造信息（或添加或修改打样制造与之相关的表）
* @param proofingMakeVo
*/
void saveProofingMakeVo(ProofingMakeVo proofingMakeVo);
void deleteProofingMakeVo(String proofingMakeId);
}
topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java
View file @ df531537
package com.huigou.topsun.proofing.service.impl;
import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.product.repository.ProductLookedRepository;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
......@@ -9,6 +11,8 @@ import com.huigou.topsun.proofing.service.ProofingMakeService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
......@@ -21,20 +25,59 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
ProofingMakeRepository proofingMakeRepository;
@Autowired
ProofingApplyRepository proofingApplyRepository;
@Autowired
ProductLookedRepository productLookedRepository;
public List<ProofingMakeVo> getProofingMakeList(){
List<ProofingMake> makeAll = proofingMakeRepository.findAll();
return makeAll.stream()
.map(proofingMake -> {
ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
BeanUtils.copyProperties(proofingApply, proofingMakeVo);
BeanUtils.copyProperties(proofingMake, proofingMakeVo);
return proofingMakeVo;
public List<ProofingMakeVo> getProofingMakeVoList(){
List<ProofingMake> makeAll = proofingMakeRepository.findAll();
return makeAll.stream().map(proofingMake -> {
ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
return this.getProofingMakeVo(proofingMake,proofingApply,productLooked);
})
.collect(Collectors.toList());
}
@Override
public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
return this.getProofingMakeVo(proofingApply,proofingMake,productLooked);
}
/**
* 分解ProofingMakeVo
* @param proofingMakeVo
*/
@Transactional(propagation = Propagation.REQUIRES_NEW)
@Override
public void saveProofingMakeVo(ProofingMakeVo proofingMakeVo) {
ProofingMake proofingMake = new ProofingMake();
BeanUtils.copyProperties(proofingMakeVo, proofingMake);
proofingMake.setProofingApplyId(proofingMakeVo.getId());
proofingMakeRepository.save(proofingMake);
}
@Override
public void deleteProofingMakeVo(String proofingMakeId) {
proofingMakeRepository.delete(proofingMakeId);
}
/**
* 生成ProofingMakeVo类
// * @param proofingMake
// * @param proofingApply
* @return 填充过数据后的ProofingMakeVo
*/
public ProofingMakeVo getProofingMakeVo(Object... objs){
ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
for (Object obj : objs) {
BeanUtils.copyProperties(obj, proofingMakeVo);
}
return proofingMakeVo;
}
}
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