From 3e2117254636c030dd8e96a404e8e97f04aa211d Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 13 Jan 2025 08:49:49 +0800
Subject: [PATCH] 01/13

---
 .../supplierinfo/SupplierInfoService.java     |  7 ++++-
 .../warehouseoutbill/WarehouseOutBillVo.java  | 27 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java
index a60c87e..7ac1d4f 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java
@@ -26,6 +26,7 @@
 package com.yxt.wms.biz.func.supplierinfo;
 
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -38,6 +39,7 @@ import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -85,7 +87,10 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 	}
 	public ResultBean<SupplierInfoDetailsVo> fetchDetailsByBillSid(String sid){
 		WarehouseAnsDetailsVo warehouseAnsDetailsVo=warehouseAnsBillFeign.details(sid).getData();
-		return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid());
+		if(StringUtils.isNotBlank(warehouseAnsDetailsVo.getSupplierSid())){
+			return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid());
+		}
+		return new ResultBean<SupplierInfoDetailsVo>().success().setData(new SupplierInfoDetailsVo());
 	}
 
 	public void delAll(String[] sids) {
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java
index e9aa828..03d1629 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java
@@ -4,12 +4,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 
 /**
  * @description:
  * @author: dimengzhe
- * @date: 2024/4/24
+ * @String: 2024/4/24
  **/
 @Data
 public class WarehouseOutBillVo {
@@ -68,9 +67,9 @@ public class WarehouseOutBillVo {
     private double weightEstimation;
     @ApiModelProperty("商品数量")
     private double quantity;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("下单时间")
-    private Date orderTime;
+    private String orderTime;
     @ApiModelProperty("订单号")
     private String orderNumber;
     @ApiModelProperty("外部订单号")
@@ -79,12 +78,12 @@ public class WarehouseOutBillVo {
     private String onlineOrderNumber;
     @ApiModelProperty("平台")
     private String platform;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
     @ApiModelProperty("付款时间")
-    private Date paymentTime;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String paymentTime;
+
     @ApiModelProperty("接单时间")
-    private Date orderAcceptanceTime;
+    private String orderAcceptanceTime;
     @ApiModelProperty("拣选区域")
     private String pickingArea;
     @ApiModelProperty("出库类型")
@@ -93,19 +92,19 @@ public class WarehouseOutBillVo {
     private String brand;
     @ApiModelProperty("波次")
     private String waveTimes;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
     @ApiModelProperty("超时时间")
-    private Date timeoutPeriod;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String timeoutPeriod;
+
     @ApiModelProperty("到货时间")
-    private Date deliveryTime;
+    private String deliveryTime;
     @ApiModelProperty("体积")
     private double volume;
     @ApiModelProperty("标记")
     private String sign;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
     @ApiModelProperty("最晚发货时间")
-    private Date latestDeliveryTime;
+    private String latestDeliveryTime;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("使用组织sid")