From 6627cfd3c26d2682cbd0ec425a86217c83cce45a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 09:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B8=E7=AE=97=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/ptxhyy/PtxhyyClient.java | 22 ++++++++++++++++-- .../client/ptxhyy/entity/DictHslbEntity.java | 10 ++++++++ .../client/ptxhyy/entity/ThrHslbEntity.java | 23 +++++++++++++++++++ .../client/ptxhyy/entity/ThrHslbMapper.java | 8 +++++++ .../client/ptxhyy/entity/ThrHslbService.java | 8 +++++++ .../thrsys/ThrSystemDetailService.java | 1 - .../mybatis/mapper/ptxyy/ThrHslbMapper.xml | 4 ++++ 7 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DictHslbEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java create mode 100644 src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 01fffbe..f59a5e2 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.client.ptxhyy.entity.OrderUploadResponse; +import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity; +import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbService; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; @@ -80,6 +82,8 @@ public class PtxhyyClient extends CommonHttpClient { private final IoOrderDetailBizDao orderDetailBizDao; private final SubmitOrderUtil submitOrderUtil; private final ThrProductsDao thrProductsDao; + @Resource + ThrHslbService thrHslbService; @Override public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { @@ -235,7 +239,13 @@ public class PtxhyyClient extends CommonHttpClient { if (invoiceList.get(0).getInvoiceDate() != null) fprq = DateUtil.formatDateTime(invoiceList.get(0).getInvoiceDate()); } - + String hsfl = ""; + if (StrUtil.isNotEmpty(i.getCplb())) { + ThrHslbEntity thrHslbEntity = thrHslbService.getOne(new QueryWrapper().eq("hslb", i.getCplb()), false); + if (thrHslbEntity != null) { + hsfl = thrHslbEntity.getHsbm(); + } + } BigDecimal wzje = i.getPrice().multiply(BigDecimal.valueOf(i.getCount().intValue())); PtxhyyOrderDetailRequest detailRequest = PtxhyyOrderDetailRequest.builder() .wzxh(i.getProductId()) @@ -247,7 +257,7 @@ public class PtxhyyClient extends CommonHttpClient { .lsje(wzje) .wzje(wzje + "") .udim(udim) - .hsfl(i.getCplb()) + .hsfl(hsfl) .wzph(i.getBatchNo()) .fphm(fphm) .fprq(fprq) @@ -378,4 +388,12 @@ public class PtxhyyClient extends CommonHttpClient { } } + +// public void getHslb() { +// String response = httpClient.postJson(thrSystemDetailService.getUrl(null), udiwmsUnitRequest); +// BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); +// return baseResponse; +// } + + } diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DictHslbEntity.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DictHslbEntity.java new file mode 100644 index 0000000..fe356a5 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/DictHslbEntity.java @@ -0,0 +1,10 @@ +package com.glxp.mipsdl.client.ptxhyy.entity; + +import lombok.Data; + +@Data +public class DictHslbEntity { + private Integer hslb; + private String hsmc; + private String hsbm; +} diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbEntity.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbEntity.java new file mode 100644 index 0000000..1e57765 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbEntity.java @@ -0,0 +1,23 @@ +package com.glxp.mipsdl.client.ptxhyy.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; + +@Data +@TableName(value = "thr_hslb") +public class ThrHslbEntity implements Serializable { + @TableField(value = "hslb") + private String hslb; + + @TableField(value = "hsmc") + private String hsmc; + + @TableField(value = "hsbm") + private String hsbm; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java new file mode 100644 index 0000000..4f3eae2 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java @@ -0,0 +1,8 @@ +package com.glxp.mipsdl.client.ptxhyy.entity; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ThrHslbMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java new file mode 100644 index 0000000..ee632a7 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java @@ -0,0 +1,8 @@ +package com.glxp.mipsdl.client.ptxhyy.entity; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +@Service +public class ThrHslbService extends ServiceImpl { +} diff --git a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java index 6d4ed14..0d07d7b 100644 --- a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java @@ -31,7 +31,6 @@ public class ThrSystemDetailService { } public String getUrlExclude(String urlName) { - ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailDao.selectByKey(urlName, thirdSysConfig.getThirdId()); return thirdSysConfig.getThirdSysConfig().getThirdSysUrl(); } diff --git a/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml b/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml new file mode 100644 index 0000000..53f4052 --- /dev/null +++ b/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml @@ -0,0 +1,4 @@ + + + +