bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

对机具出入库 领料 首页展示 问题进行修改

This commit is contained in:
haozq 2026-02-02 15:36:13 +08:00
parent f647018215
commit 06b3398dd7
19 changed files with 377 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/WEB-INF/views/bm/aqList.jsp
View File

@ -26,7 +26,7 @@
</head>
<body>
<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>
<script src="${bonuspath}/static/js/bm/aqList.js?v=1"></script>
</body>
</html>

2
WebContent/WEB-INF/views/bm/aqPlanList.jsp
View File

@ -26,7 +26,7 @@
</head>
<body>
<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>
<script src="${bonuspath}/static/js/bm/aqPlanList.js?v=1"></script>
</body>
</html>

2
WebContent/WEB-INF/views/bm/carList.jsp
View File

@ -26,7 +26,7 @@
</head>
<body>
<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>
<script src="${bonuspath}/static/js/bm/carList.js?v=1"></script>
</body>
</html>

3
WebContent/WEB-INF/views/equipment/equipmentTypesDetail.jsp
View File

@ -126,6 +126,8 @@
dataType: 'text', // 将响应类型设置为text而不是json
parseData: function(res) {
console.log('开始解析数据');
console.log(res);
try {
console.log('收到的原始响应数据:', res);
@ -134,6 +136,7 @@
}
try {
res = JSON.parse(res);
return {
"code": 0,
"msg": res.resMsg || '',

2
WebContent/WEB-INF/views/equipment/equipmentTypesInfo.jsp
View File

@ -640,7 +640,7 @@
$.ajax({
type: 'post',
url: bonuspath + apiUrl,
url: '${bonuspath}' + apiUrl,
dataType: "json",
data: requestData,
success: function(res) {

16
WebContent/WEB-INF/views/equipment/projectDetail.jsp
View File

@ -140,7 +140,7 @@
<!-- 分公司筛选 -->
<div class="filter-row">
<span class="filter-label">分公司：</span>
<span class="filter-label">往来单位：</span>
<div class="filter-options" id="companyFilter">
<div class="filter-option active" data-value="all">全部</div>
<!-- 分公司选项将通过JavaScript动态添加 -->
@ -212,7 +212,7 @@
// 初始化分公司选项
function loadCompanyOptions() {
$.ajax({
url: '${bonuspath}/backstage/indexHomeDetails/getProjectCompany',
url: '${bonuspath}/backstage/indexHomeDetails/getProjectSub',
type: 'post',
dataType: "json",
success: function(res) {
@ -244,12 +244,16 @@
// 加载表格数据
function loadTableData() {
var company = $('#companyFilter .active').data('value');
var company = $('#companyFilter .active').text();
console.log("===",company)
var year = $('#yearFilter .active').data('value');
var month = $('#monthFilter .active').data('value');
var projectName = $('#projectNameSearch').val().trim();
console.log(company, year, month);
if(isNaN(company)){
if (!company) {
company = '';
}
if(company=='全部'){
company = '';
}
@ -258,7 +262,7 @@
url: '${bonuspath}/backstage/indexHomeDetails/getProjectDiff',
method: 'post',
where: {
companyId: company,
subName: company,
year: year,
month: month,
projectName: projectName
@ -294,7 +298,7 @@
{field: 'firstTime', title: '首次领料日期', width: '11%'},
{field: 'lastTime', title: '最新领料日期', width: '11%'},
{field: 'backTime', title: '最新退料日期', width: '11%'},
{field: 'companyName', title: '所属分公司', width: '10%'}
{field: 'subName', title: '往来单位', width: '10%'}
]],
response: {
statusCode: 200

2
WebContent/WEB-INF/views/newInput/newInputApprovallist.jsp
View File

@ -46,6 +46,8 @@
<th style="width:10%" class="center">检验人</th>
<th style="width:10%" class="center">入库人</th>
<th style="width:10%" class="center">是否批准</th>
<th style="width:10%" class="center">批准人</th>
<th style="width:10%" class="center">批准时间</th>
<th style="width:10%" class="center">操作</th>
</tr>
</thead>

6
WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp
View File

@ -622,6 +622,8 @@ body {
<th style="width:10%">检验人</th>
<th style="width:10%">入库人</th>
<th style="width:10%">审核状态</th>
<th style="width:10%">审核人</th>
<th style="width:10%">审核时间</th>
<th style="width:12%">操作</th>
</tr>
</thead>
@ -753,7 +755,8 @@ function getbaseList(init) {
} else {
html += "<td class='center'><span class='status-badge status-approved'>已审核</span></td>";
}
html += "<td class='center'>" + (l.auditUser || '-') + "</td>";
html += "<td class='center'>" + (l.auditTime || '-') + "</td>";
html += "<td class='center'>";
if(l.isExamine != 1 && l.isExamine != '1') {
html += "<a href='#' title='审核' onclick='check(\"" + l.id + "\",\"" + l.checkNum + "\",\"" + l.nums + "\")' class='action-btn btn-approve'>";
@ -762,6 +765,7 @@ function getbaseList(init) {
html += "<span style='color: var(--success-green); font-size: 18px;' title='已审核'><i class='icon-ok-circle'></i></span>";
}
html += "</td>";
html += "</tr>";
}
$("#baseTable tbody").append(html);

9
WebContent/static/js/bm/publicJumpIp.js Normal file
View File

@ -0,0 +1,9 @@
//安全工器具 后端请求ip
let AQGQJ_IP='http://10.1.0.142:1999';
//安全工器具 -跳转页面地址
let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/index.html';
//车辆 后端请求IP
let CAR_IP='http://192.168.0.38:21522';
//车辆 跳转页面IP
let CAR_HTML_IP='http://192.168.0.38:8848/gz_car_ui/index.html';

54
resources/mybatis/index/IndexHomeDetailsMapper.xml
View File

@ -597,7 +597,7 @@
mt.`NAME` as maName,
mt.UNIT as maUnit,
mt.is_COUNT AS isCount,
CAST(mt.NUM AS SIGNED) AS storageNum
mt.NUM as storageNum
FROM
mm_type mt
LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
@ -712,7 +712,7 @@
<if test="maName != null and maName != ''">
and mt.`NAME` like concat('%', #{maName}, '%')
</if>
order by t1.time desc
order by t1.TIME desc
</select>
<select id="getTotalInfo" parameterType="com.bonus.index.beans.IndexTotalWarnBean" resultType="com.bonus.index.beans.IndexTotalWarnBean">
@ -907,7 +907,7 @@
SUM( leaseNum ) - SUM( backNum ) diffCount ,
firstTime,
lastTime,
max(backTime) as backTime
max(backTime) as backTime,subName
FROM
(
SELECT
@ -921,11 +921,20 @@
wla.ID AS agreementId ,
min(wir.time) as firstTime,
max(wir.time) as lastTime,
wir.time as backTime
wir.time as backTime,real_sub.subName
FROM
wf_task_record wtr
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
left join(
SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName
FROM wf_task_record wtr
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
left join bm_unit bu on bu.id =wla.LEASE_COMPANY
where bu.`NAME` is not null AND wtr.IS_ACTIVE = 1
GROUP BY wla.PROJECT
) real_sub on real_sub.proId=wla.PROJECT
LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
@ -949,18 +958,25 @@
wla.ID AS agreementId ,
"" as firstTime,
"" as lastTime,
max(wir.time) as backTime
max(wir.time) as backTime,real_sub.subName
FROM
wf_task_record wtr
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
left join(
SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName
FROM wf_task_record wtr
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
left join bm_unit bu on bu.id =wla.LEASE_COMPANY
where bu.`NAME` is not null AND wtr.IS_ACTIVE = 1
GROUP BY wla.PROJECT
) real_sub on real_sub.proId= wla.PROJECT
LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
WHERE
wir.TYPE = 4
AND wtr.IS_ACTIVE = 1
WHERE wtr.IS_ACTIVE = 1 AND wir.TYPE = 4
<if test="projectId != null and projectId != ''">
and wla.PROJECT = #{projectId}
</if>
@ -969,8 +985,8 @@
wla.ID
) a
<where>
<if test="companyId != null and companyId != ''">
and companyId = #{companyId}
<if test="subName != null and subName != ''">
AND FIND_IN_SET(subName, #{subName}) > 0
</if>
<if test="projectName != null and projectName != ''">
and projectName like concat('%',#{projectName},'%')
@ -1085,19 +1101,22 @@
<select id="getProjectCompany" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
SELECT
bc.ID as companyId,
bc.`NAME` as companyName
FROM
bm_company bc
WHERE bc.IS_ACTIVE =1
</select>
<!-- 查询 -->
<select id="getProjectSub" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
SELECT
bs.ID as companyId,
bs.`NAME` as companyName
FROM
bm_unit bs
WHERE bs.IS_ACTIVE =1
</select>
<select id="getToOutList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
@ -1356,7 +1375,7 @@
cpd.model_id modelId,
cpd.need_num needNum,
cpd.need_day needDay,
cpa.need_time backDate,
cpd.back_date backDate,
cpd.remark,
cmti.type maType,
cmti.`NAME` maName,
@ -1368,7 +1387,6 @@
LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID
LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id
WHERE bp.`NAME` IS NOT NULL
and cpa.status = 1
<if test="projectName != null and projectName != ''">
and bp.`NAME` like concat('%', #{projectName}, '%')
</if>

15
resources/mybatis/newInput/NewInputMapper.xml
View File

@ -53,8 +53,10 @@
resultMap="new">
SELECT wnd.ID AS id,SUM(wir.NUM) AS nums,wnd.IS_APPROVAL AS isApproval,
wnd.IS_EXAMINE AS isExamine,mt.`NAME` AS maModel,mtt.`NAME` AS maType,
pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum
pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum,
pus.NAME auditUser ,wnd.AUDIT_TIME auditTime
FROM wf_new_details wnd
LEFT JOIN pm_user pus on pus.ID = wnd.AUDIT_USER
LEFT JOIN wf_task_appoint wta ON wta.TASK_ID = wnd.TASK_ID
LEFT JOIN wf_info_record wir ON wir.SUP_ID = wnd.TASK_ID AND wnd.MODEL_ID = wir.MODEL_ID
LEFT JOIN pm_user pu on pu.ID = wnd.CHECKER
@ -110,7 +112,7 @@
SELECT wnd.ID AS id,SUM(wir.NUM) AS nums,wnd.IS_APPROVAL AS isApproval,
wnd.IS_EXAMINE AS isExamine,mt.`NAME` AS maModel,mtt.`NAME` AS maType,
pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum,
wnd.MODEL_ID as maModelId,wnd.TASK_ID as taskId
wnd.MODEL_ID as maModelId,wnd.TASK_ID as taskId,audit.time auditTime ,pus.`NAME` auditUser
FROM wf_new_details wnd
LEFT JOIN wf_task_appoint wta ON wta.TASK_ID = wnd.TASK_ID
LEFT JOIN wf_info_record wir ON wir.SUP_ID = wnd.TASK_ID AND wnd.MODEL_ID = wir.MODEL_ID
@ -119,6 +121,13 @@
LEFT JOIN ma_org_relation mor on mor.TYPE_ID = wnd.MODEL_ID
LEFT JOIN mm_type mt ON mt.ID = mor.TYPE_ID
LEFT JOIN mm_type mtt ON mtt.ID = mt.PARENT_ID
LEFT JOIN(
SELECT task, max(time) time ,creator
from bm_logs
where fun='/backstage/new/isApproval'
GROUP BY task
)audit on audit.task=wnd.TASK_ID
LEFT JOIN pm_user pus on pus.ID = audit.creator
WHERE wir.NUM IS NOT NULL AND wnd.IS_EXAMINE = 1 AND wta.IS_ACTIVE = 1
<if test="param.keyWord != null and param.keyWord != ''">
AND(
@ -209,7 +218,7 @@
<update id="isExamine" parameterType="com.bonus.newInput.beans.NewInputBean">
update wf_new_details set
IS_EXAMINE = #{isExamine}
IS_EXAMINE = #{isExamine},AUDIT_TIME=#{auditTime},AUDIT_USER=#{auditUser}
where ID = #{id}
</update>

1
resources/mybatis/newInput/NewReportMapper.xml
View File

@ -38,5 +38,6 @@
OR mv.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
)
</if>
ORDER BY wir.time desc
</select>
</mapper>

14
src/com/bonus/index/beans/IndexProjectBean.java
View File

@ -35,6 +35,20 @@ public class IndexProjectBean {
private String lastTime;
private String backTime;
/**
* 分公司名称
*/
private String subName;
public String getSubName() {
return subName;
}
public void setSubName(String subName) {
this.subName = subName;
}
public String getKeyword() {
return keyword;

19
src/com/bonus/index/controller/IndexHomeDetailsController.java
View File

@ -377,6 +377,25 @@ public class IndexHomeDetailsController extends BaseController<IndexHomeDetailsB
}
return ar;
}
/**
* 查询往来单位
* @param o
* @return
*/
@RequestMapping(value = "getProjectSub", method = RequestMethod.POST)
@ResponseBody
public AjaxRes getProjectSub(IndexProjectBean o) {
AjaxRes ar = getAjaxRes();
try {
List<IndexProjectBean> list = service.getProjectSub(o);
ar.setSucceed(list);
} catch (Exception e) {
logger.error(e.toString(), e);
ar.setFailMsg(GlobalConst.DATA_FAIL);
}
return ar;
}
// 差缺工程明细 -- 传入projectId
@RequestMapping(value = "getProjectMaDiff", method = RequestMethod.POST)

6
src/com/bonus/index/dao/IndexHomeDetailsDao.java
View File

@ -83,5 +83,11 @@ public interface IndexHomeDetailsDao extends BaseDao<IndexHomeDetailsBean> {
List<IndexHomeCalendarBean> getCalendarNewInput(IndexHomeCalendarBean o);
List<IndexHomeCalendarBean> getCalendarPd(IndexHomeCalendarBean o);
/**
* 查询往来单位
* @param o
* @return
*/
List<IndexProjectBean> getProjectSub(IndexProjectBean o);
}

6
src/com/bonus/index/service/IndexHomeDetailsService.java
View File

@ -74,5 +74,11 @@ public interface IndexHomeDetailsService extends BaseService<IndexHomeDetailsBea
List<IndexHomeCalendarBean> getCalendarNewInput(IndexHomeCalendarBean o);
List<IndexHomeCalendarBean> getCalendarPd(IndexHomeCalendarBean o);
/**
* 查询往来单位接口
* @param o
* @return
*/
List<IndexProjectBean> getProjectSub(IndexProjectBean o);
}

6
src/com/bonus/index/service/IndexHomeDetailsServiceImp.java
View File

@ -219,6 +219,12 @@ public class IndexHomeDetailsServiceImp extends BaseServiceImp<IndexHomeDetailsB
return dao.getProjectCompany(o);
}
@Override
public List<IndexProjectBean> getProjectSub(IndexProjectBean o) {
return dao.getProjectSub(o);
}
@Override
public List<IndexTodoWarnBean> getTodoList(IndexTodoWarnBean o) {
List<IndexTodoWarnBean> rs = new ArrayList<>();

22
src/com/bonus/newInput/beans/NewInputBean.java
View File

@ -26,6 +26,28 @@ public class NewInputBean extends InputDetailsBean {
private String maId;
private String isExamine;
private String auditUser;
private String auditTime;
public String getAuditUser() {
return auditUser;
}
public void setAuditUser(String auditUser) {
this.auditUser = auditUser;
}
public String getAuditTime() {
return auditTime;
}
public void setAuditTime(String auditTime) {
this.auditTime = auditTime;
}
public String getIsExamine() {
return isExamine;
}

4
src/com/bonus/newInput/service/NewInputServiceImp.java
View File

@ -132,6 +132,10 @@ public class NewInputServiceImp extends BaseServiceImp<NewInputBean> implements
@Override
public void isExamine(NewInputBean o) {
String userId = UserShiroHelper.getRealCurrentUser().getId() + "";
o.setAuditUser(userId);
String time = DateTimeHelper.currentDateTime();
o.setAuditTime(time);
o.setIsExamine("1");
dao.isExamine(o);