diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index 80cb3ca11..ada9650c7 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -125,7 +125,7 @@ public class IoFifoDesOrderController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (addInvDesDetaiRequest.getOutCount() == null && addInvDesDetaiRequest.getRemark() == null){ + if (addInvDesDetaiRequest.getOutCount() == null && addInvDesDetaiRequest.getRemark() == null) { return ResultVOUtils.error("请输入损耗数量"); } Boolean save = splitDesOrderService.destroyOut(addInvDesDetaiRequest); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 7aeec1341..dc2c8c00d 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -280,6 +280,9 @@ public class IoOrderResponse { */ private String splitBusType; + + private String splitBusTypeName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 393827da4..45057369e 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -3,48 +3,49 @@ select io.*, - (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, - (select name from auth_dept ad where ad.code = io.deptCode) deptName, - (select name from auth_warehouse aw where aw.code = io.invCode) invName, - (select employeeName from auth_user au where au.id = io.createUser) createUserName, - (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, - (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, - (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, - (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, - (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, - (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, - (select name from basic_corp bc where bc.erpId = io.customerId) customerName, - (SELECT count(*) - FROM io_order_detail_code - WHERE io_order_detail_code.orderIdFk = io.billNo - and io_order_detail_code.regStatus = 1 - ) AS allCout, - (SELECT count(*) - FROM io_order_detail_code - WHERE io_order_detail_code.orderIdFk = io.billNo - and io_order_detail_code.regStatus = 0 - ) As partCount + (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, + (select name from auth_dept ad where ad.code = io.deptCode) deptName, + (select name from auth_warehouse aw where aw.code = io.invCode) invName, + (select employeeName from auth_user au where au.id = io.createUser) createUserName, + (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, + (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, + (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, + (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, + (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, + (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, + (select name from basic_corp bc where bc.erpId = io.customerId) customerName, + (SELECT count(*) + FROM io_order_detail_code + WHERE io_order_detail_code.orderIdFk = io.billNo + and io_order_detail_code.regStatus = 1 + ) AS allCout, + (SELECT count(*) + FROM io_order_detail_code + WHERE io_order_detail_code.orderIdFk = io.billNo + and io_order_detail_code.regStatus = 0 + ) As partCount from io_order as io @@ -280,7 +281,7 @@ AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like - concat('%', #{corpName}, '%') + concat('%', #{corpName}, '%') AND action = #{action} @@ -314,11 +315,11 @@ AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and - date_format(#{endTime}, '%Y-%m-%d') + date_format(#{endTime}, '%Y-%m-%d') AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and - date_format(#{endAduditTime}, '%Y-%m-%d') + date_format(#{endAduditTime}, '%Y-%m-%d') AND `action` in @@ -370,12 +371,12 @@ and ( - `action` in + `action` in #{item} and (status = 7 or status = 10) - ) + ) @@ -384,13 +385,13 @@ #{item} and status = 10) - or ( - `action` in + or ( + `action` in #{item} and (status = 7 or status = 10)) - ) + ) @@ -443,14 +444,14 @@ AND (io.remark like concat('%', #{unionRemark}, '%') - or io.outSickInfo like concat('%', #{unionRemark}, '%')) + or io.outSickInfo like concat('%', #{unionRemark}, '%')) AND busType = #{busType} AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and - date_format(#{endTime}, '%Y-%m-%d') + date_format(#{endTime}, '%Y-%m-%d') select io.*, - ioul.result, - (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, - (select name from auth_dept ad where ad.code = io.deptCode) deptName, - (select name from auth_warehouse aw where aw.code = io.invCode) invName, - (select employeeName from auth_user au where au.id = io.createUser) createUserName, - (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, - (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, - (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, - (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, - (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, - (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, - (select name from basic_corp bc where bc.erpId = io.customerId) customerName + ioul.result, + (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, + (select name from auth_dept ad where ad.code = io.deptCode) deptName, + (select name from auth_warehouse aw where aw.code = io.invCode) invName, + (select employeeName from auth_user au where au.id = io.createUser) createUserName, + (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, + (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, + (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, + (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, + (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, + (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, + (select name from basic_corp bc where bc.erpId = io.customerId) customerName from io_order as io - left join io_order_upload_log ioul on io.billNo = ioul.billNo + left join io_order_upload_log ioul on io.billNo = ioul.billNo io.dealStatus = 3 @@ -514,7 +515,7 @@ AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and - date_format(#{endTime}, '%Y-%m-%d') + date_format(#{endTime}, '%Y-%m-%d') AND date_format(createTime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') @@ -541,10 +542,10 @@ SELECT billNo FROM io_order - LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action + LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action WHERE basic_bussiness_type.inStock = 1 and io_order.`status` = 7 AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data}, '%Y-%m-%d') @@ -579,12 +580,13 @@ SELECT io.*, - bus.NAME AS billTypeName, - ad.NAME AS deptName, - aw.NAME AS invName, - bc.NAME AS fromCorpName + bus.NAME AS billTypeName, + ad.NAME AS deptName, + aw.NAME AS invName, + bc.NAME AS fromCorpName FROM io_order io - LEFT JOIN basic_bussiness_type bus ON io.action = bus.action - LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE - LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE - LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId - left join io_order_invoice on io_order_invoice.orderIdFk = io.billNo + LEFT JOIN basic_bussiness_type bus ON io.action = bus.action + LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE + LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE + LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId + left join io_order_invoice on io_order_invoice.orderIdFk = io.billNo AND io.checkStatus = #{confirmStatus} @@ -614,7 +616,7 @@ AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like - concat('%', #{corpName}, '%') + concat('%', #{corpName}, '%') AND io.action = #{action} @@ -624,7 +626,7 @@ AND (io.remark like concat('%', #{unionRemark}, '%') - or io.outSickInfo like concat('%', #{unionRemark}, '%')) + or io.outSickInfo like concat('%', #{unionRemark}, '%')) AND io.billNo like concat('%', #{billNo}, '%') @@ -658,10 +660,12 @@ AND io.relKey like concat('%', #{relKey}, '%') - AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') + AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and + date_format(#{endTime}, '%Y-%m-%d') - AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') + AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and + date_format(#{endAduditTime}, '%Y-%m-%d') AND io.`action` in @@ -713,12 +717,12 @@ and ( - io.`action` in + io.`action` in #{item} and io.status = 7 - ) + ) @@ -727,13 +731,13 @@ #{item} and io.status = 10) - or ( - io.`action` in + or ( + io.`action` in #{item} and io.status = 7) - ) + )