From 01d3a73c1cfc62728dc272b56f09656e537867b7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 7 Feb 2023 21:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E7=94=9F=E6=88=90=E5=BA=93=E5=AD=98=E5=90=8E?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 13 +++++++++++++ .../com/glxp/api/dao/basic/BasicBusTypePreDao.java | 6 +++--- .../api/entity/inv/InvProductDetailEntity.java | 2 +- .../com/glxp/api/req/system/DeleteRequest.java | 1 + .../basic/impl/BasicBusTypePreServiceImpl.java | 7 ++++--- .../api/service/inout/IoCheckInoutService.java | 11 +++++++++++ .../glxp/api/service/inout/IoGenInvService.java | 2 ++ .../api/service/inout/IoOrderDetailBizService.java | 2 ++ .../service/inout/IoOrderDetailCodeService.java | 2 +- .../service/inout/IoOrderDetailResultService.java | 2 ++ .../com/glxp/api/service/inout/IoOrderService.java | 4 ++++ .../inout/impl/IoOrderDetailBizServiceImpl.java | 5 +++++ .../inout/impl/IoOrderDetailCodeServiceImpl.java | 8 ++------ .../inout/impl/IoOrderDetailResultServiceImpl.java | 5 +++++ .../api/service/inout/impl/IoOrderServiceImpl.java | 10 ++++++++++ src/main/resources/application-dev.yml | 4 ++-- .../mybatis/mapper/basic/BasicBusTypePreDao.xml | 14 +++++++------- 17 files changed, 75 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index dc4d68b39..93d809fa9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -14,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -119,4 +120,16 @@ public class IoOrderController { } + //未校验单据删除 + @AuthRuleAnnotation("") + @PostMapping("udiwms/inout/order/delete") + public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { + orderService.deleteByBillNo(deleteRequest.getBillNo()); + orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo()); + orderDetailCodeService.deleteByOrderId(deleteRequest.getBillNo()); + codeTempService.deleteByBillNo(deleteRequest.getBillNo()); + return ResultVOUtils.success("删除成功!"); + + } + } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index 88eb6ae52..c7be7d40a 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -1,6 +1,6 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; @@ -14,9 +14,9 @@ import java.util.List; * 补单单据类型查询接口 */ @Mapper -public interface BasicBusTypePreDao extends BaseMapper { +public interface BasicBusTypePreDao extends BaseMapperPlus { - List selectList(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + List filterList(FilterBusTypeChangeRequest busTypeChangeFilterRequest); /** * 根据单据类型删除 diff --git a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java index a622a2de2..933a50f19 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java @@ -32,7 +32,7 @@ public class InvProductDetailEntity implements Serializable { * 耗材字典ID */ @TableField(value = "relId") - private String relId; + private Long relId; /** * 最小销售标识 diff --git a/src/main/java/com/glxp/api/req/system/DeleteRequest.java b/src/main/java/com/glxp/api/req/system/DeleteRequest.java index 6952efa37..0076f6a61 100644 --- a/src/main/java/com/glxp/api/req/system/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/system/DeleteRequest.java @@ -9,4 +9,5 @@ public class DeleteRequest { String id; List ids; + String billNo; } 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 395c60135..43c70556a 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; @@ -33,7 +34,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) { PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit()); } - return basicBusTypePreDao.selectList(busTypeChangeFilterRequest); + return basicBusTypePreDao.filterList(busTypeChangeFilterRequest); } @Override @@ -75,8 +76,8 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { } @Override - public BasicBusTypePreEntity findByOriginAction(String orginAction) { - return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", orginAction)); + public BasicBusTypePreEntity findByOriginAction(String originAction) { + return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", originAction)); } /** diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index fdb67a498..6927f7aa5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -131,6 +131,15 @@ public class IoCheckInoutService { }); + //临时表转正式表 + List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); + for (IoCodeTempEntity codeTempEntity : codeTempEntities) { + IoCodeEntity codeEnttity = new IoCodeEntity(); + BeanUtils.copyProperties(codeTempEntity, codeEnttity); + codeService.insert(codeEnttity); + } + codeTempService.deleteByBillNo(orderEntity.getBillNo()); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setUpdateTime(new Date()); orderService.update(orderEntity); @@ -336,6 +345,8 @@ public class IoCheckInoutService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED); } } + } else { + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED); } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_RECEIVEED) { orderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index b3eaa3803..31fcef0cc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -111,6 +111,7 @@ public class IoGenInvService { for (IoCodeEntity codeEntity : codeEnttities) { InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); BeanUtils.copyProperties(codeEntity, invProductDetailEntity); + invProductDetailEntity.setRelId(codeEntity.getRelId()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); invProductDetailEntities.add(invProductDetailEntity); @@ -221,6 +222,7 @@ public class IoGenInvService { temps = filterSupMaps.get(corpName); IoOrderEntity outOrder = new IoOrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); + outOrder.setId(null); outOrder.setSupplementNo(null);//补单需置空 outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); outOrder.setAction(targetBustypeEntity.getAction()); 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 55dafc587..e2fbf233b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -16,6 +16,8 @@ public interface IoOrderDetailBizService { int deleteById(Integer id); + int deleteByOrderId(String billNo); + boolean isExit(Long relId, String bacthNo, Integer ignoreId); List filterList(FilterOrderDetailBizRequest orderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 1bfd17f86..ff690d8f2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -32,7 +32,7 @@ public interface IoOrderDetailCodeService { * @param orderId * @return */ - BaseResponse deleteByOrderId(String orderId); + int deleteByOrderId(String orderId); public List checkOrderList(String orderId); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index 2d2da9b2e..6daf55720 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -12,6 +12,8 @@ public interface IoOrderDetailResultService { int insert(IoOrderDetailResultEntity orderDetailResultEntity); + int deleteByOrderId(String billNo); + int update(IoOrderDetailResultEntity orderDetailResultEntity); List filterList(FilterOrderDetailResultRequest orderDetailResultRequest); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index ce212bb91..837cc6483 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -23,6 +23,10 @@ public interface IoOrderService { int updateByBillNo(IoOrderEntity orderEntity); + int deleteById(Integer id); + + int deleteByBillNo(String billNo); + /** * 查询单据列表 * 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 5129e2438..e4c96c988 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 @@ -42,6 +42,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.deleteById(id); } + @Override + public int deleteByOrderId(String billNo) { + return ioOrderDetailBizDao.delete(new QueryWrapper().eq("orderIdFk", billNo)); + } + @Override public boolean isExit(Long relId, String bacthNo, Integer ignoreId) { diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index d6517f3e3..adb688882 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -58,12 +58,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { } @Override - public BaseResponse deleteByOrderId(String orderId) { - if (StrUtil.isBlank(orderId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空!"); - } - ioOrderDetailCodeDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); - return ResultVOUtils.success("删除成功"); + public int deleteByOrderId(String orderId) { + return ioOrderDetailCodeDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 91d5d4b02..62f3f4933 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -29,6 +29,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic return orderDetailResultDao.insert(orderDetailResultEntity); } + @Override + public int deleteByOrderId(String billNo) { + return orderDetailResultDao.delete(new QueryWrapper().eq("orderIdFk", billNo)); + } + @Override public int update(IoOrderDetailResultEntity orderDetailResultEntity) { return orderDetailResultDao.updateById(orderDetailResultEntity); 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 d230b5102..d600c9987 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 @@ -60,6 +60,16 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.update(orderEntity, new QueryWrapper().eq("billNo", orderEntity.getBillNo())); } + @Override + public int deleteById(Integer id) { + return orderDao.deleteById(id); + } + + @Override + public int deleteByBillNo(String billNo) { + return orderDao.delete(new QueryWrapper().eq("billNo", billNo)); + } + @Override public List filterList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 97fee7870..c7e9cd220 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index 6eb0c25b0..d4e221e3e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -1,11 +1,11 @@ - select * from basic_bustype_pre - + AND originAction like concat('%', #{originAction}, '%') @@ -18,12 +18,12 @@