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

新购测试问题修改

This commit is contained in:
hayu 2024-06-20 14:04:13 +08:00
parent 9275d57f12
commit 78f99ec50d
6 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInput.java
View File

@ -97,7 +97,6 @@ public class PurchaseInput extends BaseEntity
/** 不通过原因 */ /** 不通过原因 */
@ApiModelProperty(value = "不通过原因") @ApiModelProperty(value = "不通过原因")
@Excel(name = "不通过原因")
private String reason; private String reason;
/** 数据所属组织 */ /** 数据所属组织 */

50
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}) AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or (pci.arrival_time BETWEEN #{startTime} AND #{endTime}) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if> </if>
GROUP BY pcd.task_id GROUP BY pcd.task_id
order by pci.create_time desc order by pci.create_time desc
@ -215,10 +215,11 @@ WHERE ma_machine.ma_code =
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE pcd.task_id = pci.task_id WHERE pcd.task_id = pci.task_id
) )
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}) AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or (pci.arrival_time BETWEEN #{startTime} AND #{endTime}) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if></if> </if>
order by pci.id desc order by pci.id desc
</select> </select>
<select id="exportList" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo"> <select id="exportList" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
@ -226,7 +227,7 @@ WHERE ma_machine.ma_code =
tk.CODE, tk.CODE,
pci.purchase_time as purchaseTime, pci.purchase_time as purchaseTime,
pci.arrival_time as arrivalTime, pci.arrival_time as arrivalTime,
su.user_name purchaserName, su.nick_name purchaserName,
mt1.type_name as purchasingTypeName, mt1.type_name as purchasingTypeName,
mt.type_name AS purchasingTypeCode, mt.type_name AS purchasingTypeCode,
mt.manage_type as manageType, mt.manage_type as manageType,
@ -263,22 +264,43 @@ WHERE ma_machine.ma_code =
su.user_name purchaserName, su.user_name purchaserName,
mt1.type_name as purchasingTypeName, mt1.type_name as purchasingTypeName,
mt.type_name as purchasingTypeCode, mt.type_name as purchasingTypeCode,
pcd.input_time as inputTime, CASE
su.user_name as inputUser, pcd.input_status
WHEN 0 THEN
''
WHEN 1 THEN
tk.update_time ELSE ''
END inputTime,
CASE
pcd.input_status
WHEN 0 THEN
''
WHEN 1 THEN
sus.user_name ELSE ''
END inputUser,
pcd.input_status as inputStatus pcd.input_status as inputStatus
FROM purchase_check_details pcd FROM purchase_check_details pcd
LEFT JOIN purchase_check_info pci on pci.task_id = pcd.task_id LEFT JOIN purchase_check_info pci on pci.task_id = pcd.task_id
left join tm_task tk on pcd.task_id = tk.task_id left join tm_task tk on pcd.task_id = tk.task_id
LEFT JOIN sys_user sus ON tk.update_by = sus.user_id
left join sys_user su on pci.purchaser = su.user_id left join sys_user su on pci.purchaser = su.user_id
left join ma_type mt on pcd.type_id = mt.type_id left join ma_type mt on pcd.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id
where task_type = 23 where task_type = 23
and tk.task_status in (26, 28) <if test="taskStatus != null">and tk.task_status = #{taskStatus}</if>
<if test="keyWord != null and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</if> <if test="taskStatus == null">and tk.task_status in (28,105,107,123)</if>
<if test="purchaseTime != null and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if> <if test="keyWord != null and keyWord != ''">and tk.code like concat('%',#{keyWord},'%')</if>
<if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if> <if test="purchaseTime != null and purchaseTime != ''">and pci.purchase_time = #{purchaseTime}</if>
<if test="purchaser != null "> and pci.purchaser = #{purchaser}</if> <if test="arrivalTime != null and arrivalTime != ''">and pci.arrival_time = #{arrivalTime}</if>
<if test="companyId != null "> and pci.company_id = #{companyId}</if> <if test="purchaser != null ">and pci.purchaser = #{purchaser}</if>
<if test="companyId != null ">and pci.company_id = #{companyId}</if>
<if test="typeId != null">AND #{typeId} IN (SELECT mt2.type_id
FROM purchase_check_details pcd
LEFT JOIN ma_type mt on mt.type_id=pcd.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE pcd.task_id = pci.task_id
)
</if>
ORDER BY pcd.task_id desc ORDER BY pcd.task_id desc
</select> </select>
<select id="selectPutInListExamine" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo"> <select id="selectPutInListExamine" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">

5
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
View File

@ -299,8 +299,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}) AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or (pci.arrival_time BETWEEN #{startTime} AND #{endTime}) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if> </if>
GROUP BY pcd.task_id GROUP BY pcd.task_id
order by pci.id desc order by pci.id desc
@ -402,6 +402,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pcd.`status`!=3 and pcd.`status`!=3
<if test="dictName != null and dictName != ''"> <if test="dictName != null and dictName != ''">
and (mt.type_name like concat('%',#{dictName},'%') or and (mt.type_name like concat('%',#{dictName},'%') or
pmi.ma_code like concat('%',#{dictName},'%') or
mt1.type_name like concat('%',#{dictName},'%')) mt1.type_name like concat('%',#{dictName},'%'))
</if> </if>
order by status order by status

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -389,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND pcd.`status` != 7 AND pcd.`status` != 7
<if test="dictName != null and dictName != ''"> <if test="dictName != null and dictName != ''">
and (mt.type_name like concat('%',#{dictName},'%') or and (mt.type_name like concat('%',#{dictName},'%') or
pmi.ma_code like concat('%',#{dictName},'%') or
mt1.type_name like concat('%',#{dictName},'%')) mt1.type_name like concat('%',#{dictName},'%'))
</if> </if>
ORDER BY ORDER BY

12
sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
View File

@ -320,12 +320,12 @@
width="200" width="200"
/> />
<el-table-column <!-- <el-table-column-->
label="不通过原因" <!-- label="不通过原因"-->
align="center" <!-- align="center"-->
prop="remark" <!-- prop="remark"-->
:show-overflow-tooltip="true" <!-- :show-overflow-tooltip="true"-->
/> <!-- />-->
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == '0'">待审核</span> <span v-if="scope.row.status == '0'">待审核</span>

4
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -133,13 +133,13 @@
<el-table-column <el-table-column
label="入库人员" label="入库人员"
align="center" align="center"
prop="updateBy" prop="inputUser"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="入库时间" label="入库时间"
align="center" align="center"
prop="updateTime" prop="inputTime"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column