Skip to content

H
hp-smart
Commit fc453b7c by YG6494
Options

HPKC008页面修改

parent 9407cee1
Showing with 349 additions and 45 deletions
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC008.java
...@@ -8,7 +8,11 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -8,7 +8,11 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.hp.kc.domain.Thpkc008;
import com.baosight.hpjx.common.DdynamicEnum;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
package com.baosight.hpjx.hp.zl.service; package com.baosight.hpjx.hp.zl.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.hp.zl.domain.HPZL001; import com.baosight.hpjx.hp.zl.domain.HPZL001;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import java.util.Map; import java.util.*;
/** /**
* @author ZJH * @author ZJH
...@@ -21,9 +22,16 @@ public class ServiceHPZL001 extends ServiceBase { ...@@ -21,9 +22,16 @@ public class ServiceHPZL001 extends ServiceBase {
*/ */
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
HPZL001 HPZL001 = new HPZL001(); HPZL001 HPZL001 = new HPZL001();
EiInfo outInfo = new EiInfo(); EiInfo outInfo = super.initLoad(inInfo, HPZL001);
outInfo.addBlock(EiConstant.resultBlock); outInfo.addBlock(EiConstant.queryBlock).setCell(0,"receiptDate",CommonMethod.getCurrentSameYearMonthDay());
outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(HPZL001.eiMetadata); outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
CommonMethod.initBlock(outInfo,
Arrays.asList(
DdynamicEnum.PROJ_RECORD_BLOCK_ID),
new HashMap<String,String>(1) {{
put("STATUS", "1" );
}});
return outInfo; return outInfo;
} }
...@@ -32,9 +40,10 @@ public class ServiceHPZL001 extends ServiceBase { ...@@ -32,9 +40,10 @@ public class ServiceHPZL001 extends ServiceBase {
*/ */
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
String receiptDate = inInfo.getCellStr(EiConstant.queryBlock,0,"receiptDate");
inInfo.setCell(EiConstant.queryBlock,0,"receiptDate", StringUtil.removeHorizontalLine(receiptDate));
/* 调用EI查询方法.*/ /* 调用EI查询方法.*/
EiInfo outInfo = super.query(inInfo, "HPZL001.query", new HPZL001()); return super.query(inInfo, "HPZL001.query", new HPZL001());
return outInfo;
} }
...@@ -43,29 +52,16 @@ public class ServiceHPZL001 extends ServiceBase { ...@@ -43,29 +52,16 @@ public class ServiceHPZL001 extends ServiceBase {
*/ */
@Override @Override
public EiInfo insert(EiInfo inInfo) { public EiInfo insert(EiInfo inInfo) {
try {
CommonMethod.creatorInfo(inInfo,EiConstant.resultBlock); CommonMethod.creatorInfo(inInfo,EiConstant.resultBlock);
super.insert(inInfo,"HPZL001.insert"); for (int i = 0; i < inInfo.getBlock(EiConstant.resultBlock).getRowCount(); i++) {
// HPZL001 HPZL001 = new HPZL001(); String itemName =inInfo.getCellStr(EiConstant.resultBlock,i,"itemName");
// EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); String[] str = itemName.split("-");
// for (int i = 0; i < eiBlock.getRowCount(); i++) { inInfo.setCell(EiConstant.resultBlock,i,"itemCode", str[0]);
// Map<?, ?> map = eiBlock.getRow(i); inInfo.setCell(EiConstant.resultBlock,i,"itemName", str[1]);
// HPZL001.fromMap(map); String receiptDate = inInfo.getCellStr(EiConstant.resultBlock,i,"receiptDate");
// inInfo.setCell(EiConstant.resultBlock,i,"receiptDate", StringUtil.removeHorizontalLine(receiptDate));
// this.dao.insert("HPZL001.insert", HPZL001.toMap());
// }
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("新增成功！");
} catch (PlatException e) {
e.printStackTrace();
inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("新增失败！原因参见详细错误描述！");
inInfo.setDetailMsg(e.getMessage());
logError("新增失败", e.getMessage());
return inInfo;
} }
return inInfo; return super.insert(inInfo,"HPZL001.insert");
} }
...@@ -120,4 +116,19 @@ public class ServiceHPZL001 extends ServiceBase { ...@@ -120,4 +116,19 @@ public class ServiceHPZL001 extends ServiceBase {
return eiInfo; return eiInfo;
} }
/**
* 审核操作.
*/
public EiInfo operator(EiInfo inInfo) {
HPZL001 HPZL001 = new HPZL001();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
CommonMethod.updateuserInfo(inInfo,EiConstant.resultBlock);
return super.update(inInfo,"HPZL001.operator");
}
/**
* 导入数据
*/
} }
src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001.xml
...@@ -46,6 +46,18 @@ ...@@ -46,6 +46,18 @@
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="receiptDate">
RECEIPT_DATE = #receiptDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="itemCode">
ITEM_CODE = #itemCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="princ">
PRINC = #princ#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
...@@ -157,4 +169,15 @@ ...@@ -157,4 +169,15 @@
ID = #id# ID = #id#
</update> </update>
<update id="operator">
UPDATE hpjx.t_hpzl001
SET
STATUS = #status#, <!-- 单据状态 0待审核 1已审核 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
WHERE
ID = #id#
</update>
</sqlMap> </sqlMap>
\ No newline at end of file
src/main/java/com/baosight/hpjx/util/CommonMethod.java
...@@ -96,6 +96,19 @@ public class CommonMethod { ...@@ -96,6 +96,19 @@ public class CommonMethod {
} }
} }
public static void updateuserInfo(EiInfo eiInfo, String resultBlock){
EiBlock block=eiInfo.getBlock(resultBlock);
String userId = UserSession.getLoginName();
String userName = UserSession.getLoginCName();
String time = DateUtils.curDateTimeStr14();
for(int i=0; i < block.getRowCount(); i++){
//TODO 公司代码待补充
block.setCell(i, HPConstants.SQL_FIELD_UPDATED_BY, userId+ HPConstants.SPLICING_SYMBOL + userName);
block.setCell(i, HPConstants.SQL_FIELD_UPDATED_TIME, time);
}
}
/** /**
* 得到当前年月的上一月字符串 * 得到当前年月的上一月字符串
* DN 21/09/04 * DN 21/09/04
...@@ -132,4 +145,22 @@ public class CommonMethod { ...@@ -132,4 +145,22 @@ public class CommonMethod {
return yearMonth; return yearMonth;
} }
public static String getCurrentSameYearMonthDay() {
int year = Calendar.getInstance().get(Calendar.YEAR);
int month = Calendar.getInstance().get(Calendar.MONTH)+1;
int days = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
String yearMonthDay;
if (month==0){
yearMonthDay=year-1+"-12";
}
else if (month<10 && month>0 && days<10 && days>0){
yearMonthDay=year+"-0"+month+"-0"+days;
}
else {
yearMonthDay=year+"-"+month+"-"+days;
}
return yearMonthDay;
}
} }
src/main/webapp/HP/KC/HPKC008.js
$(function() { $(function() {
$("#inqu_status-0-datemonth").val(__eiInfo.blocks.inqu_status.rows[0]); $("#inqu_status-0-receiptDate").val(__eiInfo.blocks.inqu_status.rows[0]);
// 查询 // 查询
$("#QUERY").on("click", function () { $("#QUERY").on("click", function () {
......
src/main/webapp/HP/PZ/HPPZ001.js
$(function () { $(function() {
// 查询
$("#QUERY").on("click", function () { $("#QUERY").on("click", function () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
});
IPLATUI.EFGrid = {
"result": {
loadComplete: function (grid) {
// 新增
$("#BTN_INSERT").on("click", function () {
var btnNode = $(this);
//禁用按钮
btnNode.attr("disabled", true);
IPLAT.submitNode($("#HPPZ002"), "HPPZ002", "insert", {
onSuccess: function (ei) {
if (ei["status"] == -1) {
NotificationUtil(ei, "error");
} else {
// 绑定grid
resultGrid.setEiInfo(ei);
NotificationUtil({
msg: '新增成功'
});
}
//释放禁用按钮
btnNode.attr("disabled", false);
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
},
onFail: function (ei) { // onFail 表示失败回调函数
// 发生异常
console.log(ei);
//释放禁用按钮
btnNode.attr("disabled", false);
}
});
}); });
// 修改
$("#BTN_UPDATE").on("click", function () {
var rowCount = resultGrid.getCheckedRows();
// 检验是否选中数据
if (rowCount == null || rowCount == "") {
NotificationUtil({
msg : '请选择一条或多条数据'
}, "warning");
return false;
}
var btnNode = $(this);
//禁用按钮
btnNode.attr("disabled", true);
IPLAT.submitNode($("#HPPZ002"), "HPPZ002", "update", {
onSuccess: function (ei) {
if (ei["status"] == -1) {
NotificationUtil(ei, "error");
} else {
NotificationUtil({
msg: '修改成功'
});
IPLATUI.EFGrid.result = { // 绑定grid
pageable: { resultGrid.setEiInfo(ei);
pageSize: 20, }
pageSizes: [10, 20, 50, 70, 100], //释放禁用按钮
btnNode.attr("disabled", false);
}, },
onFail: function (ei) { // onFail 表示失败回调函数
// 发生异常
console.log(ei);
//释放禁用按钮
btnNode.attr("disabled", false);
} }
});
});
//删除
$("#DELETE").on("click", function () {
var btnNode = $(this);
//禁用按钮
btnNode.attr("disabled", true);
var dataItems = resultGrid.getCheckedRows();
if (dataItems == null || dataItems == "") {
NotificationUtil({
msg: '选择要删除的数据'
}, "warning");
//释放禁用按钮
btnNode.attr("disabled", false);
return false;
}
IPLAT.submitNode($("#HPPZ002"), "HPPZ002", "delete", {
onSuccess: function (ei) {
if (ei["status"] == -1) {
NotificationUtil(ei, "error");
} else {
NotificationUtil({
msg: '删除成功'
});
// 绑定grid
resultGrid.setEiInfo(ei);
}
//释放禁用按钮
btnNode.attr("disabled", false);
},
onFail: function (ei) {// onFail
// 表示失败回调函数
// 发生异常
console.log(ei);
//释放禁用按钮
btnNode.attr("disabled", false);
}
});
});
}
},
};
}); });
src/main/webapp/HP/ZL/HPZL001.js
$(function() { $(function() {
var day1 = new Date();
day1.setTime(day1.getTime());
day1.setDate(day1.getDate()-1);
var month = day1.getMonth() + 1;
var year = day1.getFullYear();
var day = day1.getDate();
let inqu = $("#inqu")
,result = $("#result")
,from = $("#from")
,receiptDate = $("#inqu_status-0-receiptDate");
receiptDate.val(year+"-"+month+"-"+day)
$("#inqu_status-0-receiptDate").val(year+"-"+month+"-"+day);
// 查询 // 查询
$("#QUERY").on("click", function () { $("#QUERY").on("click", function () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询 resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
...@@ -7,7 +23,60 @@ $(function() { ...@@ -7,7 +23,60 @@ $(function() {
IPLATUI.EFGrid = { IPLATUI.EFGrid = {
"result": { "result": {
pageable: {
input: true,
numeric: false,
pageSize: 100,
pageSizes: [100, 200, 300, 500]
},
columns:[
{
field: "receiptDate",
title: "单据日期",
},
{
field: "chkBillno",
title: "检查单号",
},
{
field: "itemName",
title: "项目名称",
},
{
field: "unit",
title: "生产组",
},
{
field: "notes",
title: "质量问题描述",
},
{
field: "princ",
title: "检查人",
},
{
field: "status",
title: "状态",
},
{
field: "affix",
title: "附件",
},
{
field: "operator",
template:function(item){
let auditStatus = item.status;
if(auditStatus == 0) {
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="audit('+item.id+',1)" >审核</a>';
}else{
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="audit('+item.id+',0)" >反审</a>';
}
}
}
],
loadComplete: function (grid) { loadComplete: function (grid) {
// 新增 // 新增
$("#BTN_INSERT").on("click", function () { $("#BTN_INSERT").on("click", function () {
...@@ -128,5 +197,27 @@ $(function() { ...@@ -128,5 +197,27 @@ $(function() {
}; };
}); });
function audit(id,auditStatus){
const inEiInfo = new EiInfo();
inEiInfo.set("result-0-id",id);
inEiInfo.set("result-0-status",auditStatus );
EiCommunicator.send('HPZL001','operator', inEiInfo, {
onSuccess(response) {
NotificationUtil(response.msg);
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
}
},
{
async: false
}
);
}
\ No newline at end of file
src/main/webapp/HP/ZL/HPZL001.jsp
...@@ -9,17 +9,24 @@ ...@@ -9,17 +9,24 @@
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期" <EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期"
format="yyyy/MM/dd" depth="year" required="true"/> format="yyyy-MM-dd" required="true"/>
<EF:EFInput ename="inqu_status-0-itemName" cname="项目名称" colWidth="4" readonly="false"/> <EF:EFSelect ename="inqu_status-0-itemName" cname="项目名称"
valueTemplate="#=textField#"
template="#=textField#"
textField="textField"
valueField="valueField"
required="true"
locked="true"
filter="contains">
<EF:EFOptions blockId="proj_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFInput ename="inqu_status-0-princ" cname="检查人" colWidth="4" readonly="false"/> <EF:EFInput ename="inqu_status-0-princ" cname="检查人" colWidth="4" readonly="false"/>
<EF:EFSelect ename="inqu_status-0-status" cname="处理状态" colWidth="4"> <EF:EFSelect ename="inqu_status-0-status" cname="处理状态" colWidth="4">
<EF:EFOption label="--请选择--" value=""/> <EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="审核" value="1"></EF:EFOption> <EF:EFOption label="审核" value="1"></EF:EFOption>
<EF:EFOption label="待审核" value="0"></EF:EFOption> <EF:EFOption label="待审核" value="0"></EF:EFOption>
</EF:EFSelect> </EF:EFSelect>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
...@@ -28,16 +35,33 @@ ...@@ -28,16 +35,33 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" width="100" readonly="false" /> <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="100" readonly="false" />
<EF:EFColumn ename="chkBillno" cname="检查单号" width="100" readonly="false" /> <EF:EFColumn ename="chkBillno" cname="检查单号" width="100" readonly="false" />
<EF:EFColumn ename="itemCode" cname="项目号" width="100" readonly="false"/> <EF:EFComboColumn ename="itemName" cname="项目名称"
<EF:EFColumn ename="itemName" cname="项目名称" width="100" readonly="false"/> columnTemplate="#=textField#"
itemTemplate="#=textField#"
blockName="proj_record_block_id"
textField="textField"
valueField="textField"
maxLength="20"
readonly="true"
style="color:blue;"
required="true"
filter="contains"
width="220">
</EF:EFComboColumn>
<EF:EFColumn ename="unit" cname="生产组" width="100" readonly="false"/> <EF:EFColumn ename="unit" cname="生产组" width="100" readonly="false"/>
<EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/> <EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/>
<EF:EFColumn ename="princ" cname="检查人" width="100" readonly="false"/> <EF:EFColumn ename="princ" cname="检查人" width="100" readonly="false"/>
<EF:EFColumn ename="status" cname="单据状态" width="100" readonly="false"/> <EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
<%--<EF:EFColumn ename="valuestatus" cname="审核按钮" width="100" readonly="false"/>--%> itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="审核" value="1"></EF:EFOption>
<EF:EFOption label="未审核" value="0"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFColumn ename="affix" cname="附件" width="100" readonly="false"/> <EF:EFColumn ename="affix" cname="附件" width="100" readonly="false"/>
<EF:EFColumn ename="operator" cname="操作" width="100" readonly="false"/>
<EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="150" align="center" enable="false" <EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="150" align="center" enable="false"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" hidden ="true" /> parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" hidden ="true" />
<EF:EFColumn ename="createdBy" cname="创建人" readonly="true" width="150" align="center" enable="false" hidden ="true"/> <EF:EFColumn ename="createdBy" cname="创建人" readonly="true" width="150" align="center" enable="false" hidden ="true"/>
......
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