Skip to content

H
hg-smart
Commit 5b5b1bd0 by liuyang
Options

2024-05-18 优化工艺流程和工序单价

parent 99c75260
Showing with 44 additions and 28 deletions
src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java
...@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.sb.service; ...@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.sb.service;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.constant.CommonConstant; import com.baosight.hggp.core.constant.CommonConstant;
import com.baosight.hggp.hg.sb.domain.HGSB004;
import com.baosight.hggp.hg.sb.domain.HGSB006; import com.baosight.hggp.hg.sb.domain.HGSB006;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
import com.baosight.hggp.util.contants.ACConstants; import com.baosight.hggp.util.contants.ACConstants;
...@@ -21,6 +22,7 @@ public class ServiceHGSB006 extends ServiceEPBase { ...@@ -21,6 +22,7 @@ public class ServiceHGSB006 extends ServiceEPBase {
@Override @Override
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
inInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006()); inInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006());
CommonMethod.initBlock(inInfo, CommonMethod.initBlock(inInfo,
Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null
...@@ -31,6 +33,7 @@ public class ServiceHGSB006 extends ServiceEPBase { ...@@ -31,6 +33,7 @@ public class ServiceHGSB006 extends ServiceEPBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
return super.query(inInfo,HGSB006.QUERY,new HGSB006()); return super.query(inInfo,HGSB006.QUERY,new HGSB006());
} }
} }
src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java
...@@ -2,6 +2,8 @@ package com.baosight.hggp.hg.sb.service; ...@@ -2,6 +2,8 @@ package com.baosight.hggp.hg.sb.service;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.constant.CommonConstant; import com.baosight.hggp.core.constant.CommonConstant;
import com.baosight.hggp.hg.sb.domain.HGSB004;
import com.baosight.hggp.hg.sb.domain.HGSB005;
import com.baosight.hggp.hg.sb.domain.HGSB007; import com.baosight.hggp.hg.sb.domain.HGSB007;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
import com.baosight.hggp.util.contants.ACConstants; import com.baosight.hggp.util.contants.ACConstants;
...@@ -21,6 +23,7 @@ public class ServiceHGSB007 extends ServiceEPBase { ...@@ -21,6 +23,7 @@ public class ServiceHGSB007 extends ServiceEPBase {
@Override @Override
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
inInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL); inInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
CommonMethod.initBlock(inInfo, CommonMethod.initBlock(inInfo,
Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null
...@@ -31,6 +34,7 @@ public class ServiceHGSB007 extends ServiceEPBase { ...@@ -31,6 +34,7 @@ public class ServiceHGSB007 extends ServiceEPBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
return super.query(inInfo,HGSB007.QUERY,new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL); return super.query(inInfo,HGSB007.QUERY,new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
} }
} }
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB006.xml
...@@ -128,12 +128,15 @@ ...@@ -128,12 +128,15 @@
<isNotEmpty prepend=" AND " property="docId"> <isNotEmpty prepend=" AND " property="docId">
A.DOC_ID = #docId# A.DOC_ID = #docId#
</isNotEmpty> </isNotEmpty>
<isEqual prepend=" AND " property="checkStatus" compareValue="1"> <isNotEmpty prepend=" AND " property="checkStatus">
trim(A.DOC_ID) ='' and trim(A.CHECK_RESULT) = '' B.CHECK_STATUS = #checkStatus#
</isEqual> </isNotEmpty>
<isEqual prepend=" AND " property="checkStatus" compareValue="2"> <!--<isEqual prepend=" AND " property="checkStatus" compareValue="1">
(trim(A.DOC_ID) !='' or trim(A.CHECK_RESULT) != '') trim(A.DOC_ID) ='' and trim(A.CHECK_RESULT) = ''
</isEqual> </isEqual>
<isEqual prepend=" AND " property="checkStatus" compareValue="2">
(trim(A.DOC_ID) !='' or trim(A.CHECK_RESULT) != '')
</isEqual>-->
</sql> </sql>
<select id="query" parameterClass="HashMap" resultClass="HGSB006"> <select id="query" parameterClass="HashMap" resultClass="HGSB006">
......
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB007.xml
...@@ -134,12 +134,15 @@ ...@@ -134,12 +134,15 @@
<isNotEmpty prepend=" AND " property="docId"> <isNotEmpty prepend=" AND " property="docId">
A.DOC_ID = #docId# A.DOC_ID = #docId#
</isNotEmpty> </isNotEmpty>
<isEqual prepend=" AND " property="upkeepStatus" compareValue="1"> <isNotEmpty prepend=" AND " property="checkStatus">
B.CHECK_STATUS = #checkStatus#
</isNotEmpty>
<!--<isEqual prepend=" AND " property="upkeepStatus" compareValue="1">
trim(A.DOC_ID) ='' and trim(A.CHECK_RESULT) = '' trim(A.DOC_ID) ='' and trim(A.CHECK_RESULT) = ''
</isEqual> </isEqual>
<isEqual prepend=" AND " property="upkeepStatus" compareValue="2"> <isEqual prepend=" AND " property="upkeepStatus" compareValue="2">
(trim(A.DOC_ID) !='' or trim(A.CHECK_RESULT) != '') (trim(A.DOC_ID) !='' or trim(A.CHECK_RESULT) != '')
</isEqual> </isEqual>-->
</sql> </sql>
<select id="query" parameterClass="HashMap" resultClass="HGSB007"> <select id="query" parameterClass="HashMap" resultClass="HGSB007">
......
src/main/webapp/HG/SB/HGSB002.js
...@@ -37,11 +37,13 @@ $(function () { ...@@ -37,11 +37,13 @@ $(function () {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showDetail(' + item.id + ',\''+item.companyCode+'\',\''+item.companyName+'\',\''+item.groupCode+'\',\''+item.groupName+'\')" >计划详情</a>'; + 'onclick="showDetail(' + item.id + ',\''+item.companyCode+'\',\''+item.companyName+'\',\''+item.groupCode+'\',\''+item.groupName+'\')" >计划详情</a>';
if (auditStatus == 0) { if (auditStatus == 0) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="updateStatus(' + item.id + ',1)" >启用</a>';
} else if (auditStatus == 1) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' + template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="updateStatus(' + item.id + ',0)" >停止</a>'; 'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';
} else if (auditStatus == -1) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';
} }
} }
return template; return template;
...@@ -300,8 +302,8 @@ let save = function (btnNode) { ...@@ -300,8 +302,8 @@ let save = function (btnNode) {
function updateStatus(id,deviceStatus) { function updateStatus(id,deviceStatus) {
let inEiInfo = new EiInfo(); let inEiInfo = new EiInfo();
inEiInfo.set("result-0-id", id); inEiInfo.set("result-0-id", id);
inEiInfo.set("result-0-deviceStatus", deviceStatus); inEiInfo.set("result-0-planStatus", deviceStatus);
EiCommunicator.send('HGSB001', 'updateStatus', inEiInfo, { EiCommunicator.send('HGSB002', 'updateStatus', inEiInfo, {
onSuccess(response) { onSuccess(response) {
NotificationUtil(response.msg); NotificationUtil(response.msg);
query(); query();
......
src/main/webapp/HG/SB/HGSB002.jsp
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/> <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
<EF:EFColumn ename="accountCode" cname="账套" hidden="true"/> <EF:EFColumn ename="accountCode" cname="账套" hidden="true"/>
<%--blockName="factoryCodeBox_block_id"--%> <%--blockName="factoryCodeBox_block_id"--%>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/> <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="210" align="center"/>
<EF:EFComboColumn ename="companyCode" cname="公司名称" <EF:EFComboColumn ename="companyCode" cname="公司名称"
columnTemplate="#=textField#" itemTemplate="#=textField#" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" textField="textField" valueField="valueField"
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="1"> <EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="0">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false" <EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"
enable="false"/> enable="false"/>
......
src/main/webapp/HG/SB/HGSB004.js
...@@ -167,7 +167,7 @@ let query = function () { ...@@ -167,7 +167,7 @@ let query = function () {
*/ */
function taskResult() { function taskResult() {
JSColorbox.open({ JSColorbox.open({
href: "HGSB004B?methodName=initLoad&inqu_status-0-pageNumber=HGSB004&inqu_status-0-planType="+1, href: "HGSB004B?methodName=initLoad&inqu_status-0-pageNumber=HGSB004&inqu_status-0-planType="+1+"&inqu_status-0-planStatus="+1,
title: "<div style='text-align: center;'>选择设备计划任务</div>", title: "<div style='text-align: center;'>选择设备计划任务</div>",
width: "80%", width: "80%",
height: "90%", height: "90%",
......
src/main/webapp/HG/SB/HGSB004B.jsp
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<EF:EFInput blockId="inqu_status" row="0" ename="inspecUserName" cname="点检人名称" value="${userName}" type="hidden"/> <EF:EFInput blockId="inqu_status" row="0" ename="inspecUserName" cname="点检人名称" value="${userName}" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="planType" cname="计划类型" type="hidden"/> <EF:EFInput blockId="inqu_status" row="0" ename="planType" cname="计划类型" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="taskStatus" cname="任务类型" value="0" type="hidden"/> <EF:EFInput blockId="inqu_status" row="0" ename="taskStatus" cname="任务类型" value="0" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="planStatus" cname="审批状态" value="1" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="pageNumber" cname="页面号" type="hidden"/> <EF:EFInput blockId="inqu_status" row="0" ename="pageNumber" cname="页面号" type="hidden"/>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="1"> <EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="1">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<%--<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false" <%--<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"
enable="false"/> enable="false"/>
......
src/main/webapp/HG/SB/HGSB005.js
...@@ -167,7 +167,7 @@ let query = function () { ...@@ -167,7 +167,7 @@ let query = function () {
*/ */
function taskResult() { function taskResult() {
JSColorbox.open({ JSColorbox.open({
href: "HGSB004B?methodName=initLoad&inqu_status-0-pageNumber=HGSB005&inqu_status-0-planType="+2, href: "HGSB004B?methodName=initLoad&inqu_status-0-pageNumber=HGSB005&inqu_status-0-planType="+2+"&inqu_status-0-planStatus="+1,
title: "<div style='text-align: center;'>选择设备计划任务</div>", title: "<div style='text-align: center;'>选择设备计划任务</div>",
width: "80%", width: "80%",
height: "90%", height: "90%",
......
src/main/webapp/HG/SB/HGSB006.js
...@@ -15,10 +15,10 @@ $(function () { ...@@ -15,10 +15,10 @@ $(function () {
field: "remainderDays", field: "remainderDays",
template: function (item) { template: function (item) {
let template = ''; let template = '';
if (isBlank(item.checkResult.trim()) || isBlank(item.docId.trim())){ if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
return item["remainderDays"];
}else {
return "0"; return "0";
}else {
return item["remainderDays"];
} }
} }
}, { }, {
...@@ -35,7 +35,7 @@ $(function () { ...@@ -35,7 +35,7 @@ $(function () {
field: "earlyStatus", field: "earlyStatus",
template: function (item) { template: function (item) {
let earlyStatus; let earlyStatus;
if (!isBlank(item.checkResult.trim()) || isBlank(!item.docId.trim())){ if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
earlyStatus = "<span>已完成</span>";; earlyStatus = "<span>已完成</span>";;
}else if (item.remainderDays == 0){ }else if (item.remainderDays == 0){
earlyStatus = "<span style='color: #67c20b'>点检期</span>"; earlyStatus = "<span style='color: #67c20b'>点检期</span>";
......
src/main/webapp/HG/SB/HGSB007.js
...@@ -102,10 +102,10 @@ $(function () { ...@@ -102,10 +102,10 @@ $(function () {
field: "remainderDays", field: "remainderDays",
template: function (item) { template: function (item) {
let template = ''; let template = '';
if (isBlank(item.checkResult.trim()) || isBlank(item.docId.trim())){ if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
return item["remainderDays"];
}else {
return "0"; return "0";
}else {
return item["remainderDays"];
} }
} }
}, { }, {
...@@ -122,7 +122,7 @@ $(function () { ...@@ -122,7 +122,7 @@ $(function () {
field: "earlyStatus", field: "earlyStatus",
template: function (item) { template: function (item) {
let earlyStatus; let earlyStatus;
if (!isBlank(item.checkResult.trim()) || isBlank(!item.docId.trim())){ if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
earlyStatus = "<span>已完成</span>";; earlyStatus = "<span>已完成</span>";;
}else if (item.remainderDays == 0){ }else if (item.remainderDays == 0){
earlyStatus = "<span style='color: #67c20b'>保养期</span>"; earlyStatus = "<span style='color: #67c20b'>保养期</span>";
......
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