Skip to content

T
topsun-bpm
Commit b51f0270 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 7029e9ae bbcebf6c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 879 additions and 102 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js
View file @ b51f0270
var itemGridManager,dutyPersonGridManager = null
$(function () {
initialize();
initItemGrid();
initDutyPersonGridGrid();
bindEvent();
});
function bindEvent() {
function initialize() {
var mainFileTable = $('#exceptionStateInfoList').fileList();
mainFileTable.find('table').css({
borderTopWidth : 0
});
$('#exceptionStateInfoList').fileList({
bizId : $("#attbizId").val()
});
}
function initItemGrid() {
......@@ -52,10 +58,10 @@ function initItemGrid() {
function getGridColumns() {
var columns = [];
columns = [
{display: "生产单号", name: "produceNo", width: "200", align: "left", type: "string",
{display: "生产单号", name: "produceNo", width: "160", align: "left", type: "string",
editor: { type: 'text'}
},
{display: "产品编码", name: "productCode", width: "200", align: "left", type: "string",
{display: "产品编码", name: "productCode", width: "160", align: "left", type: "string",
editor: {type: 'text'}
},
{display: "产品名称", name: "productName", width: "200", align: "left", type: "string",
......@@ -64,7 +70,7 @@ function getGridColumns() {
{display: "数量", name: "number", width: "100", align: "left", type: "string",
editor: {type: "text",mask: '9999999.999'}
},
{display: "单位", name: "unitName", width: "100", align: "left", type: "string",
{display: "单位", name: "unitName", width: "80", align: "left", type: "string",
editor: {type: "text"}
},
{display: "币别", name: "currencyName", width: "100", align: "left", type: "string",
......@@ -73,10 +79,10 @@ function getGridColumns() {
{display: "金额", name: "money", width: "100", align: "left", type: "string",
editor: {type: "text",mask: '9999999.999'}
},
{display: "转换成人民币金额", name: "rmbMoney", width: "100", align: "left", type: "string",
{display: "折算人民币金额", name: "rmbMoney", width: "100", align: "left", type: "string",
editor: {type: "text",mask: '9999999.999'}
},
{display: "出货日期", name: "sendDate", width: "200", align: "left", type: "date",
{display: "出货日期", name: "sendDate", width: "140", align: "left", type: "date",
editor: {type: "date"}
}
]
......@@ -126,10 +132,10 @@ function initDutyPersonGridGrid() {
function getDutyPersonGridColumns() {
var columns = [];
columns = [
{display: "工号/供应商编码/客户名编码", name: "personNo", width: "200", align: "left", type: "string",
{display: "工号/供应商编码/客户编码", name: "personNo", width: "180", align: "left", type: "string",
editor: { type: 'text'}
},
{display: "姓名/供应商名称/客户名", name: "personName", width: "200", align: "left", type: "string",
{display: "姓名/供应商/客户", name: "personName", width: "180", align: "left", type: "string",
editor: {type: 'text'}
},
{display: "部门/供应名称/客户名称", name: "deptName", width: "200", align: "left", type: "string",
......@@ -138,7 +144,7 @@ function getDutyPersonGridColumns() {
{display: "定责比例（%）", name: "dutyRate", width: "100", align: "left", type: "string",
editor: {type: "text",mask: '999.99'}
},
{display: "个人责任比例（%）", name: "personDutyRate", width: "200", align: "left", type: "string",
{display: "个人责任比例（%）", name: "personDutyRate", width: "100", align: "left", type: "string",
editor: {type: "text",mask: '999.99'}
},
{display: "责任金额", name: "dutyMoney", width: "100", align: "left", type: "string",
......
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.jsp
View file @ b51f0270
......@@ -13,6 +13,7 @@
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="version"/>
<x:hidden name="attbizId"/>
<x:hidden name="billCode"/>
<x:hidden name="fillinDate"/>
<x:hidden name="fullId"/>
......@@ -47,22 +48,25 @@
<div id="maingrid"></div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC name="exceptionState" required="false" label="异常陈诉" maxLength="120" labelCol="1" fieldCol="9" rows="3"/>
<x:textareaC name="exceptionState" required="false" label="异常陈诉" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
</div>
<div style="padding-top: 15px;">
<x:fileList bizCode="exceptionStateInfo" bizId="attbizId" id="exceptionStateInfoList" title="相关资料" />
</div>
<div class="hg-form-row">
<x:textareaC name="exceptionReason" required="false" label="异常原因" maxLength="120" labelCol="1" fieldCol="9" rows="3"/>
<x:textareaC name="exceptionReason" required="false" label="异常原因" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
</div>
<div class="hg-form-row">
<x:textareaC name="dealMethod" required="false" label="改善措施" maxLength="120" labelCol="1" fieldCol="9" rows="3"/>
<x:textareaC name="dealMethod" required="false" label="改善措施" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
</div>
<div class="hg-form-row">
<x:inputC name="dutyDeptName" label="责任部门" labelCol="1" fieldCol="2" required="false"/>
<x:hidden name="dutyDept"/>
<x:inputC name="checkOperatorName" label="校验员" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="checkOperatorName" label="责任人" labelCol="1" fieldCol="2" required="false"/>
<x:hidden name="checkOperator"/>
</div>
<div class="hg-form-row">
<x:textareaC name="dealResult" required="false" label="处理结果" maxLength="120" labelCol="1" fieldCol="9" rows="3"/>
<x:textareaC name="dealResult" required="false" label="处理结果" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
</div>
<div class="hg-form-row">
<x:inputC name="manager" label="单位主管" labelCol="1" fieldCol="2" required="false"/>
......@@ -70,7 +74,7 @@
<x:inputC name="generalManager" label="经理" labelCol="1" fieldCol="2" required="false"/>
</div>
<div class="hg-form-row">
<x:textareaC name="remark" required="false" label="备注" maxLength="120" labelCol="1" fieldCol="9" rows="3"/>
<x:textareaC name="remark" required="false" label="备注" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
</div>
</div>
<x:title title="责任人信息" name="group" hideTable="#info" />
......
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportList.js
View file @ b51f0270
......@@ -16,19 +16,21 @@ function initGrid() {
});
gridManager = UICtrl.grid('#maingrid', {
columns: [
{display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
{display: "状态", name: "statusTextView", width: "80", align: "left", type: "string"}
, {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
, {display: "品质异常报告编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "异常类型", name: "exceptionTypeTextView", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "呈报日期", name: "reportDate", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "报告编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "异常类型", name: "exceptionTypeTextView", width: 100, minWidth: 60, type: "string", align: "center"}
, {display: "呈报日期", name: "reportDate", width: 140, minWidth: 60, type: "date", align: "center"}
, {display: "客户名称/供应商名称", name: "customerName", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "客户单号", name: "customerOrderNo", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "客户单号", name: "customerOrderNo", width: 180, minWidth: 60, type: "date", align: "center"}
, {display: "异常陈诉", name: "exceptionState", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "改善措施", name: "dealMethod", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "异常原因", name: "exceptionReason", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "校验员", name: "checkOperatorName", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "责任人", name: "checkOperatorName", width: 160, minWidth: 60, type: "date", align: "center"}
, {display: "处理结果", name: "dealResult", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "备注", name: "remark", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "创建部门", name: "deptName", width: 120, minWidth: 60, type: "date", align: "center"}
, {display: "创建人", name: "personMemberName", width: 100, minWidth: 60, type: "date", align: "center"}
],
dataAction: 'server',
url: web_app.name + '/exceptionReport/slicedExceptionReportList.ajax?',
......
topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportList.jsp
View file @ b51f0270
......@@ -16,7 +16,16 @@
<x:title title="搜索" hideTable="queryMainForm"/>
<form class="hg-form ui-show" method="post" action="" id="queryMainForm">
<div class="hg-form-row">
<x:inputC name="billCode" label="单据编号" labelCol="1"/>
<x:inputC name="billCode" label="报告编号" labelCol="1"/>
<x:inputC name="customerName" label="客户名称" labelCol="1"/>
<x:inputC name="customerOrderNo" label="客户单号" labelCol="1"/>
<x:inputC name="deptName" label="创建部门" labelCol="1"/>
<x:inputC name="personMemberName" label="创建人" labelCol="1"/>
<x:inputC name="startDate" label="呈报开始日期" wrapper="date" labelCol="1" />
<x:inputC name="endDate" label="呈报结束日期" wrapper="date" labelCol="1" />
<x:inputC name="checkOperatorName" label="责任人" labelCol="1"/>
<x:inputC name="dutyDeptName" label="责任部门" labelCol="1"/>
<x:selectC name="status" label="状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
</div>
<x:searchButtons/>
</form>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.jsp
View file @ b51f0270
......@@ -59,7 +59,7 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.jsp
View file @ b51f0270
......@@ -59,7 +59,7 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDeptList.js
View file @ b51f0270
......@@ -23,7 +23,7 @@ function loadNonProdApplyDeptListGrid() {
{display: "批准人", name: "approver", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准日期", name: "approvalDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准(国际)", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ b51f0270
......@@ -59,7 +59,7 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="5"/>
<x:hidden name="baseUnit"/>
<x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.js
View file @ b51f0270
......@@ -17,8 +17,20 @@ $(document).ready(function () {
function initializate() {
//页面控制
$("#businessPersonnelList").hide();
$("#vprsv").val("V");
if ($('#vprsv').val()=='')
{
$("#vprsv").val("V");
$("#ncost").val("X");
}
var peinh = $("#peinh").val();
$('#vprsv').bind("blur",function(value){ //alert($(this).val());
if ($(this).val()=='S'){
$("#ncost").val("");
}
if ($(this).val()=='V'){
$("#ncost").val("X");
}
});
if (Public.isBlank(peinh)){
$("#peinh").val("1")
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyFinancial.jsp
View file @ b51f0270
......@@ -59,7 +59,7 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
......@@ -79,11 +79,18 @@
<x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
<x:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas"/>
<x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:inputC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" required="true" />
<x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2" required="true"/>
<x:inputC name="verpr" label="移动平均价" labelCol="1" fieldCol="2"/>
<x:inputC name="stprs" label="标准价" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与成本核算" labelCol="2" fieldCol="1"/>
</div>
<div class="hg-form-row">
<x:inputC name="ekalr" label="数量结构" labelCol="1" fieldCol="2"/>
<x:inputC name="hkmat" label="物料来源" labelCol="1" fieldCol="2"/>
<x:inputC name="awsls" label="差异码" labelCol="1" fieldCol="2"/>
<x:inputC name="eklas" label="销售评估类" labelCol="1" fieldCol="2"/>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ b51f0270
......@@ -111,7 +111,7 @@ function loadNonProdApplyListGrid() {
},
{display: "通用品名", name: "genericName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "汉语品名", name: "maktx", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准(国际)", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ b51f0270
......@@ -15,15 +15,18 @@
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="非半成品类物料主数据维护申请表查询">
<!--div position="center" title="非半成品类物料主数据维护申请表查询"-->
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="matnr" required="false" label="物料编码" labelCol="1"/>
<x:inputC name="genericName" required="false" label="通用品名" labelCol="1"/>
<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
<x:selectC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
<x:inputC name="startDate" label="开始日期" wrapper="date" labelCol="1" />
<x:inputC name="endDate" label="结束日期" wrapper="date" labelCol="1" />
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.js
View file @ b51f0270
......@@ -169,6 +169,16 @@ function loadGrid() {
}
function bindEvent(){
if ($('#vint1').val()==''){
$('#vint1').val("999");
}
if ($('#vint2').val()==''){
$('#vint2').val("999");
}
if ($('#vrmod').val()=='')
{
$('#vrmod').val("2");
}
$('#lgproName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp
View file @ b51f0270
......@@ -107,12 +107,19 @@
<x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
<x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="true" dictionary="mtvfp"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="1" dictionary="strgr"/>
<x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="1"/>
<x:inputC name="wzeit" label="补货提前天数" labelCol="1" fieldCol="1" mask="999"/>
<x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2" dictionary="sbdkz"/>
<x:selectC name="diskz" label="库存地MRP标识" labelCol="2" fieldCol="2" dictionary="diskz"/>
<x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
<x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"/>
<x:inputC name="perkz" label="期间标识" labelCol="1" fieldCol="2"/>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ b51f0270
......@@ -81,7 +81,7 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国际)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
......@@ -97,11 +97,15 @@
<div class="hg-form-cols" id="basicInfoDiv">
<div class="hg-form-row">
<x:inputC name="matnr" label="物品编码" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="mbrsh" label="行业" labelCol="1" fieldCol="2"/>
<x:selectC name="mtart" label="物品类型" required="true" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="matklName" label="物料组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="matkl"/>
<!--x:inputC name="lvorm" label="集团级删除" labelCol="1" fieldCol="2"/-->
<x:selectC name="lvorm" label="集团级删除" required="false" labelCol="1" fieldCol="2" dictionary="lvorm"/>
<x:inputC name="groes" label="规格" required="true" labelCol="1" fieldCol="2"/>
<c:if test="${applyType==1}">
<x:selectC name="lvorm" label="集团级删除" required="false" labelCol="1" fieldCol="2" dictionary="lvorm"/>
</c:if>
<x:inputC name="spartName" label="产品组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="spart"/>
<x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
......@@ -110,7 +114,7 @@
<!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
<x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
<x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
<x:hidden name="meins"/>
<x:selectC name="raube" label="存储条件" required="true" labelCol="1" fieldCol="2" dictionary="raube"/>
<x:inputC name="brgew" label="毛重" labelCol="1" fieldCol="2"/>
......@@ -126,11 +130,9 @@
<x:inputC name="normt" label="适用标准" labelCol="1" fieldCol="2"/>
<div class="hg-form-row">
<x:inputC name="klart" label="类型" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="classify" label="分类" labelCol="1" fieldCol="2" readonly="true"/>
</div>
</div>
</div>
</div>
<div class="hg-form-cols" id="distributeDiv">
<div class="hg-form-row">
......@@ -264,7 +266,11 @@
<x:inputC name="altsl" label="BOM选择方法" labelCol="1" fieldCol="2"/>
<x:selectC name="sbdkz" label="独立/集中" labelCol="1" fieldCol="2" dictionary="sbdkz"/>
<x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
<x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
<x:inputC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"/>
<x:inputC name="perkz" label="期间标识" labelCol="1" fieldCol="2"/>
</div>
</div>
......@@ -275,7 +281,7 @@
<x:inputC name="umrenProd" label="转换分母(生产)" labelCol="2" fieldCol="2"/>
<x:inputC name="umrezProd" label="转换分子(生产)" labelCol="2" fieldCol="2"/>
<x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2"/>
</div>
</div>
......@@ -287,6 +293,8 @@
<x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
<x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
<x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="sledBbd" label="过期日期" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
</div>
......@@ -335,15 +343,14 @@
<x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2"/>
<x:inputC name="verpr" label="移动平均价" labelCol="1" fieldCol="2"/>
<x:inputC name="stprs" label="标准价" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与核算" labelCol="1" fieldCol="2"/>
</div>
</div>
<x:title title="成本核算" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="ekalr" label="数量结构" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与核算" labelCol="1" fieldCol="2"/>
<x:inputC name="hkmat" label="物料来源" labelCol="1" fieldCol="2"/>
<x:inputC name="awsls" label="差异码" labelCol="1" fieldCol="2"/>
<x:inputC name="eklas" label="销售评估类" labelCol="1" fieldCol="2"/>
</div>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.jsp
View file @ b51f0270
......@@ -79,8 +79,7 @@
<x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/>
<x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/>
<x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2"/>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.jsp
View file @ b51f0270
......@@ -82,6 +82,9 @@
<x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
<x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
<x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="true"/>
<x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
<x:inputC name="sledBbd" label="过期日期" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js
View file @ b51f0270
......@@ -120,7 +120,7 @@ function loadGrid() {
}
},
{
display: "备注", name: "remark", width: 320, minWidth: 60, type: "string", align: "left",
display: "备注", name: "remark", width: 480, minWidth: 60, type: "string", align: "left",
editor: {required: false, type: "text"}
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.jsp
View file @ b51f0270
......@@ -39,7 +39,7 @@
<x:inputC name="dutyDepartName" required="true" label="责任部门" labelCol="2" fieldCol="2" wrapper="tree"/>
<x:hidden name="applyPerson"/>
<x:inputC name="applyPersonName" required="true" label="申请人" labelCol="2" fieldCol="2" wrapper="tree"/>
<x:inputC name="permitDate" required="true" label="日期" wrapper="date" labelCol="2" fieldCol="2"/>
<x:inputC name="permitDate" required="true" label="放行日期" wrapper="datetime" labelCol="2" fieldCol="2"/>
<x:inputC name="company" required="true" label="公司" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="belongPerson" required="true" label="携出人" labelCol="2" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitList.js
View file @ b51f0270
......@@ -20,16 +20,16 @@ function loadGrid() {
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
{display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "单据编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "创建人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "公司", name: "company", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "放行日期", name: "permitDate", width: 150, minWidth: 60, type: "string", align: "left"},
{display: "携出人", name: "belongPerson", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "责任部门", name: "dutyDepartName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "applyPersonName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "创建人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "创建部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapPermit/slicedSapPermitList.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitList.jsp
View file @ b51f0270
......@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,attachment"/>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
<x:script src='/biz/topsun/sap/permit/sapPermitList.js'/>
</head>
......@@ -18,8 +18,12 @@
<x:hidden name="templetId" value="sapFixedRetirementData"/>
<x:hidden name="batchNumber" value=""/>
<x:hidden name="fullId"/>
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="reason" required="false" label="原因" labelCol="1"/>
<x:inputC name="billCode" required="false" label="单据编号" labelCol="1"/>
<x:inputC name="belongPerson" required="false" label="携出人" labelCol="1"/>
<x:inputC name="dutyDepartName" label="责任部门" labelCol="1"/>
<x:inputC name="applyPersonName" label="申请人" labelCol="1"/>
<x:inputC name="startDate" label="放行开始日期" wrapper="date" labelCol="1" />
<x:inputC name="endDate" label="放行结束日期" wrapper="date" labelCol="1" />
<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
<x:searchButtons/>
</form>
......
topsun/src/main/java/com/huigou/topsun/common/CommonUtils.java
View file @ b51f0270
......@@ -2,6 +2,10 @@ package com.huigou.topsun.common;
import com.itextpdf.text.pdf.BaseFont;
import freemarker.template.Template;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.krysalis.barcode4j.HumanReadablePlacement;
import org.krysalis.barcode4j.impl.code128.Code128Bean;
import org.krysalis.barcode4j.output.bitmap.BitmapCanvasProvider;
......@@ -11,6 +15,10 @@ import org.xhtmlrenderer.pdf.ITextRenderer;
import java.awt.image.BufferedImage;
import java.io.*;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
public class CommonUtils {
......@@ -79,4 +87,74 @@ public class CommonUtils {
}
return file;
}
/**
* 获取Excel cell中的值并返回String类型
*
* @param cell
* @return String类型的cell值
*/
public static String getExcelCellValue(Cell cell) {
String cellValue = "";
if (null != cell) {
// 以下是判断数据的类型
switch (cell.getCellType()) {
case HSSFCell.CELL_TYPE_NUMERIC: // 数字
if (0 == cell.getCellType()) {// 判断单元格的类型是否则NUMERIC类型
if (HSSFDateUtil.isCellDateFormatted(cell)) {// 判断是否为日期类型
Date date = cell.getDateCellValue();
// DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm");
DateFormat formater = new SimpleDateFormat("yyyy/MM/dd");
cellValue = formater.format(date);
} else {
// 有些数字过大，直接输出使用的是科学计数法： 2.67458622E8 要进行处理
DecimalFormat df = new DecimalFormat("####.####");
cellValue = df.format(cell.getNumericCellValue());
// cellValue = cell.getNumericCellValue() + "";
}
}
break;
case HSSFCell.CELL_TYPE_STRING: // 字符串
cellValue = cell.getStringCellValue();
break;
case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
cellValue = cell.getBooleanCellValue() + "";
break;
case HSSFCell.CELL_TYPE_FORMULA: // 公式
try {
// 如果公式结果为字符串
cellValue = String.valueOf(cell.getStringCellValue());
} catch (IllegalStateException e) {
if (HSSFDateUtil.isCellDateFormatted(cell)) {// 判断是否为日期类型
Date date = cell.getDateCellValue();
// DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm");
DateFormat formater = new SimpleDateFormat("yyyy/MM/dd");
cellValue = formater.format(date);
} else {
FormulaEvaluator evaluator = cell.getSheet().getWorkbook().getCreationHelper()
.createFormulaEvaluator();
evaluator.evaluateFormulaCell(cell);
// 有些数字过大，直接输出使用的是科学计数法： 2.67458622E8 要进行处理
DecimalFormat df = new DecimalFormat("####.####");
cellValue = df.format(cell.getNumericCellValue());
// cellValue = cell.getNumericCellValue() + "";
}
}
// //直接获取公式
// cellValue = cell.getCellFormula() + "";
break;
case HSSFCell.CELL_TYPE_BLANK: // 空值
cellValue = "";
break;
case HSSFCell.CELL_TYPE_ERROR: // 故障
cellValue = "非法字符";
break;
default:
cellValue = "未知类型";
break;
}
}
return cellValue;
}
}
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java
View file @ b51f0270
......@@ -56,6 +56,44 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
public Map<String, Object> slicedExceptionReportList(ExceptionReportQueryRequest queryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "exceptionReport");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
if (StringUtil.isNotBlank(queryRequest.getCustomerName())) {
queryModel.addCriteria(" and t.customer_name like:customerName");
queryModel.putLikeParam("customerName", queryRequest.getCustomerName());
}
if (StringUtil.isNotBlank(queryRequest.getCustomerOrderNo())) {
queryModel.addCriteria(" and t.customer_order_no like:customerOrderNo");
queryModel.putLikeParam("customerOrderNo", queryRequest.getCustomerOrderNo());
}
if (StringUtil.isNotBlank(queryRequest.getDeptName())) {
queryModel.addCriteria(" and t.dept_name like:deptName");
queryModel.putLikeParam("deptName", queryRequest.getDeptName());
}
if (StringUtil.isNotBlank(queryRequest.getPersonMemberName())) {
queryModel.addCriteria(" and t.person_member_name like:personMemberName");
queryModel.putLikeParam("personMemberName", queryRequest.getPersonMemberName());
}
if (queryRequest.getStatus() != null) {
queryModel.addCriteria(" and t.status =:status");
queryModel.putParam("status", queryRequest.getStatus());
}
if (queryRequest.getStartDate() != null&&!"".equals(queryRequest.getStartDate())) {
queryModel.addCriteria(" and t.report_date >=:startDate");
queryModel.putParam("startDate", queryRequest.getStartDate());
}
if (queryRequest.getEndDate() != null&&!"".equals(queryRequest.getEndDate())) {
queryModel.addCriteria(" and t.report_date <=:endDate");
queryModel.putParam("endDate", queryRequest.getEndDate());
}
if (queryRequest.getCheckOperatorName() != null) {
queryModel.addCriteria(" and t.check_operator_name =:checkOperatorName");
queryModel.putParam("checkOperatorName", queryRequest.getCheckOperatorName());
}
if (queryRequest.getDutyDeptName() != null) {
queryModel.addCriteria(" and t.duty_dept_name =:getDutyDeptName");
queryModel.putParam("getDutyDeptName", queryRequest.getDutyDeptName());
}
queryModel.putDictionary("status", BizBillStatus.getMap());
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
......@@ -76,7 +114,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
}
@Transactional
private void updateStatus(String bizId, BizBillStatus status) {
void updateStatus(String bizId, BizBillStatus status) {
Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
this.commonDomainService.updateStatus(ExceptionReport.class, bizId, status.getId());
}
......
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/controller/ExceptionReportController.java
View file @ b51f0270
......@@ -10,6 +10,7 @@ import com.huigou.topsun.sap.exceptionReport.domain.query.ExceptionReportQueryRe
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.CommonUtil;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -65,6 +66,7 @@ public class ExceptionReportController extends CommonController {
this.putAttribute("procUnitId", "Apply");
ExceptionReport exceptionReport = new ExceptionReport();
exceptionReport.setStatusId(BizBillStatus.APPLYING.getId());
exceptionReport.setAttbizId(CommonUtil.createGUID()); // 自动生成附件id
/**
* 设置jsp页面初始化填充数据，如果不设置， 那么在jsp页面上填写完表单之后立即提交申请TaskDescription获取不到时间和相关人员信息
*/
......
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/domain/ExceptionReport.java
View file @ b51f0270
......@@ -114,6 +114,11 @@ public class ExceptionReport extends FlowBillAbstractEntity {
@Column(name = "remark")
private String remark;
//@Transient
@Column(name = "attbiz_id")
private String attbizId;
@Override
protected String getCodeRuleId() {
return "exceptionReport";
......
topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/domain/query/ExceptionReportQueryRequest.java
View file @ b51f0270
......@@ -11,4 +11,13 @@ import lombok.Data;
@Data
public class ExceptionReportQueryRequest extends QueryAbstractRequest {
private String exceptionReportId;
private String customerName;
private String customerOrderNo;
private String personMemberName;
private String deptName;
private String status;
private String startDate;
private String endDate;
private String checkOperatorName;
private String dutyDeptName;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java
View file @ b51f0270
......@@ -47,5 +47,5 @@ public interface NonProdApplyDeptApplication {
//保存部门分发信息
void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId,String genericName);
//保存待办消息
void saveBsnMessageData(NonProdApplyBaseInfo baseInfo, SapNonProdApplyDept applyDept, Operator operator,String message);
void saveBsnMessageData(NonProdApplyBaseInfo baseInfo, SapNonProdApplyDept applyDept, Operator operator,Map<String,Object> map);
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ b51f0270
......@@ -31,6 +31,7 @@ import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoReposit
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.operator.OperatorApplication;
import com.huigou.uasp.bmp.opm.repository.org.OrgRepository;
import com.huigou.uasp.bpm.ApprovalParameter;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.uasp.bpm.HandleResult;
......@@ -68,6 +69,8 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
SapMutualEpLogApplication sapMutualEpLogApplication;
@Resource
private OperatorApplication operatorApplication;
@Resource
private OrgRepository orgRepository;
@SneakyThrows
@Transactional(propagation = Propagation.REQUIRES_NEW)
......@@ -82,12 +85,13 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
nonProdApplyBaseInfo.setDistribute(0);
nonProdApplyBaseInfo.setCreatedDate(new Date());
if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getSourceId())){ //有数据来源ID的 表示是变更或扩展的
if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getSourceId())){ //有数据来源ID的 表示是变更或扩展的
sapNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
}
} else {
nonProdApplyBaseInfo = (NonProdApplyBaseInfo) commonDomainService.loadAndFillinProperties(nonProdApplyBaseInfo);
}
if (nonProdApplyBaseInfo.getCreatedDate()==null){
nonProdApplyBaseInfo.setCreatedDate(new Date());
}
......@@ -210,6 +214,52 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
if(nonProdApplyBaseInfo.getMaintenanceType().equals("new")) { //新申请的 发布分发人的待办信息 06.17
//审批通过
if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
//SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
// SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId());
String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
"left join sa_oporg o on p.CODE=o.code where MAIN_ORG_ID in (select id from sa_oporg where code='HYZY')";
List<Map<String, Object>> mapList = this.sqlExecutorDao.queryToListMap(sql);
for (Map map : mapList) {
String user = map.get("code").toString();
BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(map.get("id").toString());
bsnMessageSponsor.setTitle(nonProdApplyBaseInfo.getGenericName());//通用品名
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
bsnMessageSponsor.setBusinessId(nonProdApplyBaseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
bsnMessageSponsor.setCreateDate(new Date());
bsnMessageSponsor.setStatus(0);
//List<Map<String, String>> deptStaffList=new ArrayList<>();
//Map <String,String>map=new HashMap<String, String>();
// map.put("");
//deptStaffList.add(map);
// for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute messageExecute = new BsnMessageExecute();
String userCode = map.get("personMemberId").toString();//stringMap.get("userCode");
String deptName = map.get("positionName").toString();//stringMap.get("deptName");
String deptCode =map.get("positionCode").toString();;//stringMap.get("deptCode");
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
messageExecute.setUpdateDate(new Date());
messageExecute.setTaskDescribe(nonProdApplyBaseInfo.getGenericName()+"-.物料维护("+deptName+")");
//保存任务
// bsnMessageApplication.keepTasks(bsnMessageSponsor);
bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
List<BsnMessageExecute> executes =new ArrayList<>();
executes.add(messageExecute);
bsnMessageApplication.saveBsnMessageExecute(executes);
}
}
}
if(nonProdApplyBaseInfo.getMaintenanceType().equals("modify")){ //变更的发布 分发信息
//审批通过
......@@ -354,7 +404,15 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
model.addCriteria(" and t.bill_code like:billCode");
model.putLikeParam("billCode", query.getBillCode());
}
if (query.getStartDate() != null&&!"".equals(query.getStartDate())) {
model.addCriteria(" and t.created_date >=:startDate");
model.putParam("startDate", query.getStartDate());
}
if (query.getEndDate() != null&&!"".equals(query.getEndDate())) {
model.addCriteria(" and t.created_date <=:endDate");
model.putParam("endDate", query.getEndDate());
}
model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @ b51f0270
......@@ -223,7 +223,7 @@ public class NonProdApplyNextController extends CommonController {
/**
* 分发表单
*/
*
public String distributeSapNonProdApplyDept() {
SDO sdo = this.getSDO();
nonProdApplyDeptApplication.distributeSapNonProdApplyDept(sdo);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @ b51f0270
......@@ -44,6 +44,10 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "MATNR")
private String matnr;
//行业
@Column(name = "MBRSH")
private String mbrsh;
/**
* 物料类型
*/
......@@ -104,6 +108,13 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "NORMT")
private String normt;
/**
* 规格
*/
@Column(name = "GROES")
private String groes;
/**
* 批次管理
*/
......@@ -802,6 +813,51 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "AWSLS")
private String awsls;
/**
* 消耗模式
*/
@Column(name = "VRMOD")
private String vrmod;
/**
* 逆推消耗期间
*/
@Column(name = "VINT1")
private String vint1;
/**
* 顺推消耗期间
*/
@Column(name = "VINT2")
private String vint2;
/**
* 综合MRP
*/
@Column(name = "MISKZ")
private String miskz;
//期间标识
@Column(name = "PERKZ")
private String perkz;
//生产主管
@Column(name = "FEVOR")
private String fevor;
//过期日期
@Column(name = "SLED_BBD")
private String sledBbd;
//销售评估类
@Column(name = "EKLAS")
private String eklas;
/**
* 维护状态（0草稿；1保存；2分发）
*/
......@@ -850,6 +906,7 @@ public class SapNonProdApplyDept implements Serializable {
@Column(name = "vrkme_name")
private String vrkmeName;
@Transient
private String billCode;
@Transient
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java
View file @ b51f0270
......@@ -98,5 +98,8 @@ public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest
private String billCode;
private String startDate;
private String endDate;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
View file @ b51f0270
......@@ -13,6 +13,8 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
*/
private String matnr;
//行业
private String mbrsh;
/**
* 物料类型
*/
......@@ -165,4 +167,6 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
private String bstmeName;
private String meinsName;
private String lgproName;
private String groes;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyFinancialVo.java
View file @ b51f0270
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
......@@ -46,4 +47,29 @@ public class NonProdApplyFinancialVo extends NonProdApplyDeptVo {
*/
private String stprs;
/**
* 数量结构
*/
private String ekalr;
/**
* 不参与成本核算
*/
private String ncost;
/**
* 物料来源
*/
private String hkmat;
/**
* 差异码
*/
private String awsls;
//销售评估类
private String eklas;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyMRPVo.java
View file @ b51f0270
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyMRPVo extends NonProdApplyDeptVo {
......@@ -154,4 +157,25 @@ public class NonProdApplyMRPVo extends NonProdApplyDeptVo {
private String diskz;
/**
* 消耗模式
*/
private String vrmod;
// * 逆推消耗期间
private String vint1;
/**
* 顺推消耗期间
*/
private String vint2;
/**
* 综合MRP
*/
private String miskz;
//期间标识
private String perkz;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyProduceVo.java
View file @ b51f0270
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
......@@ -29,6 +30,9 @@ public class NonProdApplyProduceVo extends NonProdApplyDeptVo {
/**
* 过账到质检
*/
private String insmk;
//private String insmk;
//生产主管
private String fevor;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyStoreVo.java
View file @ b51f0270
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
......@@ -35,4 +36,12 @@ public class NonProdApplyStoreVo extends NonProdApplyDeptVo {
*/
private String prctr;
/**
* 过账到质检
*/
private String insmk;
//过期日期
private String sledBbd;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyBaseInfoRepository.java
View file @ b51f0270
......@@ -5,7 +5,9 @@ import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import org.springframework.data.jpa.repository.JpaRepository;
public interface NonProdApplyBaseInfoRepository extends JpaRepository<NonProdApplyBaseInfo,String> {
import java.util.List;
public interface NonProdApplyBaseInfoRepository extends JpaRepository<NonProdApplyBaseInfo,String> {
List<NonProdApplyBaseInfo> findByGenericNameAndMaintenanceType(String genericName,String maintenanceType);
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyDeptRepository.java
View file @ b51f0270
......@@ -12,4 +12,6 @@ public interface NonProdApplyDeptRepository extends JpaRepository<SapNonProdAppl
SapNonProdApplyDept findByBaseInfoId(String baseInfoId);
SapNonProdApplyDept findByApplyDeptId(String applyDeptId);
SapNonProdApplyDept findByMatnr(String matnr);
List <SapNonProdApplyDept> findByMaktx(String maktx);
}
topsun/src/main/java/com/huigou/topsun/sap/permit/application/impl/SapPermitApplicationImpl.java
View file @ b51f0270
......@@ -82,10 +82,28 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
queryModel.addCriteria(" and t.bill_code =:billCode");
queryModel.putParam("billCode", queryRequest.getBillCode());
}
if (queryRequest.getReason() != null) {
queryModel.addCriteria(" and t.reason like:reason");
queryModel.putLikeParam("reason", queryRequest.getReason());
if (queryRequest.getBelongPerson() != null) {
queryModel.addCriteria(" and t.belong_person like:person");
queryModel.putLikeParam("person", queryRequest.getBelongPerson());
}
if (queryRequest.getDutyDepartName() != null) {
queryModel.addCriteria(" and t.duty_depart_name like:deptName");
queryModel.putLikeParam("deptName", queryRequest.getDutyDepartName());
}
if (queryRequest.getApplyPersonName() != null) {
queryModel.addCriteria(" and t.apply_person_name like:personName");
queryModel.putLikeParam("personName", queryRequest.getApplyPersonName());
}
if (queryRequest.getStartDate() != null&&!"".equals(queryRequest.getStartDate())) {
queryModel.addCriteria(" and t.permit_date >=:startDate");
queryModel.putParam("startDate", queryRequest.getStartDate());
}
if (queryRequest.getEndDate() != null&&!"".equals(queryRequest.getEndDate())) {
queryModel.addCriteria(" and t.permit_date <=:endDate");
queryModel.putParam("endDate", queryRequest.getEndDate());
}
queryModel.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
queryModel.addCriteria(" order by bill_code desc ");
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
......
topsun/src/main/java/com/huigou/topsun/sap/permit/domain/SapPermit.java
View file @ b51f0270
package com.huigou.topsun.sap.permit.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
......@@ -51,9 +54,10 @@ public class SapPermit extends FlowBillAbstractEntity {
* 日期
*/
@Column(name = "permit_date")
@JSONField(format="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date permitDate;
@Override
protected String getCodeRuleId() {
return "sapPermit";
......
topsun/src/main/java/com/huigou/topsun/sap/permit/domain/query/SapPermitQueryRequest.java
View file @ b51f0270
......@@ -14,4 +14,9 @@ public class SapPermitQueryRequest extends QueryAbstractRequest {
private String billCode;
private String reason;
private String status;
private String belongPerson;
private String dutyDepartName;
private String applyPersonName;
private String startDate;
private String endDate;
}
topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/SuppliersDataController.java
View file @ b51f0270
......@@ -46,6 +46,9 @@ public class SuppliersDataController extends CommonController {
@Autowired
SuppliersDataApplication suppliersDataApplication;
@Autowired
ImpDataFromXLS impDataFromXLS;
public String forwardSuppliersDataList() {
return forward("suppliersDataList");
......@@ -181,4 +184,10 @@ public class SuppliersDataController extends CommonController {
suppliersDataApplication.deleteSuppliersBuyerByIds(ids);
return success();
}
public String importInitData(){
SDO sdo = this.getSDO();
impDataFromXLS.readFile();
return success();
}
}
topsun/src/main/resources/config/topsun/base/bsnMessage.xml
View file @ b51f0270
......@@ -4,15 +4,18 @@
<query name="queryExecuteBsnMessage" label="未完成任务" table="bsn_message_execute">
<sql-query>
SELECT t.id,t.message_sponsor_id,t.task_execute,t.business_code,t.update_date,t.finished_date,t.active,
CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, :addText) ELSE t.task_describe END AS task_describe,
ad.maktx as title,
CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, :addText) ELSE
case when t.business_code='HYZY' then SUBSTRING(t.task_describe,LOCATE('-.',t.task_describe)+2)
else t.task_describe end
END AS task_describe,
IFNULL(ad.maktx,left(t.task_describe,LOCATE('-.',t.task_describe)-2)) as title,
t2.executor_url,
t2.business_id
FROM bsn_message_execute t
LEFT JOIN bsn_message_sponsor t2 ON t2.id = t.message_sponsor_id
LEFT JOIN sap_non_prod_apply_dept ad ON ad.apply_dept_id = t2.business_id
left join sap_non_prod_apply_base_info bs on bs.id=ad.base_info_id
WHERE t.active IN (0, 3) and (bs.distribute=2 or t.business_code='INIT_DPT')
WHERE t.active IN (0, 3) and (bs.distribute=2 or t.business_code='INIT_DPT' or t.business_code='HYZY' )
and task_execute = :taskExecute
</sql-query>
</query>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment