Skip to content

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

打样申请流程

parent 7c40ab74
Hide whitespace changes
Inline Side-by-side
Showing with 843 additions and 191 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ 91b72ed0
...@@ -129,14 +129,14 @@ function bindQueryEvent(){ ...@@ -129,14 +129,14 @@ function bindQueryEvent(){
} }
}); });
$('#productType').searchbox({ // $('#productType').searchbox({
type : "product",name : "productType", // type : "product",name : "productType",
onChange:function(value,data){ // onChange:function(value,data){
$('#productType').val(data.productCategoryId); // $('#productType').val(data.productCategoryId);
//
console.log($('#productType').val()) // console.log($('#productType').val())
} // }
}); // });
} }
function query(obj) { function query(obj) {
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp
View file @ 91b72ed0
...@@ -6,83 +6,64 @@ ...@@ -6,83 +6,64 @@
<x:script src='/biz/topsun/common/purchaseCommon.js'/> <x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/proofing/proofingApply.js'/> <x:script src='/biz/topsun/proofing/proofingApply.js'/>
<div class="container-fluid" style="padding: 10px;"> <div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id" id="proofingApplyId"/> <x:hidden name="id" id="proofingApplyId"/>
<x:hidden name="billCode"/> <x:hidden name="billCode"/>
<x:hidden name="fillinDate" type="datetime"/> <x:hidden name="fillinDate" type="datetime"/>
<x:hidden name="fullId"/> <x:hidden name="fullId"/>
<x:hidden name="organId"/> <x:hidden name="organId"/>
<x:hidden name="organName"/> <x:hidden name="organName"/>
<x:hidden name="deptId"/> <x:hidden name="deptId"/>
<x:hidden name="deptName"/> <x:hidden name="deptName"/>
<x:hidden name="positionId"/> <x:hidden name="positionId"/>
<x:hidden name="positionName"/> <x:hidden name="positionName"/>
<x:hidden name="personMemberId"/> <x:hidden name="personMemberId"/>
<x:hidden name="personMemberName"/> <x:hidden name="personMemberName"/>
<%-- <x:hidden name="id" />--%> <div><h3>基本信息</h3></div>
<div><h3>基本信息</h3></div> <div class="hg-form-cols">
<div class="hg-form-cols"> <x:inputC name="proofingApplyNo" readonly="true" label="申请单号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyNo" readonly="true" label="申请单号" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="productId" label="产品编号" labelCol="1" fieldCol="2"/>
<%-- <x:selectC name="productCode" label="产品编号" labelCol="1" fieldCol="2"/>--%> <x:selectC name="customerId" label="品牌客户编号" dictionary="customerType" labelCol="1" fieldCol="2"/>
<x:inputC name="productId" label="产品编号" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyPageNeedTime" label="版面需求时间" wrapper="date" labelCol="1" fieldCol="2"/>
<x:inputC name="customerId" label="品牌客户编号" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="proofingApplyCompleteDate" id="completeDate" required="false" label="完成日期" wrapper="date" labelCol="1" />
<x:inputC name="proofingApplyPageNeedTime" label="版面需求时间" wrapper="date" labelCol="1" fieldCol="2"/> <x:inputC name="proofingApplySampleCnName" label="样品中文名称" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleEnName" label="样品英文名称" maxLength="32" labelCol="1" fieldCol="2"/>
<%-- <x:inputC name="completeDate" label="完成日期" maxLength="32" labelCol="1" fieldCol="2"/>--%> <x:inputC name="proofingApplySampleVersion" label="样品版次" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleSize" label="样品规格" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyCompleteDate" id="completeDate" required="false" label="完成日期" wrapper="date" labelCol="1" /> <x:inputC name="proofingApplySampleNum" label="样品数量" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyOutputSituation" label="产量情况" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleCnName" label="样品中文名称" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="proofingApplyProductNo" label="产品代号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleEnName" label="样品英文名称" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="proofingType" label="打样形式" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleVersion" label="样品版次" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleSize" label="样品规格" maxLength="32" labelCol="1" fieldCol="2"/> <x:selectC name="page" label="版面" dictionary="prodcutLayout" labelCol="1" fieldCol="2"/>
<%-- <x:inputC name="sampleStyle" label="样品款式" maxLength="32" labelCol="1" fieldCol="2"/>--%> <x:inputC name="proofingApplyAllocationType" label="分配方式" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySampleNum" label="样品数量" maxLength="32" labelCol="1" fieldCol="2"/> <x:selectC name="productType" label="产品类别" dictionary="productType" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyOutputSituation" label="产量情况" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyProductNo" label="产品代号" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="proofingApplySurfaceTreatment" label="表面处理" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyNgReReason" label="NG重新打样原因" maxLength="32" labelCol="1" fieldCol="2"/>
<%-- <x:selectC name="proofingType" label="打样形式" labelCol="1" fieldCol="2"/>--%> <x:inputC name="a" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingType" label="打样形式" labelCol="1" fieldCol="2"/> <x:inputC name="proofingApplyTestStandard" label="申请单状态" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
<x:inputC name="page" label="版面" maxLength="32" labelCol="1" fieldCol="2"/> <div><h3>样品外观要求</h3></div>
<div class="hg-form-cols" >
<x:inputC name="proofingApplyAllocationType" label="分配方式" maxLength="32" labelCol="1" fieldCol="2"/> <x:selectC name="isOutput" required="false" label="是否量产" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:selectC name="isOut" required="false" label="是否外发" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:selectC name="allocationType" label="test" list="" labelCol="1" fieldCol="2"/> <x:selectC name="isChange" required="false" label="是否改变" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:inputC name="plasticBagType" required="false" label="塑料袋结构类型" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productType" label="产品类别" labelCol="1" fieldCol="2"/> <x:inputC name="productLength" required="false" label="长度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productWidth" required="false" label="宽度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productHeight" required="false" label="高度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productThick" required="false" label="厚度（mm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplySurfaceTreatment" label="表面处理" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="productSingleLayer" required="false" label="单层厚（丝）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="proofingApplyNgReReason" label="NG重新打样原因" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="productLayerNum" required="false" label="层数" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
<x:inputC name="a" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
</form>
<x:inputC name="proofingApplyTestStandard" label="申请单状态" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
<div><h3>样品外观要求</h3></div>
<div class="hg-form-cols" >
<x:selectC name="isOutput" required="false" label="是否量产" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:selectC name="isOut" required="false" label="是否外发" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:selectC name="isChange" required="false" label="是否改变" dictionary="yesorno" labelCol="1" fieldCol="2"/>
<x:inputC name="plasticBagType" required="false" label="塑料袋结构类型" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productLength" required="false" label="长度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productWidth" required="false" label="宽度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productHeight" required="false" label="高度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productThick" required="false" label="厚度（mm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productSingleLayer" required="false" label="单层厚（丝）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productLayerNum" required="false" label="层数" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
</form>
<div><h3>BOM设置</h3></div> <div><h3>BOM设置</h3></div>
<div id="mobTableGrid" style="margin: 2px;"></div> <div id="mobTableGrid" style="margin: 2px;"></div>
<hr> <hr>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js 0 → 100644
View file @ 91b72ed0
var gridManager = null, refreshFlag = false;
//定义控件列
const proofingMake=
[
{ 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" },
{ display: "版面需求时间", name: "proofingApplyPageNeedTime", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "完成日期", name: "proofingApplyCompleteDate", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "样品中文名称", name: "proofingApplySampleCnName", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "样品英文名称", name: "proofingApplySampleEnName", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "样品版次", name: "proofingApplySampleVersion", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "样品规格", name: "proofingApplySampleSize", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "样品数量", name: "proofingApplySampleNum", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "产量情况", name: "proofingApplyOutputSituation", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "产品代号", name: "proofingApplyProductNo", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "版面", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "分配方式", name: "proofingApplyAllocationType", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "表面处理", name: "proofingApplySurfaceTreatment", width: 140, minWidth: 60, type: "string", align: "left" },
{ display: "NG重新打样原因", name: "proofingApplyNgReReason", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "测试标准", name: "proofingApplyTestStandard", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "申请单状态", name: "proofingApplyApplicationStatus", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "颜色种类", name: "colorType", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "专", name: "expert", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "网版目数", name: "printingPlateNum", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "啤版目数", name: "beerPlateNum", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "模切板模数", name: "dieBoardNum", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "标准色号", name: "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,
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
//双击行响应事件
onDblClickRow : function(data, rowindex, rowobj) {
updateHandler(data.id);
}
});
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() {
// 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
});
}
//新增保存
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();
}
});
}
//编辑按钮
function updateHandler(id) {
if (!id) {
//获取所选行id
id = DataUtil.getUpdateRowId(gridManager);
if (!id) {
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();
}
});
}
//删除按钮
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("删除成功！");
}
reloadGrid();
}
});
}
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @ 91b72ed0
<%@ page contentType="text/html; charset=utf-8" language="java"%> <%@ page contentType="text/html; charset=utf-8" language="java"%>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%> <%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<x:script src='/system/opm/js/OpmUtil.js'/> <x:base include="grid,date" />
<x:script src='/biz/topsun/common/purchaseCommon.js'/> <x:script src='/biz/topsun/proofing/proofingMake.js'/>
<x:script src='/biz/topsun/sample/proofingApply.js'/>
<div class="container-fluid" style="padding: 10px;"> <div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm"> <div><h3>打样制作信息</h3></div>
<%-- <x:hidden name="id" />--%> <div class="hg-form-cols">
<div><h3>基本信息</h3></div> <div id="proofingMakeTableGrid" style="margin: 2px;"></div>
<div class="hg-form-cols"> </div>
<x:inputC name="applicationNo" required="true" readonly="true" label="制作单号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:selectC name="productCode" required="true" label="申请单号" labelCol="1" fieldCol="2"/>
<x:inputC name="customerCode" required="true" label="产品编号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="pageNeedTime" required="true" label="品牌客户编号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="completeDate" required="true" label="版面需求时间" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="completeDate" label="完成日期" required="true" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="sampleCnName" required="true" label="样品中文名称" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="sampleEnName" required="true" label="样品英文名称" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="sampleVersion" required="true" label="样品版次" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="sampleSize" required="true" label="样品规格" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="sampleStyle" required="true" label="样品款式" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="sampleNum" required="true" label="样品数量" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="outputSituation" required="true" label="产量情况" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="productNo" required="true" label="产品代号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:selectC name="proofingType" required="true" label="打样形式" labelCol="1" fieldCol="2"/>
<x:inputC name="page" required="true" label="版面" maxLength="32" labelCol="1" fieldCol="2"/>
<%-- <x:inputC name="allocationType" required="true" label="分配方式" maxLength="32" labelCol="1" fieldCol="2"/>--%>
<x:selectC name="allocationType" required="true" label="分配方式" labelCol="1" fieldCol="2"/>
<x:selectC name="productType" required="true" label="产品类别" labelCol="1" fieldCol="2"/>
<x:inputC name="surfaceTreatment" required="true" label="表面处理" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="ngReReason" required="true" label="NG重新打样原因" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationNo" required="true" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="申请单状态" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="颜色种类" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="专" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="网版目数" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="啤版目数" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="模切板模数" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="标准色号" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
<div><h3>样品外观要求</h3></div>
<div class="hg-form-cols" >
<x:inputC name="isOutput" required="true" label="是否量产" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isOut" required="true" label="是否外发" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isChange" required="true" label="是否改变" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="plasticBagType" required="true" label="塑料袋结构类型" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="length" required="true" label="长度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="width" required="true" label="宽度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="height" required="true" label="高度（cm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="thickness" required="true" label="厚度（mm）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="layerNum" required="true" label="单层厚（丝）" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationStatus" required="true" label="层数" maxLength="32" labelCol="1" fieldCol="2"/>
</div>
</form>
<div><h3>BOM设置</h3></div>
<div id="mobTableGrid" style="margin: 2px;"></div>
<hr>
<%-- <div><h3>工艺设置</h3></div>--%>
<%-- <div><h4>工艺</h4></div>--%>
<%-- <div id="technologyGrid" style="margin: 2px;"></div>--%>
<%-- <div><h4>工序</h4></div>--%>
<%-- <div id="processGrid" style="margin: 2px;"></div>--%>
<%-- <div><h4>工序物料</h4></div>--%>
<%-- <div id="processBomGrid" style="margin: 2px;"></div>--%>
</div> </div>
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeDetail.jsp 0 → 100644
View file @ 91b72ed0
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@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>
</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>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ 91b72ed0
...@@ -72,7 +72,7 @@ public class ProofingApplyController extends CommonController { ...@@ -72,7 +72,7 @@ public class ProofingApplyController extends CommonController {
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询BOM表") @LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询BOM表")
public String slicedQueryBomRule() { public String slicedQueryBom() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String id = sdo.getId(); String id = sdo.getId();
List<BomVo> bom = bomService.getBomVoListByProductId(id); List<BomVo> bom = bomService.getBomVoListByProductId(id);
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.product.application.ProductLookedService;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.vo.BomVo;
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.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.uasp.log.annotation.LogInfo;
import com.huigou.uasp.log.domain.model.LogType;
import com.huigou.uasp.log.domain.model.OperationType;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@ControllerMapping("/proofingMake")
public class ProofingMakeController extends CommonController {
protected String getPagePath() {
return "/biz/topsun/proofing/";
}
@Autowired
ProofingMakeService proofingMakeService;
/**
* 打样制作表单页
* @return
*/
public String forwardProofingMake(){
return forward("proofingMake");
}
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询打样制造表")
public String slicedQueryProofingMake() {
// SDO sdo = this.getSDO();
// String id = sdo.getId();
List<ProofingMakeVo> proofingMakeList = proofingMakeService.getProofingMakeList();
Map<String,Object> map =new HashMap();
map.put("Rows",proofingMakeList);
return toResult(map);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/ProofingApplyBom.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.domain.model;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
/**
* 打样BOM
* @TableName proofing_apply_bom
*/
@Table(name="proofing_apply_bom")
@Data
public class ProofingApplyBom implements Serializable {
/**
* 打样申请单BOMid
*/
@Id
@Column(name = "proofing_apply_bom_id")
private String proofingApplyBomId;
/**
* 产品物料组成id
*/
@Column(name = "product_material_id")
private String productMaterialId;
/**
* 打样申请单id
*/
@Column(name = "proofing_apply_id")
private String proofingApplyId;
/**
* 打样制作单id
*/
@Column(name = "proofing_make_id")
private String proofingMakeId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/ProofingMake.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.domain.model;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
/**
* 打样制作单表
* @TableName proofing_make
*/
@Table(name="proofing_make")
@Entity
@Data
public class ProofingMake{
/**
* 制作单id
*/
@Id
@Column(name = "proofing_make_id")
private String proofingMakeId;
/**
* 制作单号
*/
@Column(name = "proofing_make_no")
private String proofingMakeNo;
/**
* 打样申请单id
*/
@Column(name = "proofing_apply_id")
private String proofingApplyId;
/**
* 申请单号
*/
@Column(name = "application_no")
private String applicationNo;
/**
* 颜色种类
*/
@Column(name = "color_type")
private String colorType;
/**
* 专
*/
private String expert;
/**
* 网版目数
*/
@Column(name = "printing_plate_num")
private Integer printingPlateNum;
/**
* 啤板模数
*/
@Column(name = "beer_plate_num")
private Integer beerPlateNum;
/**
* 模切板模数
*/
@Column(name = "die_board_num")
private Integer dieBoardNum;
/**
* 预定工序流程id
*/
@Column(name = "planned_flow_id")
private String plannedFlowId;
/**
* 文件存储位置
*/
@Column(name = "file_storage_location")
private String fileStorageLocation;
/**
* 样品物料
*/
@Column(name = "sample_material")
private String sampleMaterial;
/**
* 样品制作单状态：create-新建；unauditede-未审核；audited-已审核
*/
@Column(name = "make_status")
private String makeStatus;
/**
* 是否确认：Y-是，N-否；
*/
@Column(name = "is_confirm")
private String isConfirm;
/**
* 样品款式
*/
@Column(name = "sample_style")
private String sampleStyle;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/ProofingTechnology.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.domain.model;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
/**
* 打样工艺
* @TableName proofing_technology
*/
@Table(name="proofing_technology")
@Data
public class ProofingTechnology {
/**
* 打样工艺id
*/
@Id
@Column(name = "proofing_technology_id")
private String proofingTechnologyId;
/**
* 工艺id
*/
@Column(name = "technology_id")
private String technologyId;
/**
* 打样申请单id
*/
@Column(name = "proofing_apply_id")
private String proofingApplyId;
/**
* 打样制作单id
*/
@Column(name = "proofing_make_id")
private String proofingMakeId;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProductVo.java deleted 100644 → 0
View file @ 7c40ab74
package com.huigou.topsun.proofing.domain.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("product")
public class ProductVo {
/**
* 产品编号
*/
private String ProductNo;
}
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.domain.vo;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Id;
import java.util.Date;
/**
* 样品制作表展示
*/
@Data
public class ProofingMakeVo{
/**
* 制作单id
*/
@Column(name = "proofing_make_id")
private String proofingMakeId;
/**
* 制作单号
*/
@Column(name = "proofing_make_no")
private String proofingMakeNo;
/**
* 申请单id
*/
@Column(name = "proofing_apply_id")
private String proofingApplyId;
/**
* 申请单号
*/
@Column(name = "proofing_apply_no")
private String proofingApplyNo;
/**
* 产品id
*/
@Column(name = "product_id")
private String productId;
/**
* 客户id
*/
@Column(name = "customer_id")
private String customerId;
/**
* 版面需求时间
*/
@Column(name = "proofing_apply_page_need_time")
private Date proofingApplyPageNeedTime;
/**
* 完成日期
*/
@Column(name = "proofing_apply_complete_date")
private Date proofingApplyCompleteDate;
/**
* 中文样品名
*/
@Column(name = "proofing_apply_sample_cn_name")
private String proofingApplySampleCnName;
/**
* 英文样品名
*/
@Column(name = "proofing_apply_sample_en_name")
private String proofingApplySampleEnName;
/**
* 样品版次
*/
@Column(name = "proofing_apply_sample_version")
private Integer proofingApplySampleVersion;
/**
* 样品规格
*/
@Column(name = "proofing_apply_sample_size")
private Integer proofingApplySampleSize;
/**
* 样品数量
*/
@Column(name = "proofing_apply_sample_num")
private Long proofingApplySampleNum;
/**
* 产量情况
*/
@Column(name = "proofing_apply_output_situation")
private String proofingApplyOutputSituation;
/**
* 产品代号
*/
@Column(name = "proofing_apply_product_no")
private String proofingApplyProductNo;
/**
* 打样形式
*/
@Column(name = "proofing_type")
private String proofingType;
/**
* 版面
*/
/**
* 分配方式
*/
@Column(name = "proofing_apply_allocation_type")
private String proofingApplyAllocationType;
/**
* 产品类别
*/
/**
* 表面处理
*/
@Column(name = "proofing_apply_surface_treatment")
private String proofingApplySurfaceTreatment;
/**
* NG重新打样原因
*/
@Column(name = "proofing_apply_ng_re_reason")
private String proofingApplyNgReReason;
/**
*申请单状态
*/
@Column(name = "proofing_apply_application_status")
private String proofingApplyApplicationStatus;
/**
*测试标准
*/
@Column(name = "proofing_apply_test_standard")
private String proofingApplyTestStandard;
/**
*颜色种类
*/
@Column(name = "color_type")
private String colorType;
/**
*专
*/
@Column(name = "expert")
private String expert;
/**
*网版目数
*/
@Column(name = "printing_plate_num")
private String printingPlateNum;
/**
*啤版目数
*/
@Column(name = "beer_plate_num")
private String beerPlateNum;
/**
*模切板目数
*/
@Column(name = "die_board_num")
private String dieBoardNum;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyRepository.java
View file @ 91b72ed0
...@@ -4,4 +4,6 @@ import com.huigou.topsun.proofing.domain.model.ProofingApply; ...@@ -4,4 +4,6 @@ import com.huigou.topsun.proofing.domain.model.ProofingApply;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
public interface ProofingApplyRepository extends JpaRepository<ProofingApply, String> { public interface ProofingApplyRepository extends JpaRepository<ProofingApply, String> {
ProofingApply findByProofingApplyId(String proofingApplyId);
} }
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingMakeRepository.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface ProofingMakeRepository extends JpaRepository<ProofingMake, String> {
// List<ProofingMake> findById(String id);
}
topsun/src/main/java/com/huigou/topsun/proofing/service/ProofingMakeService.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.service;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import java.util.List;
public interface ProofingMakeService {
/**
* 根据id查询打样制造详情信息
* @return
*/
// List<ProofingMakeVo> getProofingMakeVoListById(Long id);
public List<ProofingMakeVo> getProofingMakeList();
}
topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java 0 → 100644
View file @ 91b72ed0
package com.huigou.topsun.proofing.service.impl;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingApplyRepository;
import com.huigou.topsun.proofing.repository.ProofingMakeRepository;
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 java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class ProofingMakeServiceImpl implements ProofingMakeService {
@Autowired
ProofingMakeRepository proofingMakeRepository;
@Autowired
ProofingApplyRepository proofingApplyRepository;
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;
})
.collect(Collectors.toList());
}
}
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml
View file @ 91b72ed0
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<field name="productName" title="产品编码" code="productName" width="200" /> <field name="productName" title="产品编码" code="productName" width="200" />
</easy-search> </easy-search>
<easy-search name="productType" desc="产品状态" > <!-- <easy-search name="productType" desc="产品状态" >-->
<sql>select pc.* from <!-- <sql>select pc.* from-->
product_category pc</sql> <!-- product_category pc</sql>-->
<field name="productCategoryName" title="产品名称" code="productCategoryName" type="hidden" width="300"/> <!-- <field name="productCategoryName" title="产品名称" code="productCategoryName" type="hidden" width="300"/>-->
<field name="productCategoryStatus" title="产品状态" code="productCategoryStatus" width="200"/> <!-- <field name="productCategoryStatus" title="产品状态" code="productCategoryStatus" width="200"/>-->
<field name="productCategoryCode" title="产品编码" code="productCategoryCode" type="hidden" width="300"/> <!-- <field name="productCategoryCode" title="产品编码" code="productCategoryCode" type="hidden" width="300"/>-->
<field name="productCategoryId" code="productCategoryId" type='hidden' /> <!-- <field name="productCategoryId" code="productCategoryId" type='hidden' />-->
</easy-search> <!-- </easy-search>-->
</easy-search-mappings> </easy-search-mappings>
\ No newline at end of file
topsun/topsun.iml 0 → 100644
View file @ 91b72ed0
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
</component>
</module>
\ 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