Skip to content

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

指导单

parent 5486dfcd
Hide whitespace changes
Inline Side-by-side
Showing with 542 additions and 297 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp
View file @ 75ac4ca3
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="proofingApplyNo" readonly="true" label="申请单号" maxLength="32" labelCol="1" <x:inputC name="proofingApplyNo" readonly="true" label="申请单号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productId" wrapper="select" label="产品编号" labelCol="1" fieldCol="2"/> <x:inputC name="productId" wrapper="select" label="产品编号" labelCol="1" fieldCol="2"/>
<x:inputC name="customerId" label="品牌客户编号" readonly="true" labelCol="1" fieldCol="2"/> <x:inputC name="customerId" label="品牌客户编号" readonly="true" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ 75ac4ca3
...@@ -27,8 +27,6 @@ function initialize(){ ...@@ -27,8 +27,6 @@ function initialize(){
} }
$("#formButton").hide(); $("#formButton").hide();
} }
} }
//绑定selectC //绑定selectC
...@@ -59,9 +57,9 @@ function saveForm(){ ...@@ -59,9 +57,9 @@ function saveForm(){
let productId=$("#productId").val(); let productId=$("#productId").val();
let proofingMakeNo=$("#proofingMakeNo").val(); let proofingMakeNo=$("#proofingMakeNo").val();
UICtrl.addTabItem({ UICtrl.addTabItem({
tabid: 'workInstrcutionApply'+proofingMakeNo, tabid: 'workInstructionApply'+proofingMakeNo,
text: "作业指导申请书", text: "作业指导申请书",
url: web_app.name + '/workInstrcutionApply/forwardWorkInstrcutionApply.do?productId='+productId url: web_app.name + '/workInstructionApply/forwardWorkInstructionApply.do?productId='+productId
}); });
} }
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.js
View file @ 75ac4ca3
...@@ -142,7 +142,7 @@ function loadTechnologyListGrid() { ...@@ -142,7 +142,7 @@ function loadTechnologyListGrid() {
{display: "标准色号", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "标准色号", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left"},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/proofingMake/slicedQueryProofingMake.ajax', url: web_app.name + '/proofingMake/slicedQueryProofingList.ajax',
pageSize: 10, pageSize: 10,
usePager: true, usePager: true,
toolbar: toolbarOptions, toolbar: toolbarOptions,
...@@ -239,7 +239,7 @@ function deleteHandler() { ...@@ -239,7 +239,7 @@ function deleteHandler() {
function doView(proofingMakeId) { function doView(proofingMakeId) {
UICtrl.addTabItem({ UICtrl.addTabItem({
tabid: 'showProofingMake', tabid: 'showProofingMake'+proofingMakeId,
text: "制造单详情", text: "制造单详情",
url: web_app.name + '/proofingMake/forwardDetailsProofingMake.job?id='+proofingMakeId url: web_app.name + '/proofingMake/forwardDetailsProofingMake.job?id='+proofingMakeId
}); });
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstrcutionApply.jsp
View file @ 75ac4ca3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<x:base include="grid,date,layout,combox,tree,comboDialog,attachment"/> <x:base include="grid,date,layout,combox,tree,comboDialog,attachment"/>
<x:script src='/system/opm/js/OpmUtil.js'/> <x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/> <x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/proofing/workInstrcutionApply.js'/> <x:script src='/biz/topsun/proofing/workInstructionApply.js'/>
<div class="container-fluid" style="padding: 10px;"> <div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:billTitle title="作业指导申请书" needStatus="false" needPerson="true"/> <x:billTitle title="作业指导申请书" needStatus="false" needPerson="true"/>
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<div style="margin: 10px;"> <div style="margin: 10px;">
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:hidden name="proofingApplyId"/> <x:hidden name="proofingApplyId"/>
<x:inputC name="workInstrcutionApplyId" readonly="true" label="指导书编号" labelCol="2" fieldCol="2"/> <x:hidden name="proofingMakeId"/>
<x:inputC name="workInstructionApplyId" readonly="true" label="指导书编号" labelCol="2" fieldCol="2"/>
<x:inputC name="productId" label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/> <x:inputC name="productId" label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/>
...@@ -33,17 +34,17 @@ ...@@ -33,17 +34,17 @@
<x:inputC name="storeName" label="仓库" maxLength="32" labelCol="2" <x:inputC name="storeName" label="仓库" maxLength="32" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="sizeGroup" label="尺码组" maxLength="32" labelCol="2" fieldCol="2"/>
<x:inputC name="isDisable" label="是否禁用" labelCol="2" fieldCol="2"/> <x:selectC name="isDisable" label="是否禁用" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="是否创建新规格书" maxLength="32" labelCol="2" fieldCol="2"/> <x:selectC name="isNewSpecification" label="是否创建新规格书" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:inputC name="isShoePattern" label="是否要鞋图" labelCol="2" fieldCol="2"/> <x:selectC name="isShoePattern" label="是否要鞋图" dictionary="yesorno" labelCol="2" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="是否附样品" maxLength="32" labelCol="2" <x:selectC name="isAttachedSample" label="是否附样品" dictionary="yesorno" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="是否唯一码产品" maxLength="32" labelCol="2" <x:selectC name="isOnlyCode" label="是否唯一码产品" dictionary="yesorno" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否不考虑形体配色" maxLength="32" labelCol="2" <x:selectC name="isBodyColor" label="是否不考虑形体配色" dictionary="yesorno" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.js
View file @ 75ac4ca3
$(document).ready(function () {
bindQueryEvent();
});
//绑定selectC
function bindQueryEvent() {
debugger
$('#productId').searchbox({
type: "product", name: "productDetail",
onChange: function (value, data) {
debugger
$('#submitForm').formSet(data);
}
});
}
function saveForm(){
var _self=this;
$('#submitForm').ajaxSubmit({
url : web_app.name + '/workInstruction/saveWorkInstruction.ajax',
param:{},
success : function(data) {
if (data == "1"){
Public.successTip("保存成功！");
}
_self.close();
}
});
let productId=$("#productId").val();
let proofingMakeNo=$("#proofingMakeNo").val();
UICtrl.addTabItem({
tabid: 'workInstructionApply'+proofingMakeNo,
text: "作业指导申请书",
url: web_app.name + '/workInstructionApply/forwardWorkInstructionApply.do?productId='+productId
});
}
function resetForm(obj) {
$(obj).formClean();
}
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.jsp
View file @ 75ac4ca3
...@@ -4,240 +4,242 @@ ...@@ -4,240 +4,242 @@
<x:base include="grid,date,layout,combox,tree,comboDialog,attachment"/> <x:base include="grid,date,layout,combox,tree,comboDialog,attachment"/>
<x:script src='/system/opm/js/OpmUtil.js'/> <x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/> <x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/proofing/workInstrcutionApply.js'/> <x:script src='/biz/topsun/proofing/workInstruction.js'/>
<div class="container-fluid" style="padding: 10px;"> <div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:billTitle title="作业指导书" needStatus="false" needPerson="true"/> <x:billTitle title="作业指导书" needStatus="false" needPerson="true"/>
<div><h3>基本信息</h3></div>
<div style="margin: 10px;"> <div style="margin: 10px;">
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:hidden name="workInstructionApplyId"/>
<x:inputC name="productId" label="产品编号" wrapper="select" labelCol="1" fieldCol="2"/>
<x:inputC name="productId" label="产品编号" wrapper="select" labelCol="2" fieldCol="2"/> <x:inputC name="productName" label="产品名称" labelCol="1" fieldCol="2"/>
<x:inputC name="specificationNo" label="产品名称" labelCol="2" fieldCol="2"/> <x:inputC name="productCategoryName" label="产品类别" labelCol="1"
<x:inputC name="productType" label="产品类别" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="brandName" label="单位" maxLength="32" labelCol="2" <x:inputC name="brandName" label="单位" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="proofingApplySampleEnName" label="尺码组" maxLength="32" labelCol="2" <x:inputC name="proofingApplySampleEnName" label="尺码组" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="proofingApplySampleVersion" label="唯一码产品" maxLength="32" labelCol="2" <x:inputC name="proofingApplySampleVersion" label="唯一码产品" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productName" label="不考虑形体配色" maxLength="32" labelCol="2" <x:inputC name="productName" label="不考虑形体配色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productEnglishName" label="是否禁用" maxLength="32" labelCol="2" <x:selectC name="productEnglishName" label="是否禁用" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="storeName" label="是否建立BON表" maxLength="32" labelCol="2" <x:selectC name="isBuildBom" label="是否建立BON表" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="确认日期" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="confirmDate" label="确认日期" maxLength="32" wrapper="date" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="确认人" labelCol="2" fieldCol="2"/> <x:inputC name="comfirmPerson" label="确认人" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="是否免检" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="isFreeInspection" label="是否免检" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="不要质量loss%" labelCol="2" fieldCol="2"/> <x:inputC name="isNoQualityLoss" label="不要质量loss%" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="样品单号" maxLength="32" labelCol="2" <x:inputC name="sampleOrderNo" label="样品单号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="库存编码" maxLength="32" labelCol="2" <x:inputC name="stockNo" label="库存编码" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="库存名称" maxLength="32" labelCol="2" <x:inputC name="stockName" label="库存名称" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="存档编号" maxLength="32" labelCol="2" <x:inputC name="fileNo" label="存档编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="品牌" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="品牌" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
<x:title title="可选属性" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="storeName" label="制造工厂" maxLength="32" labelCol="2" <x:inputC name="storeName" label="制造工厂" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="客户名称" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="sizeGroup" label="客户名称" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="版面" labelCol="2" fieldCol="2"/> <x:inputC name="isDisable" label="版面" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="材料代号" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="isNewSpecification" label="材料代号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="产品代号" labelCol="2" fieldCol="2"/> <x:inputC name="isShoePattern" label="产品代号" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="型体配色" maxLength="32" labelCol="2" <x:inputC name="isAttachedSample" label="型体配色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="客户料号" maxLength="32" labelCol="2" <x:inputC name="isOnlyCode" label="客户料号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="版本号" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="版本号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否创建新作业指导书" maxLength="32" labelCol="2" <x:selectC name="isBodyColor" label="是否创建新作业指导书" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="规格书编号" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="规格书编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
<x:title title="产品外观" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="storeName" label="长度" maxLength="32" labelCol="2" <x:inputC name="productLength" label="长度" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="宽度" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="productWidth" label="宽度" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="高度" labelCol="2" fieldCol="2"/> <x:inputC name="productHeight" label="高度" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="厚度" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="productThick" label="厚度" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="成品克重" labelCol="2" fieldCol="2"/> <x:inputC name="productWeight" label="成品克重" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="直角" maxLength="32" labelCol="2" <x:inputC name="productAngleType" label="直角" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="异形" maxLength="32" labelCol="2" <x:inputC name="isOnlyCode" label="异形" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="圆角" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="圆角" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="孔径" maxLength="32" labelCol="2" <x:inputC name="productAperture" label="孔径" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="单层厚" maxLength="32" labelCol="2" <x:inputC name="productSingleLayer" label="单层厚" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="单重" maxLength="32" labelCol="2" <x:inputC name="productSingleWeight" label="单重" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="层数" maxLength="32" labelCol="2" <x:inputC name="productLayerNum" label="层数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否防雾" maxLength="32" labelCol="2" <x:selectC name="productMould" label="是否防雾" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否写码" maxLength="32" labelCol="2" <x:selectC name="productCoding" label="是否写码" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="体系认证" maxLength="32" labelCol="2" <x:inputC name="productSysCertification" label="体系认证" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="仓库" maxLength="32" labelCol="2" <x:inputC name="storeName" label="仓库" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="单位" maxLength="32" labelCol="2" <x:inputC name="productBuyUnit" label="单位" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="采购换算值" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="采购换算值" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="系数" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="系数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
<x:title title="排版参数" name="group" />
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="storeName" label="模数" maxLength="32" labelCol="2" <x:inputC name="modulus" label="模数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="列" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="columnNum" label="列" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="行" labelCol="2" fieldCol="2"/> <x:inputC name="rowNum" label="行" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="搭版数" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="contactNum" label="搭版数" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="列双刀位" labelCol="2" fieldCol="2"/> <x:inputC name="columnDoubleBlade" label="列双刀位" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="行双刀位" maxLength="32" labelCol="2" <x:inputC name="rowDoubleBlade" label="行双刀位" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="派工倍数" maxLength="32" labelCol="2" <x:inputC name="dispatchMultiple" label="派工倍数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="印章长度" maxLength="32" labelCol="2" <x:inputC name="sheetLength" label="印章长度" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="印章宽度" maxLength="32" labelCol="2" <x:inputC name="sheetWidth" label="印章宽度" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="产品印章设置" maxLength="32" labelCol="2" <x:inputC name="productSheetConf" label="产品印章设置" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="正面颜色" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="正面颜色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="反面颜色" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="反面颜色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="产品承印物" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="产品承印物" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="啤版编号" maxLength="32" labelCol="2" <x:inputC name="beerPlateNo" label="啤版编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="烫金版编号" maxLength="32" labelCol="2" <x:inputC name="goldPlateNo" label="烫金版编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="模切版编号" maxLength="32" labelCol="2" <x:inputC name="dieCutPlateNo" label="模切版编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="铜版及树脂编号" maxLength="32" labelCol="2" <x:inputC name="copperpResinLateNo" label="铜版及树脂编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="网版编号" maxLength="32" labelCol="2" <x:inputC name="netPlateNo" label="网版编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="工艺制成" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="工艺制成" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="storeName" label="产品性质" maxLength="32" labelCol="1"
<x:inputC name="storeName" label="产品性质" maxLength="32" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="工艺要求" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="sizeGroup" label="工艺要求" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="包装方式" labelCol="2" fieldCol="2"/> <x:inputC name="packageStyle" label="包装方式" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="物性测试" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="physicalTest" label="物性测试" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="化性测试" labelCol="2" fieldCol="2"/> <x:inputC name="chemistryTest" label="化性测试" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="产品材质" maxLength="32" labelCol="2" <x:inputC name="isAttachedSample" label="产品材质" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="塑料袋结构" maxLength="32" labelCol="2" <x:inputC name="isOnlyCode" label="塑料袋结构" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="铜版编号" maxLength="32" labelCol="2" <x:inputC name="copperpNo" label="铜版编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="色卡号" maxLength="32" labelCol="2" <x:inputC name="colorNoCard" label="色卡号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="膜具编号" maxLength="32" labelCol="2" <x:inputC name="plateNo" label="膜具编号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="表面处理" maxLength="32" labelCol="2" <x:inputC name="surfaceTreatment" label="表面处理" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="产品描述" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="产品描述" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="产品正面（删除图片）" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="产品正面（删除图片）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="产品背面（删除图片）" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="产品背面（删除图片）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="风险描述（序号、内容、等级）" maxLength="32" labelCol="2" <x:inputC name="riskDescription" label="风险描述（序号、内容、等级）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否附样图" maxLength="32" labelCol="2" <x:selectC name="haveDrawing" label="是否附样图" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="是否要鞋图" maxLength="32" labelCol="2" <x:selectC name="isBodyColor" label="是否要鞋图" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="啤版模数" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="啤版模数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="模切板模数" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="模切板模数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="分切方向" maxLength="32" labelCol="2" <x:inputC name="cutDirection" label="分切方向" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="海关商品编码" maxLength="32" labelCol="2" <x:inputC name="customsCommodityCode" label="海关商品编码" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
<x:title title="客户loss" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="storeName" label="客户" maxLength="32" labelCol="2" <x:inputC name="storeName" label="客户" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="新增分段" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="sizeGroup" label="新增分段" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="数量上限" labelCol="2" fieldCol="2"/> <x:inputC name="isDisable" label="数量上限" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="Loos%" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="isNewSpecification" label="Loos%" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="冗余量" labelCol="2" fieldCol="2"/> <x:inputC name="isShoePattern" label="冗余量" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="备注" maxLength="32" labelCol="2" <x:inputC name="isAttachedSample" label="备注" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="删除分段" maxLength="32" labelCol="2" <x:inputC name="isOnlyCode" label="删除分段" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
<x:title title="物料信息" name="group" />
<div class="hg-form-cols"> <div class="hg-form-cols">
<x:inputC name="storeName" label="BOM单号" maxLength="32" labelCol="2" <x:inputC name="storeName" label="BOM单号" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sizeGroup" label="版本号" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="sizeGroup" label="版本号" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isDisable" label="数量" labelCol="2" fieldCol="2"/> <x:inputC name="isDisable" label="数量" labelCol="1" fieldCol="2"/>
<x:inputC name="isNewSpecification" label="录入人" maxLength="32" labelCol="2" fieldCol="2"/> <x:inputC name="isNewSpecification" label="录入人" maxLength="32" labelCol="1" fieldCol="2"/>
<x:inputC name="isShoePattern" label="录入日期" labelCol="2" fieldCol="2"/> <x:inputC name="isShoePattern" label="录入日期" labelCol="1" fieldCol="2"/>
<x:inputC name="isAttachedSample" label="修改人" maxLength="32" labelCol="2" <x:inputC name="isAttachedSample" label="修改人" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isOnlyCode" label="修改日期" maxLength="32" labelCol="2" <x:inputC name="isOnlyCode" label="修改日期" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="状态（启用、禁用）" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="状态（启用、禁用）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="审核状态" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="审核状态" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="审核人" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="审核人" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="审核时间" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="审核时间" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="备注" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="备注" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="印章长度" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="印章长度" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="印章宽度" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="印章宽度" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="满排个数" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="满排个数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isBodyColor" label="损耗" maxLength="32" labelCol="2" <x:inputC name="isBodyColor" label="损耗" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstrcutionApply.js → topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.js
View file @ 75ac4ca3
...@@ -14,18 +14,27 @@ function bindQueryEvent() { ...@@ -14,18 +14,27 @@ function bindQueryEvent() {
function saveForm(){ function saveForm(){
debugger
var _self=this; var _self=this;
$('#submitForm').ajaxSubmit({ $('#submitForm').ajaxSubmit({
url : web_app.name + '/workInstrcutionApply/saveWorkInstrcutionApply.ajax', url : web_app.name + '/workInstructionApply/saveWorkInstructionApply.ajax',
param:{}, param:{},
success : function(data) { success : function(data) {
if (data == "1"){ if (data !== null){
Public.successTip("保存成功！"); Public.successTip("保存成功！");
addTabWorkInstruction(data.workInstructionApplyId);
} }
_self.close(); _self.close();
} }
}); });
}
function addTabWorkInstruction(workInstructionApplyId){
UICtrl.addTabItem({
tabid: 'workInstruction'+workInstructionApplyId,
text: "作业指导申请书",
url: web_app.name + '/workInstruction/forwardWorkInstruction.do?workInstructionApplyId='+workInstructionApplyId
});
} }
......
topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstrcutionApplyApplication.java deleted 100644 → 0
View file @ 5486dfcd
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply;
public interface WorkInstrcutionApplyApplication {
void saveWorkInstrcutionApply(WorkInstrcutionApply workInstrcutionApply);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstructionApplication.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application; package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstruction; import com.huigou.topsun.proofing.domain.model.WorkInstruction;
import com.huigou.topsun.proofing.repository.WorkInstructionRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionApplication { public interface WorkInstructionApplication {
String saveWorkInstruction(WorkInstruction workInstruction);
} }
topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstructionApplyApplication.java 0 → 100644
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
public interface WorkInstructionApplyApplication {
void saveWorkInstructionApply(WorkInstructionApply workInstructionApply);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstructionPdPublishedConfApplication.java 0 → 100644
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstructionPdPublishedConf;
import org.springframework.stereotype.Service;
import java.io.Serializable;
public interface WorkInstructionPdPublishedConfApplication {
void saveWorkInstructionPdPublishedConf(WorkInstructionPdPublishedConf workInstructionPdPublishedConf);
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplicationImpl.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application.impl; package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstructionApplication; import com.huigou.topsun.proofing.application.WorkInstructionApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstruction;
import com.huigou.topsun.proofing.repository.WorkInstructionRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class WorkInstructionApplicationImpl implements WorkInstructionApplication { public class WorkInstructionApplicationImpl implements WorkInstructionApplication {
@Autowired
WorkInstructionRepository workInstructionRepository;
@Override
public String saveWorkInstruction(WorkInstruction workInstruction) {
workInstructionRepository.save(workInstruction);
return workInstruction.getWorkInstructionId();
}
} }
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstrcutionApplyApplicationImpl.java → topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplyApplicationImpl.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application.impl; package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstructionApplyApplication;
import com.huigou.topsun.proofing.application.WorkInstrcutionApplyApplication; import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply; import com.huigou.topsun.proofing.repository.WorkInstructionApplyRepository;
import com.huigou.topsun.proofing.repository.WorkInstrcutionApplyRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class WorkInstrcutionApplyApplicationImpl implements WorkInstrcutionApplyApplication { public class WorkInstructionApplyApplicationImpl implements WorkInstructionApplyApplication {
@Autowired @Autowired
WorkInstrcutionApplyRepository workInstrcutionApplyRepository; WorkInstructionApplyRepository workInstructionApplyRepository;
@Override @Override
public void saveWorkInstrcutionApply(WorkInstrcutionApply workInstrcutionApply) { public void saveWorkInstructionApply(WorkInstructionApply workInstructionApply) {
workInstrcutionApplyRepository.save(workInstrcutionApply); workInstructionApplyRepository.save(workInstructionApply);
} }
} }
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionPdPublishedConfApplicationImpl.java 0 → 100644
View file @ 75ac4ca3
package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstructionApplication;
import com.huigou.topsun.proofing.application.WorkInstructionPdPublishedConfApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstruction;
import com.huigou.topsun.proofing.domain.model.WorkInstructionPdPublishedConf;
import com.huigou.topsun.proofing.repository.WorkInstructionPdPublishedConfRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class WorkInstructionPdPublishedConfApplicationImpl implements WorkInstructionPdPublishedConfApplication {
@Autowired
WorkInstructionPdPublishedConfRepository workInstructionPdPublishedConfRepository;
@Override
public void saveWorkInstructionPdPublishedConf(WorkInstructionPdPublishedConf workInstructionPdPublishedConf) {
workInstructionPdPublishedConfRepository.save(workInstructionPdPublishedConf);
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ 75ac4ca3
...@@ -60,15 +60,13 @@ public class ProofingApplyController extends CommonController { ...@@ -60,15 +60,13 @@ public class ProofingApplyController extends CommonController {
* @return * @return
*/ */
public String forwardProofingApply(){ public String forwardProofingApply(){
this.putAttribute("processDefinitionKey",ProofingApplyApplication.PROCESS_DEFINITION_KEY); this.putAttribute("processDefinitionKey",ProofingApplyApplication.PROCESS_DEFINITION_KEY);
this.putAttribute("procUnitId", "Apply"); this.putAttribute("procUnitId", "Apply");//定义流程环节的id
ProofingApply proofingApply = new ProofingApply(); ProofingApply proofingApply = new ProofingApply();
proofingApply.setStatusId(BizBillStatus.APPLYING.getId()); proofingApply.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator(); Operator operator = getOperator();//获取当前操作员的详情信息
proofingApply.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName())); proofingApply.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
proofingApply.setProofingApplyNo(proofingApply.getBillCode()); proofingApply.setProofingApplyNo(proofingApply.getBillCode()); //将生成的单号赋予实体类对应字段
return forward("proofingApply",proofingApply); return forward("proofingApply",proofingApply);
} }
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ 75ac4ca3
...@@ -32,7 +32,6 @@ public class ProofingMakeController extends CommonController { ...@@ -32,7 +32,6 @@ public class ProofingMakeController extends CommonController {
protected String getPagePath() { protected String getPagePath() {
return "/biz/topsun/proofing/"; return "/biz/topsun/proofing/";
} }
@Autowired @Autowired
ProofingMakeApplication proofingMakeApplication; ProofingMakeApplication proofingMakeApplication;
@Autowired @Autowired
...@@ -41,6 +40,15 @@ public class ProofingMakeController extends CommonController { ...@@ -41,6 +40,15 @@ public class ProofingMakeController extends CommonController {
ProductLookedApplication productLookedApplication; ProductLookedApplication productLookedApplication;
/**
* 跳转打样制造查询页
* @return
*/
public String forwardProofingMakeList(){
return forward("proofingMakeList");
}
/** /**
* 打样制作表单页 * 打样制作表单页
* @return * @return
...@@ -53,16 +61,10 @@ public class ProofingMakeController extends CommonController { ...@@ -53,16 +61,10 @@ public class ProofingMakeController extends CommonController {
} }
/** /**
* 打样制作查询页 * 分页查询打样制造表
* @return * @return
*/ */
public String forwardProofingMakeList(){ public String slicedQueryProofingList() {
return forward("proofingMakeList");
}
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询打样制造表")
public String slicedQueryProofingMake() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
ProofingMakeQueryRequest queryRequest = sdo.toQueryRequest(ProofingMakeQueryRequest.class); ProofingMakeQueryRequest queryRequest = sdo.toQueryRequest(ProofingMakeQueryRequest.class);
Map<String, Object> map = proofingMakeApplication.slicedProofingMakeQuery(queryRequest); Map<String, Object> map = proofingMakeApplication.slicedProofingMakeQuery(queryRequest);
...@@ -89,17 +91,10 @@ public class ProofingMakeController extends CommonController { ...@@ -89,17 +91,10 @@ public class ProofingMakeController extends CommonController {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
ProofingMake proofingMake = sdo.toObject(ProofingMake.class); ProofingMake proofingMake = sdo.toObject(ProofingMake.class);
proofingMakeApplication.saveProofingMake(proofingMake); proofingMakeApplication.saveProofingMake(proofingMake);
return success(proofingMake); return success(proofingMake);
} }
// public String deleteProofingMakeByProofingMakeId(){
// SDO sdo = this.getSDO();
// String proofingMakeId = sdo.getString("ids");
// proofingMakeApplication.deleteProofingMakeVo(proofingMakeId);
// return success();
// }
/** /**
* 根据单号回显相关数据 * 根据单号回显相关数据
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/WorkInstrcutionApplyController.java → topsun/src/main/java/com/huigou/topsun/proofing/controller/WorkInstructionApplyController.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.controller; package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.product.application.ProductApplication; import com.huigou.topsun.product.application.ProductApplication;
import com.huigou.topsun.proofing.application.WorkInstrcutionApplyApplication; import com.huigou.topsun.proofing.application.WorkInstructionApplyApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply; import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO; import com.huigou.util.SDO;
...@@ -13,8 +13,8 @@ import java.util.UUID; ...@@ -13,8 +13,8 @@ import java.util.UUID;
@Controller @Controller
@ControllerMapping("/workInstrcutionApply") @ControllerMapping("/workInstructionApply")
public class WorkInstrcutionApplyController extends CommonController { public class WorkInstructionApplyController extends CommonController {
protected String getPagePath() { protected String getPagePath() {
return "/biz/topsun/proofing/"; return "/biz/topsun/proofing/";
...@@ -23,7 +23,7 @@ public class WorkInstrcutionApplyController extends CommonController { ...@@ -23,7 +23,7 @@ public class WorkInstrcutionApplyController extends CommonController {
@Autowired @Autowired
ProductApplication productApplication; ProductApplication productApplication;
@Autowired @Autowired
WorkInstrcutionApplyApplication workInstrcutionApplyApplication; WorkInstructionApplyApplication workInstructionApplyApplication;
/** /**
...@@ -31,28 +31,24 @@ public class WorkInstrcutionApplyController extends CommonController { ...@@ -31,28 +31,24 @@ public class WorkInstrcutionApplyController extends CommonController {
* 如果有productId参数，就说明从打样制造单发送的请求，携带该参数跳转 * 如果有productId参数，就说明从打样制造单发送的请求，携带该参数跳转
* @return * @return
*/ */
public String forwardWorkInstrcutionApply(){ public String forwardWorkInstructionApply(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String productId = sdo.getString("productId"); String productId = sdo.getString("productId");
String workInstructionApplyId = UUID.randomUUID().toString().replace("-", "");
this.putAttribute("workInstructionApplyId",workInstructionApplyId);
if(productId!=null&&!"".equals(productId))this.putAttribute("productId", productId); if(productId!=null&&!"".equals(productId))this.putAttribute("productId", productId);
return forward("workInstrcutionApply"); return forward("workInstructionApply");
} }
public String queryWorkInstrcutionApply() {
SDO sdo = this.getSDO();
String productId = sdo.getString("productId");
return toResult(null);
}
/** /**
* 添加指导申请书 * 添加指导申请书
*/ */
public String saveWorkInstrcutionApply(){ public String saveWorkInstructionApply(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
WorkInstrcutionApply workInstrcutionApply = sdo.toObject(WorkInstrcutionApply.class); WorkInstructionApply workInstructionApply = sdo.toObject(WorkInstructionApply.class);
workInstrcutionApplyApplication.saveWorkInstrcutionApply(workInstrcutionApply); workInstructionApplyApplication.saveWorkInstructionApply(workInstructionApply);
return toResult(workInstrcutionApply); return toResult(workInstructionApply);
} }
} }
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/WorkInstructionController.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.controller; package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.product.application.ProductApplication; import com.huigou.topsun.proofing.application.WorkInstructionApplication;
import com.huigou.topsun.proofing.application.WorkInstrcutionApplyApplication; import com.huigou.topsun.proofing.application.WorkInstructionPdPublishedConfApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply; import com.huigou.topsun.proofing.domain.model.WorkInstruction;
import com.huigou.topsun.proofing.domain.model.WorkInstructionPdPublishedConf;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO; import com.huigou.util.SDO;
...@@ -18,17 +19,38 @@ public class WorkInstructionController extends CommonController { ...@@ -18,17 +19,38 @@ public class WorkInstructionController extends CommonController {
return "/biz/topsun/proofing/"; return "/biz/topsun/proofing/";
} }
@Autowired
WorkInstructionApplication workInstructionApplication;
@Autowired
WorkInstructionPdPublishedConfApplication workInstructionPdPublishedConfApplication;
/** /**
* 跳转作业指导申请书 * 跳转作业指导书
* 如果有productId参数，就说明从打样制造单发送的请求，携带该参数跳转 * 如果有productId参数，就说明从打样制造单发送的请求，携带该参数跳转
* @return * @return
*/ */
public String forwardWorkInstruction(){ public String forwardWorkInstruction(){
SDO sdo = this.getSDO();
String workInstructionApplyId = sdo.getString("workInstructionApplyId");
if(workInstructionApplyId!=null&&!"".equals(workInstructionApplyId)) this.putAttribute("workInstructionApplyId", workInstructionApplyId);
return forward("workInstruction"); return forward("workInstruction");
} }
/**
* 编辑作业指导书
* @return
*/
public String saveWorkInstruction(){
SDO sdo = this.getSDO();
WorkInstruction workInstruction = sdo.toObject(WorkInstruction.class);
WorkInstructionPdPublishedConf workInstructionPdPublishedConf = sdo.toObject(WorkInstructionPdPublishedConf.class);
String workInstructionId = workInstructionApplication.saveWorkInstruction(workInstruction);
workInstructionPdPublishedConf.setWorkInstructionId(workInstructionId);
workInstructionPdPublishedConfApplication.saveWorkInstructionPdPublishedConf(workInstructionPdPublishedConf);
return success();
}
} }
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstruction.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.domain.model; package com.huigou.topsun.proofing.domain.model;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -21,6 +19,13 @@ public class WorkInstruction implements Serializable { ...@@ -21,6 +19,13 @@ public class WorkInstruction implements Serializable {
* 作业指导书 * 作业指导书
*/ */
@Id @Id
@GeneratedValue(
generator = "system-uuid"
)
@GenericGenerator(
name = "system-uuid",
strategy = "guid"
)
@Column(name = "work_instruction_id") @Column(name = "work_instruction_id")
private String workInstructionId; private String workInstructionId;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstrcutionApply.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstructionApply.java
View file @ 75ac4ca3
...@@ -7,18 +7,18 @@ import lombok.Data; ...@@ -7,18 +7,18 @@ import lombok.Data;
/** /**
* 作业指导申请书 * 作业指导申请书
* @TableName work_instrcution_apply * @TableName work_instruction_apply
*/ */
@Table(name="work_instrcution_apply") @Table(name="work_instruction_apply")
@Entity @Entity
@Data @Data
public class WorkInstrcutionApply implements Serializable { public class WorkInstructionApply implements Serializable {
/** /**
* 作业指导申请书id * 作业指导申请书id
*/ */
@Id @Id
@Column(name = "work_instrcution_apply_id") @Column(name = "work_instruction_apply_id")
private String workInstrcutionApplyId; private String workInstructionApplyId;
/** /**
* 打样制作单id * 打样制作单id
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstructionPdPublishedConf.java 0 → 100644
View file @ 75ac4ca3
package com.huigou.topsun.proofing.domain.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
* 作业指导书排版参数
* @TableName work_instruction_pd_published_conf
*/
@Table(name="work_instruction_pd_published_conf")
@Data
@Entity
public class WorkInstructionPdPublishedConf implements Serializable {
/**
* 作业指导书排版参数id
*/
@Id
@GeneratedValue(
generator = "system-uuid"
)
@GenericGenerator(
name = "system-uuid",
strategy = "guid"
)
@Column(name = "work_instruction_pd_published_conf_id")
private String workInstructionPdPublishedConfId;
/**
* 作业指导书id
*/
@Column(name = "work_instruction_id")
private String workInstructionId;
/**
* 产品排版参数id
*/
@Column(name = "pd_published_conf_id")
private String pdPublishedConfId;
/**
* 啤版编号
*/
@Column(name = "beer_plate_no")
private String beerPlateNo;
/**
* 烫金版编号
*/
@Column(name = "gold_plate_no")
private String goldPlateNo;
/**
* 模切版编号
*/
@Column(name = "die_cut_plate_no")
private String dieCutPlateNo;
/**
* 铜版及树脂版编号
*/
@Column(name = "copperp_resin_late_no")
private String copperpResinLateNo;
/**
* 网版编号
*/
@Column(name = "net_plate_no")
private String netPlateNo;
/**
* 包装方式
*/
@Column(name = "package_style")
private String packageStyle;
/**
* 物性测试
*/
@Column(name = "physical_test")
private String physicalTest;
/**
* 化性测试
*/
@Column(name = "chemistry_test")
private String chemistryTest;
/**
* 铜版编号
*/
@Column(name = "copperp_no")
private String copperpNo;
/**
* 色号卡
*/
@Column(name = "color_no_card")
private String colorNoCard;
/**
* 模具编号
*/
@Column(name = "plate_no")
private String plateNo;
/**
* 表面处理
*/
@Column(name = "surface_treatment")
private String surfaceTreatment;
/**
* 风险描述（序号、内容、等级）
*/
@Column(name = "risk_description")
private String riskDescription;
/**
* 是否附样图
*/
@Column(name = "have_drawing")
private String haveDrawing;
/**
* 分切方向
*/
@Column(name = "cut_direction")
private String cutDirection;
/**
* 海关商品编码
*/
@Column(name = "customs_commodity_code")
private String customsCommodityCode;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/WorkInstrcutionApplyVo.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/WorkInstructionApplyVo.java
View file @ 75ac4ca3
...@@ -2,9 +2,6 @@ package com.huigou.topsun.proofing.domain.vo; ...@@ -2,9 +2,6 @@ package com.huigou.topsun.proofing.domain.vo;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -12,11 +9,11 @@ import java.io.Serializable; ...@@ -12,11 +9,11 @@ import java.io.Serializable;
* *
*/ */
@Data @Data
public class WorkInstrcutionApplyVo implements Serializable { public class WorkInstructionApplyVo implements Serializable {
/** /**
* 作业指导申请书id * 作业指导申请书id
*/ */
private String workInstrcutionApplyId; private String workInstructionApplyId;
/** /**
* 打样制作单id * 打样制作单id
......
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstrcutionApplyRepository.java → topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionApplyRepository.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.repository; package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply; import com.huigou.topsun.proofing.domain.model.WorkInstructionApply;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstrcutionApplyRepository extends JpaRepository<WorkInstrcutionApply, String> { public interface WorkInstructionApplyRepository extends JpaRepository<WorkInstructionApply, String> {
} }
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionPdPublishedConfRepository.java 0 → 100644
View file @ 75ac4ca3
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.WorkInstructionPdPublishedConf;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WorkInstructionPdPublishedConfRepository extends JpaRepository<WorkInstructionPdPublishedConf, String> {
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/repository/WorkInstructionRepository.java
View file @ 75ac4ca3
package com.huigou.topsun.proofing.repository; package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply;
import com.huigou.topsun.proofing.domain.model.WorkInstruction; import com.huigou.topsun.proofing.domain.model.WorkInstruction;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
......
topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java deleted 100644 → 0
View file @ 5486dfcd
package com.huigou.topsun.proofing.service.impl;
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.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 org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
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;
@Autowired
ProductLookedRepository productLookedRepository;
@Autowired
ProductPublishedConfRepository productPublishedConfRepository;
public List<ProofingMakeVo> getProofingMakeVoList(){
List<ProofingMake> makeAll = proofingMakeRepository.findAll();
List<ProofingMakeVo> makeVoList = new ArrayList<>();
for (ProofingMake proofingMake : makeAll) {
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
ProofingMakeVo proofingMakeVo = getProofingMakeVo(proofingMake, proofingApply);
makeVoList.add(proofingMakeVo);
}
return makeVoList;
}
@Override
public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
ProductLooked productLooked = productLookedRepository.findByProductId(proofingApply.getProductId());
ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
return this.getProofingMakeVo(proofingApply,proofingMake,productLooked,productPublishedConf);
}
/**
* 分解ProofingMake
* @param proofingMake
*/
@Override
public void saveProofingMakeVo(ProofingMake proofingMake) {
proofingMakeRepository.save(proofingMake);
}
@Override
public void deleteProofingMakeVo(String proofingMakeId) {
proofingMakeRepository.delete(proofingMakeId);
}
/**
* 生成ProofingMakeVo类
* @return 填充过数据后的ProofingMakeVo
*/
public ProofingMakeVo getProofingMakeVo(Object... objs){
ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
for (Object obj : objs) {
if(obj!=null){
BeanUtils.copyProperties(obj, proofingMakeVo);
}
}
return proofingMakeVo;
}
}
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml
View file @ 75ac4ca3
...@@ -24,12 +24,45 @@ ...@@ -24,12 +24,45 @@
<field name="产品id" title="产品id" code="productId" width="200" /> <field name="产品id" title="产品id" code="productId" width="200" />
</easy-search> </easy-search>
<!-- <easy-search name="productType" desc="产品状态" >-->
<!-- <sql>select pc.* from--> <easy-search name="productDetail" desc="产品详情">
<!-- product_category pc</sql>--> <sql>
<!-- <field name="productCategoryName" title="产品名称" code="productCategoryName" type="hidden" width="300"/>--> SELECT
<!-- <field name="productCategoryStatus" title="产品状态" code="productCategoryStatus" width="200"/>--> p.product_name, pc.product_category_name,pl.*,
<!-- <field name="productCategoryCode" title="产品编码" code="productCategoryCode" type="hidden" width="300"/>--> ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf
<!-- <field name="productCategoryId" code="productCategoryId" type='hidden' />--> FROM product p
<!-- </easy-search>--> LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id
LEFT JOIN product_detail pd ON pd.product_id = p.product_id
LEFT JOIN product_looked pl ON pl.product_id = p.product_id
LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品name" title="产品name" code="productName" width="200" />
<field name="长;单位cm" title="长;单位cm" code="productLength" width="200" />
<field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" />
<field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" />
<field name="厚度;单位mm" title="厚度;单位mm" code="productThick" width="200" />
<field name="成品克重;单位g" title="成品克重;单位g" code="productWeight" width="200" />
<field name="角型" title="角型" code="productAngleType" width="200" />
<field name="孔径" title="孔径" code="productAperture" width="200" />
<field name="单层厚" title="单层厚" code="productSingleLayer" width="200" />
<field name="单重" title="单重" code="productSingleWeight" width="200" />
<field name="层数" title="层数" code="productLayerNum" width="200" />
<field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" />
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" />
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" />
<field name="仓库" title="仓库" code="storeName" width="200" />
<field name="采购单位" title="采购单位" code="productBuyUnit" width="200" />
<field name="模数" title="模数" code="modulus" width="200" />
<field name="行数" title="行数" code="rowNum" width="200" />
<field name="列数" title="列数" code="columnNum" width="200" />
<field name="搭版数" title="搭版数" code="contactNum" width="200" />
<field name="行双刀位(单位mm)" title="行双刀位(单位mm)" code="rowDoubleBlade" width="200" />
<field name="列双刀位(单位mm)" title="列双刀位(单位mm)" code="columnDoubleBlade" width="200" />
<field name="派工倍数" title="派工倍数" code="dispatchMultiple" width="200" />
<field name="印张长度(单位cm)" title="印张长度(单位cm)" code="sheetLength" width="200" />
<field name="印张宽度(单位cm)" title="印张宽度(单位cm)" code="sheetWidth" width="200" />
<field name="产品印张设置" title="产品印张设置" code="productSheetConf" width="200" />
</easy-search>
</easy-search-mappings> </easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-proofing.xml
View file @ 75ac4ca3
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<sql> <sql>
SELECT SELECT
pm.proofing_make_no, pm.proofing_make_no,
pm.proofing_make_id,
pa.proofing_apply_no, pa.proofing_apply_no,
p.product_id, p.product_id,
p.product_name, p.product_name,
...@@ -31,13 +32,14 @@ ...@@ -31,13 +32,14 @@
</sql> </sql>
<field name="产品编号" title="产品编号" code="productId" width="200" /> <field name="产品编号" title="产品编号" code="productId" width="200" />
<field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" /> <field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" />
<field name="制作id" title="制作id" code="proofingMakeId" width="200" type="hidden"/>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" /> <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="类型" title="类型" code="productType" width="200" type="hidden"/> <field name="类型" title="类型" code="productType" width="200" type="hidden"/>
<field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/> <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>
<field name="名称" title="名称" code="productName" width="200" type="hidden"/> <field name="名称" title="名称" code="productName" width="200" type="hidden"/>
<field name="英文名称" title="英文名称" code="productEnglishName" width="200" type="hidden"/> <field name="英文名称" title="英文名称" code="productEnglishName" width="200" type="hidden"/>
<field name="仓库" title="仓库" code="productId" width="200" type="hidden"/> <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>
</easy-search> </easy-search>
</easy-search-mappings> </easy-search-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