From 76994ae9f54fb442d1438cac31b40116b2b20d56 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 14:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=EF=BC=8C=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=8D=95=E7=AD=89=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/IoPurChangeService.java | 6 +-- .../api/dao/basic/BasicBusTypeChangeDao.java | 3 +- .../glxp/api/dao/inout/ReceiveDetailDao.java | 4 +- .../res/basic/BasicBusTypeChangeResponse.java | 3 ++ .../basic/IBasicBusTypeChangeService.java | 1 - .../basic/IBasicBusTypePreService.java | 3 ++ .../impl/BasicBusTypeChangeServiceImpl.java | 1 - .../impl/BasicBusTypePreServiceImpl.java | 5 ++ .../api/service/inout/ReceiveService.java | 4 ++ .../service/inout/ReceivedetailService.java | 3 +- .../inout/impl/ReceiveDetailServiceImpl.java | 6 ++- .../inout/impl/ReceiveServiceImpl.java | 9 ++-- .../mapper/basic/BasicBusTypeChangeDao.xml | 9 ++-- .../mybatis/mapper/inout/ReceiveDetailDao.xml | 54 ++++++++++++++----- 14 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 0c5a048d8..7317cd49c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -275,7 +275,7 @@ public class IoPurChangeService { billNo += ioOrderEntity.getBillNo() + ","; //插入业务单表 for (PurReceiveDetailEntity obj : m.getValue()) { - BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); + BasicProductsEntity basicProductsEntity = receivedetailService.selectIoOrderDetailBiz(obj.getId()); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setBindRlFk(obj.getRelIdFk()); @@ -436,10 +436,10 @@ public class IoPurChangeService { ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); ioOrderEntity.setFromCorp(m.getKey()); ioOrderEntity.setFromType(ConstantStatus.FROM_Order); - if(basicBusTypeChangeEntity.getAuditStatus()==1){ + if (basicBusTypeChangeEntity.getAuditStatus() == 1) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - }else if(basicBusTypeChangeEntity.getAuditStatus()==2){ + } else if (basicBusTypeChangeEntity.getAuditStatus() == 2) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 652a0b2bd..088aefdfd 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -21,4 +21,5 @@ public interface BasicBusTypeChangeDao extends BaseMapper filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); -} \ No newline at end of file + +} diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index c0258375d..ffaf2e573 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -1,12 +1,14 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,5 +19,5 @@ public interface ReceiveDetailDao extends BaseMapperPlus findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index a37faad5a..7812a8b36 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..1fb71d32e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/inout/ReceiveService.java b/src/main/java/com/glxp/api/service/inout/ReceiveService.java index f0592f6d0..bd7aed7cb 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceiveService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceiveService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.res.inout.ReceiveResponse; @@ -21,4 +22,7 @@ public interface ReceiveService { boolean delReceive(String orderIdFk); + + + } diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java index 15e4c8422..b097e0b36 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -22,5 +23,5 @@ public interface ReceivedetailService { boolean delDetail(String id); - + BasicProductsEntity selectIoOrderDetailBiz(long id); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 2562bd1b0..8e046072b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; @@ -55,5 +56,8 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService { return true; } - + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return receiveDetailDao.selectIoOrderDetailBiz(id); + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index f9e071747..866506bab 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDao; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -38,9 +39,9 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public int updateOrder(PurReceiveEntity purReceiveEntity) { - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("billNo",purReceiveEntity.getBillNo()); - return receiveDao.update(purReceiveEntity,ew); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("billNo", purReceiveEntity.getBillNo()); + return receiveDao.update(purReceiveEntity, ew); } @Override @@ -67,4 +68,6 @@ public class ReceiveServiceImpl implements ReceiveService { } + + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index 4f5748d84..9560b4eac 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -2,10 +2,11 @@ UPDATE pur_receive_detail - orderIdFk=#{orderIdFk}, - relIdFk=#{relIdFk}, - nameCode=#{nameCode}, - count=#{count}, - supId=#{supId}, - productDate=#{productDate}, - batchNo=#{batchNo}, - expireDate=#{expireDate}, + + orderIdFk=#{orderIdFk}, + + + relIdFk=#{relIdFk}, + + + nameCode=#{nameCode}, + + + count=#{count}, + + + supId=#{supId}, + + + productDate=#{productDate}, + + + batchNo=#{batchNo}, + + + expireDate=#{expireDate}, + WHERE id = #{id} + +