添加核算分类相关

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<ThrHslbEntity>().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;
+//    }
+
+
 }

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

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

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<ThrHslbEntity> {
+}

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<ThrHslbMapper, ThrHslbEntity> {
+}

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

src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbMapper">
+</mapper>