平潭生产日期失效日期其他缺失字段补齐

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -202,7 +202,7 @@ public class PtxhyyClient extends CommonHttpClient {
                 .czgh(userName)
                 .lzfs(udiwmsOrderRequest.getBillType())
                 .dwxh(udiwmsOrderRequest.getCorpId())
-                .rkrq(LocalDate.from(cn.hutool.core.date.DateUtil.parseLocalDateTime(udiwmsOrderRequest.getBillDate())))
+                .rkrq(udiwmsOrderRequest.getBillDate())
                 .djje(djje)
                 .fpbz(fbbz)
                 .zdrq(udiwmsOrderRequest.getBillDate())
@@ -250,6 +250,9 @@ public class PtxhyyClient extends CommonHttpClient {
                     .fphm(fphm)
                     .fprq(fprq)
                     .djrq(DateUtil.formatDate(orderEntity.getCreateTime(), "yyyy-MM-dd"))
+                    .producedDate(i.getProductDate())
+                    .expireDate(i.getExpireDate())
+                    .registerNo(i.getRegisterNo())
                     .build();
             ptxhyyOrderRequest.getDetailList().add(detailRequest);
         }

src/main/java/com/glxp/mipsdl/controller/UdiInfoUploadController.java

@@ -21,7 +21,6 @@ public class UdiInfoUploadController {
     /**
      * 产品信息导入
      *
-     * @param files
      * @param thirdSys
      * @return
      */

src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderDetailRequest.java

@@ -87,4 +87,9 @@ public class PtxhyyOrderDetailRequest {
     private String fprq;
 
     private String mjph;
+    private String producedDate;
+
+    private String expireDate;
+    private String registerNo;
+
 }

src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java

@@ -53,7 +53,7 @@ public class PtxhyyOrderRequest {
     /**
      * 入库日期
      */
-    private LocalDate rkrq;
+    private String rkrq;
 
     /**
      * 单据金额
@@ -85,5 +85,6 @@ public class PtxhyyOrderRequest {
      */
     private String udixh;
 
+
     private List<PtxhyyOrderDetailRequest> detailList;
 }

src/main/java/com/glxp/mipsdl/util/DateUtil.java

@@ -2,6 +2,7 @@ package com.glxp.mipsdl.util;
 
 
 import cn.hutool.core.date.format.FastDateFormat;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 
@@ -456,6 +457,8 @@ public class DateUtil {
     }
 
     public static String formatExpireTime(String str) {
+        if (StrUtil.isEmpty(str))
+            return null;
         try {
             Date date = cn.hutool.core.date.DateUtil.parse(str, "yyyyMMdd");
             return formatDate(date, "yyyy-MM-dd");
@@ -464,4 +467,4 @@ public class DateUtil {
         }
         return str;
     }
-}
+}

src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java

@@ -110,8 +110,8 @@ public class SubmitOrderUtil {
         UdiwmsOrderDetailRequest item = new UdiwmsOrderDetailRequest();
         BeanUtil.copyProperties(detailBizEntity, item);
 
-        item.setProductDate(StrUtil.isBlank(detailBizEntity.getProductDate()) ? null : "20" + detailBizEntity.getProductDate());
-        item.setExpireDate(StrUtil.isBlank(detailBizEntity.getExpireDate()) ? null : "20" + detailBizEntity.getExpireDate());
+        item.setProductDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getProductDate()) ? null : "20" + detailBizEntity.getProductDate()));
+        item.setExpireDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getExpireDate()) ? null : "20" + detailBizEntity.getExpireDate()));
 
         String thirdProductId = (String) ReflectUtil.getFieldValue(basicUdirel, thirdSysConfig.getThirdId());
         item.setProductId(thirdProductId); //产品ID