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

修复盘点编码入库后显示多个订单的问题

This commit is contained in:
sxu 2024-08-29 18:20:05 +08:00
parent 56c841fc01
commit 6a8aca42f2
2 changed files with 4 additions and 4 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/service/impl/InventoryAndWarehousingServiceImpl.java
View File

@ -186,6 +186,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
machIneDto.setCreator(dto.getCreator()); machIneDto.setCreator(dto.getCreator());
machIneDto.setNum(dto.getNum()); machIneDto.setNum(dto.getNum());
machIneDto.setIsCode(dto.getIsCode()); machIneDto.setIsCode(dto.getIsCode());
machIneDto.setTypeId(dto.getTypeId());
machIneDto.setUnitId(dto.getUnitId()); machIneDto.setUnitId(dto.getUnitId());
machIneDto.setProId(dto.getProId()); machIneDto.setProId(dto.getProId());
machIneDto.setRemarks(dto.getRemarks()); machIneDto.setRemarks(dto.getRemarks());

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
View File

@ -77,6 +77,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
<if test="typeId != null and typeId != ''">TYPE,</if>
<if test="creator != null and creator != ''">CREATOR,</if> <if test="creator != null and creator != ''">CREATOR,</if>
<if test="unitId != null and unitId != ''">UNIT_ID,</if> <if test="unitId != null and unitId != ''">UNIT_ID,</if>
<if test="proId != null and proId != ''">PROJECT_ID,</if> <if test="proId != null and proId != ''">PROJECT_ID,</if>
@ -97,6 +98,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
<if test="typeId != null and typeId != ''">#{typeId},</if>
<if test="creator != null and creator != ''">#{creator},</if> <if test="creator != null and creator != ''">#{creator},</if>
<if test="unitId != null and unitId != ''">#{unitId},</if> <if test="unitId != null and unitId != ''">#{unitId},</if>
<if test="proId != null and proId != ''">#{proId},</if> <if test="proId != null and proId != ''">#{proId},</if>
@ -199,8 +201,6 @@
su.user_name AS modelName, su.user_name AS modelName,
pisi.CREATE_DATE AS createDate, pisi.CREATE_DATE AS createDate,
pisi.REMARKS AS remark, pisi.REMARKS AS remark,
-- move to mysql5, don't support "PARTITION"
-- ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num
( (
SELECT COUNT(*) SELECT COUNT(*)
FROM ma_type_put_in_storage_info pisi2 FROM ma_type_put_in_storage_info pisi2
@ -208,10 +208,9 @@
) AS row_num ) AS row_num
FROM FROM
ma_type_put_in_storage_info pisi ma_type_put_in_storage_info pisi
LEFT JOIN ma_type_put_in_storage_details pisd ON pisi.id = pisd.INFO
LEFT JOIN bm_project_lot lot ON lot.lot_id = pisi.PROJECT_ID LEFT JOIN bm_project_lot lot ON lot.lot_id = pisi.PROJECT_ID
LEFT JOIN bm_unit_info bui ON bui.unit_id = pisi.UNIT_ID LEFT JOIN bm_unit_info bui ON bui.unit_id = pisi.UNIT_ID
LEFT JOIN ma_type mt ON mt.type_id = pisd.TYPE LEFT JOIN ma_type mt ON mt.type_id = pisi.TYPE
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN sys_user su ON su.user_id = pisi.CREATOR LEFT JOIN sys_user su ON su.user_id = pisi.CREATOR
WHERE WHERE