From 082c99f3e45fbadd3fca81f8934f558428d61abc Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 24 Feb 2025 18:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=9F=E4=BA=A7=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=20=20=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=AD=89=E6=95=B0=E6=8D=AE=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E5=80=BC=E5=B0=B1=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 26 +++++++++---------- .../service/basic/RelCodeDetailService.java | 2 ++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index cf56dc2..3f8a58e 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -783,19 +783,19 @@ public class HlfyyyClient extends CommonHttpClient { udiwmsOrderDetailHlfyRequest.setPrice(udiwmsOrderDetailRequest.getPrice().toString()); udiwmsOrderDetailHlfyRequest.setCount(udiwmsOrderDetailRequest.getCount()+""); udiwmsOrderDetailHlfyRequest.setAllowNoBatch(Boolean.toString(udiwmsOrderDetailRequest.isAllowNoBatch())); - // 判断生产日期失效日期 发票等数据如果没值就写死 - if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getInvoiceDate())){ - udiwmsOrderDetailHlfyRequest.setInvoiceDate("2000-01-01 00:00:00"); - } - if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getFirstSalesInvNo())){ - udiwmsOrderDetailHlfyRequest.setFirstSalesInvNo("test111"); - } - if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getProductDate())){ - udiwmsOrderDetailHlfyRequest.setProductDate("2000-01-01 00:00:00"); - } - if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getExpireDate())){ - udiwmsOrderDetailHlfyRequest.setExpireDate("2099-01-01 00:00:00"); - } +// // 判断生产日期失效日期 发票等数据如果没值就写死 +// if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getInvoiceDate())){ +// udiwmsOrderDetailHlfyRequest.setInvoiceDate("2000-01-01 00:00:00"); +// } +// if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getFirstSalesInvNo())){ +// udiwmsOrderDetailHlfyRequest.setFirstSalesInvNo("test111"); +// } +// if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getProductDate())){ +// udiwmsOrderDetailHlfyRequest.setProductDate("2000-01-01 00:00:00"); +// } +// if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getExpireDate())){ +// udiwmsOrderDetailHlfyRequest.setExpireDate("2099-01-01 00:00:00"); +// } if(udiwmsOrderDetailRequest.getCodeList()!=null && udiwmsOrderDetailRequest.getCodeList().size() >0){ List list = new ArrayList<>(); diff --git a/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java b/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java index f2951bb..856ca95 100644 --- a/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java +++ b/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java @@ -1,6 +1,7 @@ package com.glxp.mipsdl.service.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; @@ -28,6 +29,7 @@ public class RelCodeDetailService extends ServiceImpl list = new ArrayList<>(); // list.add(relCodeDetail); fetchAllChildren(code, list);