UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2.5_optimize_250306' into dev_2.5_optimize_250306

Browse Source
dev_2.5_ocean
wangwei 8 months ago
parent 1717f746ea b39017029e
commit 755c21e1b1
4 changed files with 120 additions and 79 deletions
Show Stats Download Patch File Download Diff File

28
src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDao.xml
Unescape Escape View File

@ -14,17 +14,25 @@
dro.fromInvSpaceCode, dro.fromInvSpaceCode,
dro.receiveUser, dro.receiveUser,
dro.type, dro.type,
au.employeeName as receiveUserName, au.employeeName AS receiveUserName,
aur.employeeName as auditUserName, aur.employeeName AS auditUserName,
( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName, ad_from.name AS fromDeptName,
( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode, dro.fromDeptCode, -- 直接使用device_receive_order表中的字段
( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName, aw_from.name AS fromInvName,
( SELECT `code` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvCode, dro.fromInvCode, -- 直接使用device_receive_order表中的字段
( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName as_from.name AS fromInvSpaceName
FROM FROM
device_receive_order dro device_receive_order AS dro
left join auth_user au on au.id = dro.receiveUser LEFT JOIN
left join auth_user aur on aur.id = dro.auditUser auth_user AS au ON au.id = dro.receiveUser
LEFT JOIN
auth_user AS aur ON aur.id = dro.auditUser
LEFT JOIN
auth_dept AS ad_from ON dro.fromDeptCode = ad_from.code
LEFT JOIN
auth_warehouse AS aw_from ON dro.fromInvCode = aw_from.code
LEFT JOIN
auth_space AS as_from ON dro.fromInvSpaceCode = as_from.code
<where> <where>
<if test="status != null"> <if test="status != null">
AND status = #{status} AND status = #{status}

45
src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml
Unescape Escape View File

@ -28,7 +28,7 @@
</delete> </delete>
<select id="filterList" resultType="com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse"> <select id="filterList" resultType="com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse">
select drod.id, SELECT drod.id,
drod.orderIdFk, drod.orderIdFk,
drod.originCode, drod.originCode,
drod.code, drod.code,
@ -41,31 +41,46 @@
drod.createTime, drod.createTime,
drod.updateTime, drod.updateTime,
drod.supId, drod.supId,
(select `name` from basic_corp where erpId = drod.supId) supName, bc.name AS supName,
dro.fromDeptCode, dro.fromDeptCode,
dro.fromInvCode, dro.fromInvCode,
dro.fromInvSpaceCode, dro.fromInvSpaceCode,
dro.deptCode, dro.deptCode,
dro.invCode, dro.invCode,
dro.invSpaceCode, dro.invSpaceCode,
bp.cpmctymc productName, bp.cpmctymc AS productName,
bp.zczbhhzbapzbh, bp.zczbhhzbapzbh,
bp.ylqxzcrbarmc, bp.ylqxzcrbarmc,
bp.manufactory, bp.manufactory,
bp.measname, bp.measname,
bp.ggxh, bp.ggxh,
(select name from auth_dept where code = dro.fromDeptCode) fromDeptName, ad_from.name AS fromDeptName,
(select name from auth_warehouse where code = dro.fromInvCode) fromInvName, aw_from.name AS fromInvName,
(select name from auth_space where code = dro.fromInvSpaceCode) fromInvSpaceName, as_from.name AS fromInvSpaceName,
(select name from auth_space where code = dro.deptCode) deptName, ad_to.name AS deptName,
(select name from auth_space where code = dro.invCode) invName, aw_to.name AS invName,
(select name from auth_space where code = dro.invSpaceCode) invSpaceName as_to.name AS invSpaceName
from device_receive_order_detail drod FROM device_receive_order_detail drod
left join device_receive_order dro on dro.orderId = drod.orderIdFk LEFT JOIN
left join basic_udirel bu on bu.id = drod.relId device_receive_order dro ON dro.orderId = drod.orderIdFk
left join basic_products bp on bu.uuid = bp.uuid LEFT JOIN
left join auth_warehouse aw on aw.code = dro.fromInvCode basic_udirel bu ON bu.id = drod.relId
left join auth_space space on space.code = dro.invSpaceCode LEFT JOIN
basic_products bp ON bu.uuid = bp.uuid
LEFT JOIN
basic_corp bc ON bc.erpId = drod.supId
LEFT JOIN
auth_dept ad_from ON ad_from.code = dro.fromDeptCode
LEFT JOIN
auth_warehouse aw_from ON aw_from.code = dro.fromInvCode
LEFT JOIN
auth_space as_from ON as_from.code = dro.fromInvSpaceCode
LEFT JOIN
auth_space ad_to ON ad_to.code = dro.deptCode
LEFT JOIN
auth_warehouse aw_to ON aw_to.code = dro.invCode
LEFT JOIN
auth_space as_to ON as_to.code = dro.invSpaceCode
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}

31
src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDao.xml
Unescape Escape View File

@ -8,7 +8,7 @@
</select> </select>
<select id="filterList" resultType="com.glxp.api.res.dev.DeviceRepairOrderResponse"> <select id="filterList" resultType="com.glxp.api.res.dev.DeviceRepairOrderResponse">
select t.id, SELECT t.id,
t.orderId, t.orderId,
t.deptCode, t.deptCode,
t.invCode, t.invCode,
@ -30,17 +30,30 @@
t.repariImage, t.repariImage,
t.repariRemark, t.repariRemark,
t.inspectUser, t.inspectUser,
(select employeeName from auth_user where id = t.createUser) createUserName, cu.employeeName AS createUserName,
(select employeeName from auth_user where id = t.auditUser) auditUserName, au.employeeName AS auditUserName,
(select employeeName from auth_user where id = t.inspectUser) inspectUserName, iu.employeeName AS inspectUserName,
(select `name` from auth_dept where code = t.deptCode) deptName, ad.`name` AS deptName,
(select `name` from auth_warehouse where code = t.invCode) invName, aw.`name` AS invName,
(select employeeName from auth_user where id = t.repariName) repName, ru.employeeName AS repName,
t1.deviceName, t1.deviceName,
t1.ggxh, t1.ggxh,
t1.batchNo t1.batchNo
from device_repair_order t FROM device_repair_order t
left join dept_device_detail t1 on t.code = t1.code LEFT JOIN
dept_device_detail t1 ON t.code = t1.code
LEFT JOIN
auth_user cu ON cu.id = t.createUser
LEFT JOIN
auth_user au ON au.id = t.auditUser
LEFT JOIN
auth_user iu ON iu.id = t.inspectUser
LEFT JOIN
auth_dept ad ON ad.code = t.deptCode
LEFT JOIN
auth_warehouse aw ON aw.code = t.invCode
LEFT JOIN
auth_user ru ON ru.id = t.repariName
<where> <where>
<if test="orderId != null and orderId != ''"> <if test="orderId != null and orderId != ''">
AND t.orderId like concat('%', #{orderId}, '%') AND t.orderId like concat('%', #{orderId}, '%')

23
src/main/resources/mybatis/mapper/dev/InvMAOrderDao.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.dev.InvMAOrderDao"> <mapper namespace="com.glxp.api.dao.dev.InvMAOrderDao">
<select id="filterList" resultType="com.glxp.api.res.dev.InvMAOrderResponse"> <select id="filterList" resultType="com.glxp.api.res.dev.InvMAOrderResponse">
select ma.id, SELECT ma.id,
ma.orderId, ma.orderId,
ma.invCode, ma.invCode,
ma.invSpaceCode, ma.invSpaceCode,
@ -12,15 +12,20 @@
ma.auditTime, ma.auditTime,
ma.createUser, ma.createUser,
ma.auditUser, ma.auditUser,
(select employeeName from auth_user where id = ma.createUser) createUserName, cu.employeeName AS createUserName,
(select employeeName from auth_user where id = ma.auditUser) auditUserName, au.employeeName AS auditUserName,
ma.remark, ma.remark,
auth_warehouse.name invName, aw.name AS invName,
auth_space.name invSpaceName aspace.name AS invSpaceName
from inv_ma_order ma FROM inv_ma_order ma
left join auth_warehouse on ma.invCode = auth_warehouse.code LEFT JOIN
left join auth_space auth_user cu ON cu.id = ma.createUser
on ma.invSpaceCode = auth_space.code and auth_warehouse.code = auth_space.invWarehouseCode LEFT JOIN
auth_user au ON au.id = ma.auditUser
LEFT JOIN
auth_warehouse aw ON ma.invCode = aw.code
LEFT JOIN
auth_space aspace ON ma.invSpaceCode = aspace.code AND aw.code = aspace.invWarehouseCode
<where> <where>
<if test="id != null"> <if test="id != null">
AND ma.id = #{id} AND ma.id = #{id}

Write Preview
Loading…
Cancel
Save