1.修复时间转换失败问题

2.调整业务单据详情更新发票号等字段逻辑

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -360,6 +360,8 @@ public class OrderDetailController {
         filterErpOrderRequest.setLimit(null);
         List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
 
+
+
         OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
         if (orderEntity == null) {
             return ResultVOUtils.error(500, "单据不存在！");

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("更新成功");
     }
 }

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;

api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java

@@ -35,4 +35,11 @@ public interface StockOrderDetailService {
      * @return
      */
     boolean verifyCount(List<StockOrderDetailEntity> subErpOrders);
+
+    /**
+     * 更新业务单据详情信息
+     *
+     * @param stockOrderDetailEntity
+     */
+    void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity);
 }

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