From 192faa5e789051377828d47bef56c16e444a6b3b Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 10 Aug 2022 20:32:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=202.=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8=E5=8F=B7=E7=AD=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/OrderDetailController.java | 2 ++ .../inout/StockOrderDetailController.java | 2 +- .../sale/admin/entity/info/CompanyEntity.java | 5 +++++ .../inout/StockOrderDetailService.java | 7 +++++++ .../impl/StockOrderDetailServiceImpl.java | 19 +++++++++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 3b857ad..9e4ece3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -360,6 +360,8 @@ public class OrderDetailController { filterErpOrderRequest.setLimit(null); List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); + + OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId()); if (orderEntity == null) { return ResultVOUtils.error(500, "单据不存在！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index 2668851..d40e33d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -628,7 +628,7 @@ public class StockOrderDetailController { @PostMapping("/udiwms/stock/order/detail/update") public BaseResponse updateStockOrderDetail(@RequestBody StockOrderDetailEntity stockOrderDetailEntity) { if (null != stockOrderDetailEntity) - stockOrderDetailService.updateById(stockOrderDetailEntity); + stockOrderDetailService.updateOrderDetailInfo(stockOrderDetailEntity); return ResultVOUtils.success("更新成功"); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java index fd312ff..6f90a44 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.entity.info; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -36,9 +37,13 @@ public class CompanyEntity { private String registerStatus; private String jyxkzh; private String jyxkzfzjg; + + @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd") private Date jyxkzyxq; private String jybapzh; private String jybabm; + + @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd") private Date fzrq; private String suihao; private String kaihuhang; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java index e129f27..19c502d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java @@ -35,4 +35,11 @@ public interface StockOrderDetailService { * @return */ boolean verifyCount(List subErpOrders); + + /** + * 更新业务单据详情信息 + * + * @param stockOrderDetailEntity + */ + void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java index 7550b63..4efdeee 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java @@ -108,4 +108,23 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { return true; } + @Override + public void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity) { + if (null != stockOrderDetailEntity) { + if (StrUtil.isBlank(stockOrderDetailEntity.getInvoiceDate())) { + stockOrderDetailEntity.setInvoiceDate(""); + } + if (StrUtil.isBlank(stockOrderDetailEntity.getFirstSalesInvNo())) { + stockOrderDetailEntity.setFirstSalesInvNo(""); + } + if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesInvNo())) { + stockOrderDetailEntity.setSecSalesInvNo(""); + } + if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesListNo())) { + stockOrderDetailEntity.setSecSalesListNo(""); + } + stockOrderDetailDao.updateById(stockOrderDetailEntity); + } + } + }