From fdb0a735b4329928e42cadf3db0e94ad8defc369 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 7 Apr 2023 12:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0=E6=8F=92?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 1 + .../entity/inout/IoOrderInvoiceEntity.java | 6 ++++- .../inout/FilterOrderDetailBizRequest.java | 2 ++ .../api/req/inout/IoOrderInvoiceRequest.java | 2 ++ .../service/inout/IoChangeInoutService.java | 5 +++++ .../service/inout/IoCheckInoutService.java | 1 - .../service/inout/IoOrderInvoiceService.java | 3 +++ .../inout/impl/IoOrderInvoiceServiceImpl.java | 8 +++---- .../mapper/inout/IoOrderDetailBizDao.xml | 22 +++++++++---------- src/main/resources/schemas/schema_v2.1.sql | 3 +++ 10 files changed, 36 insertions(+), 17 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 5bc7d4ba..5211914f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -558,6 +558,7 @@ public class IoOrderDetailBizController extends BaseController { ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate()); ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate()); + ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId()); boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); return ResultVOUtils.success("成功"); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index cf9d2d70..b739baaa 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import lombok.Data; @Data @@ -98,10 +100,12 @@ public class IoOrderInvoiceEntity { private String licenseUrl; - @TableField(value = "remark") private String remark; + @TableField(value = "bizIdFk") + private Integer bizIdFk; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java index a1652c69..ca65a742 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -28,4 +28,6 @@ public class FilterOrderDetailBizRequest extends ListPageRequest { * 产品名称 */ private String productName; + + private Long bizIdFk; } diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java index c344457c..438f4d84 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -67,6 +67,8 @@ public class IoOrderInvoiceRequest { private String remark; + private Long bizIdFk; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 9c29f806..9f2aec18 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -12,6 +12,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.service.auth.InvWarehouseService; @@ -58,11 +59,15 @@ public class IoChangeInoutService { SystemParamConfigService systemParamConfigService; @Resource IoCodeTempService codeTempService; + @Resource + IoOrderInvoiceService ioOrderInvoiceService; public void changeOrder(IoOrderEntity orderEntity) { BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction()); List codeEnttities = codeService.findByOrderId(orderEntity.getBillNo()); +// List invoiceEntities =ioOrderInvoiceService.deleteByInvId() + if (basicBusTypePreEntity != null) { buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity); } else { 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 25c4989d..90a8275d 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -806,7 +806,6 @@ public class IoCheckInoutService { } } - //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { // if (bussinessTypeEntity.getBusType() == ConstantStatus.BUS_TYPE_NORMAL) { diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java index 8cc0354d..ed27263f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java @@ -5,6 +5,9 @@ import com.glxp.api.req.inout.IoOrderInvoiceRequest; public interface IoOrderInvoiceService { + + + boolean deleteByInvId(Integer id); boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java index 38792258..ce3b273e 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java @@ -19,18 +19,18 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService { @Override public boolean deleteByInvId(Integer id) { - return this.ioOrderInvoiceMapper.deleteById(id)>0; + return this.ioOrderInvoiceMapper.deleteById(id) > 0; } @Override public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); - BeanUtils.copyProperties(ioOrderInvoiceRequest,ioOrderInvoiceEntity); - return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity)>0; + BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); + return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0; } @Override public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) { - return ioOrderInvoiceMapper.insertInvoice(ioOrderInvoiceEntity); + return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0; } } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 28543ba8..8d91788f 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -4,8 +4,8 @@ diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index fb881b96..98f78ac4 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -18,6 +18,9 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1); + + CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);