From 624aee5f1e33a6ee18fd3087efffbbb9658afeec Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 8 May 2023 11:52:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?id=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml | 4 ++-- .../mybatis/mapper/auth/WarehouseBussinessTypeDao.xml | 4 ++-- src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml | 4 ++-- src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml | 4 ++-- .../resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml | 4 ++-- .../resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml | 4 ++-- .../resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml | 4 ++-- .../resources/mybatis/mapper/purchase/PurOrderDetailDao.xml | 4 ++-- .../mybatis/mapper/system/SyncDataChangeBustypesDao.xml | 4 ++-- .../mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml | 4 ++-- .../mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml | 4 ++-- .../mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml | 4 ++-- .../mapper/system/SysPdfTemplateRelevanceStatemenDao.xml | 4 ++-- .../resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index f24fb02ca..53315fb10 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -1,8 +1,8 @@ - - + + diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 3a4d4353a..435c50f01 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 974b79d21..38f7fa303 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml index 4f0eeaae4..792362b95 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml index 22978a3cc..f444a5a1d 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml index 50df66121..5768bfb6c 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml index 9f61176a0..df4023b88 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index 23c78b865..7eb489ccf 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml index 5d2c2fad8..224ee28e4 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml index 9f9aad60f..7ebac55cd 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index 0c2aeeece..cbbc56c5d 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml index 8bf98fde5..945f318ac 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml index b07bedfe8..603d0b5b5 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml @@ -1,10 +1,10 @@ - + - + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml index e4410f917..c8e86fbb9 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + From 4507e410431cef98da1ba2ec92428eff6297b1f3 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 8 May 2023 14:08:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index d1823f30b..db19017ea 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -154,7 +154,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public List findByStatus(String action, Integer status, Date lastUpdateTime) { - return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime)); + return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime)); } From 0c348c43ac0b4666d33c55d6aa7caaaff82e88b6 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 8 May 2023 14:10:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index 9030aadc1..4d29462f5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -56,7 +56,7 @@ public class PurOrderServiceImpl implements PurOrderService { @Override public List findByStatus(String billType, Integer status, Date lastUpdateTime) { - return purOrderDao.selectList(new QueryWrapper().eq("billType", billType).eq("status", status).gt("updateTime", lastUpdateTime)); + return purOrderDao.selectList(new QueryWrapper().eq("billType", billType).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime)); } @Override From 972ed90e403a17efca70340d99be0758af0f2660 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 14:22:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderDetailBizController.java | 9 +++++---- .../java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java | 2 ++ .../glxp/api/entity/inout/IoOrderDetailCodeEntity.java | 4 ++-- .../com/glxp/api/res/inout/IoOrderInvoiceResponse.java | 2 ++ .../glxp/api/service/inout/IoOrderDetailBizService.java | 1 + .../service/inout/impl/IoOrderDetailBizServiceImpl.java | 5 +++++ .../mybatis/mapper/inout/IoOrderDetailBizDao.xml | 5 +++++ 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 2b3d3a476..30baa857d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -555,7 +555,8 @@ public class IoOrderDetailBizController extends BaseController { @Log(title = "发票管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) { - ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+""); + IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId()); + //更改 登记状态 IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity(); @@ -565,16 +566,16 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); - ioOrderDetailBizEntity.setId(ioOrderInvoiceEntity.getRegId()); + ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().intValue()); + ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+""); List list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); - if (list == null && list.size() == 0) { + if(list.size()==0){ ioOrderDetailBizEntity.setRegStatus(false); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); return ResultVOUtils.success(); - } /** diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index 2d5cceb18..311bbd21e 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -24,6 +24,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + IoOrderInvoiceResponse selectByinvoiceId(Long id); + /** * 查询单条单据业务详情 diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index 36bb9008f..2f7635e15 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java @@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity { * 单据数量 */ @TableField(value = "`count`") - private int count; + private Integer count; /** * 扫码数量 */ @TableField(value = "reCount") - private int reCount; + private Integer reCount; /** * 备注 diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java index a23af6ad8..63a44894d 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java @@ -83,6 +83,8 @@ public class IoOrderInvoiceResponse { private String ggxh; private String licenseUrl; + private Long bizIdFk; + public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 24892f3c8..4e19d277f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -44,6 +44,7 @@ public interface IoOrderDetailBizService { List checkOrderList(String orderId); List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index f3f285c4b..841a00aaa 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -175,6 +175,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest); } + @Override + public IoOrderInvoiceResponse selectByinvoiceId(Long id) { + return ioOrderDetailBizDao.selectByinvoiceId(id); + } + @Override public Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity) { return ioOrderDetailBizDao.updateById(ioOrderDetailBizEntity) > 0; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 8326b5d0a..8a1953ae5 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -23,6 +23,11 @@ group by io_order_detail_biz.id + + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 26cb25018..204d8ba14 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -73,7 +73,7 @@ thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkExpire, checkCertExpire, preInBackAction, backPreinType, - sortNum) + sortNum, spaceOut) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -86,7 +86,7 @@ #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, - #{sortNum}) + #{sortNum}, #{spaceOut})