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); + } + } + }