统一字段

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -53,8 +53,8 @@ import com.glxp.mipsdl.service.order.OrderUploadLogService;
 import com.glxp.mipsdl.service.system.SysParamConfigService;
 import com.glxp.mipsdl.service.thrsys.ThrCorpService;
 import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
-import com.glxp.mipsdl.thirddao.ctqyy.PhysicDictMapper;
+import com.glxp.mipsdl.thirddao.ctqyy.VYpzsPhysicDictMapper;
-import com.glxp.mipsdl.thirddao.ctqyy.PlanInfoMapper;
+import com.glxp.mipsdl.thirddao.ctqyy.VYpzsPlanInfoMapper;
 import com.glxp.mipsdl.thirddao.ctqyy.VYpzsPresInfoMapper;
 import com.glxp.mipsdl.util.*;
 import lombok.extern.slf4j.Slf4j;
@@ -119,11 +119,11 @@ public class CtqyyClient extends CommonHttpClient {
     @Resource
     private OrderUploadLogService orderUploadLogService;
     @Resource
-    private PhysicDictMapper physicDictMapper;
+    private VYpzsPhysicDictMapper vYpzsPhysicDictMapper;
     @Resource
-    VYpzsPresInfoMapper vYpzsPresInfoMapper;
+    private VYpzsPresInfoMapper vYpzsPresInfoMapper;
     @Resource
-    private PlanInfoMapper planInfoMapper;
+    private VYpzsPlanInfoMapper vYpzsPlanInfoMapper;
 
 
     /**
@@ -236,23 +236,23 @@ public class CtqyyClient extends CommonHttpClient {
                 return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
             }
         } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) {
-            LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper();
+            LambdaQueryWrapper<VYpzsPhysicDict> wrapper = new LambdaQueryWrapper();
             //补充其他查询条件
-            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), PhysicDictEntity::getPhysicCode, udiwmsProductRequest.getCode());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode());
-            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), PhysicDictEntity::getPhysicName, udiwmsProductRequest.getName());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VYpzsPhysicDict::getPHYSIC_NAME, udiwmsProductRequest.getName());
-            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), PhysicDictEntity::getPhysicNo, udiwmsProductRequest.getRegisterNo());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VYpzsPhysicDict::getPHYSIC_NO, udiwmsProductRequest.getRegisterNo());
-            IPage<PhysicDictEntity> page = physicDictMapper.selectPage(new Page<PhysicDictEntity>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper);
+            IPage<VYpzsPhysicDict> page = vYpzsPhysicDictMapper.selectPage(new Page<VYpzsPhysicDict>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper);
-            List<PhysicDictEntity> physicDictEntities = page.getRecords();
+            List<VYpzsPhysicDict> physicDictEntities = page.getRecords();
             List<ThrProductsEntity> thrProductsEntityList = null;
             if (CollUtil.isNotEmpty(physicDictEntities)) {
                 //数据处理以thr_products 返回
                 thrProductsEntityList = physicDictEntities.stream().map(dict -> {
                     ThrProductsEntity products = new ThrProductsEntity();
-                    products.setCode(dict.getPhysicCode());
+                    products.setCode(dict.getPHYSIC_CODE());
-                    products.setName(dict.getPhysicName());
+                    products.setName(dict.getPHYSIC_NAME());
-                    products.setMeasname(dict.getPhysicUnit());
+                    products.setMeasname(dict.getPHYSIC_UNIT());
-                    products.setSpec(dict.getPhysicSpec());
+                    products.setSpec(dict.getPHYSIC_SPEC());
-                    products.setRegisterNo(dict.getPhysicNo());
+                    products.setRegisterNo(dict.getPHYSIC_NO());
                     products.setProductType(2);
                     return products;
                 }).collect(Collectors.toList());
@@ -1429,10 +1429,10 @@ public class CtqyyClient extends CommonHttpClient {
      */
     @Override
     public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
-        LambdaQueryWrapper<PlanInfoEntity> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>();
         //补充其他查询条件
-        IPage<PlanInfoEntity> page = planInfoMapper.selectPage(new Page<PlanInfoEntity>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
+        IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
-        List<PlanInfoEntity> planInfoEntities = page.getRecords();
+        List<VYpzsPlanInfo> planInfoEntities = page.getRecords();
         List<ThrOrderResponse> thrOrderResponses = null;
         if (CollUtil.isNotEmpty(planInfoEntities)) {
             //数据处理以thr_order，thr_order_detail 主子返回

src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java

@@ -1,33 +0,0 @@
-package com.glxp.mipsdl.entity.ctqyy;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName(value = "V_YPZS_PHYSIC_DICT")
-public class PhysicDictEntity {
-
-    @TableField("PHYSIC_CODE")
-    private String physicCode;
-    @TableField("PHYSIC_NO")
-    private String physicNo;
-    @TableField("PHYSIC_NAME")
-    private String physicName;
-    @TableField("PHYSIC_SPEC")
-    private String physicSpec;
-    @TableField("PHYSIC_UNIT")
-    private String physicUnit;
-    @TableField("PACK_UNIT")
-    private String packUnit;
-    @TableField("PACK_SPEC")
-    private String packSpec;
-    @TableField("PACK_UNTUCK")
-    private String packUntuck;
-    @TableField("PACK_UNTUCK_RESI")
-    private String packUntuckResi;
-    @TableField("COUNTRY_CODE")
-    private String countryCode;
-
-}

src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java

@@ -1,52 +0,0 @@
-package com.glxp.mipsdl.entity.ctqyy;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName(value = "V_YPZS_PLAN_INFO")
-public class PlanInfoEntity {
-
-    @TableField("CGDBH")
-    private String cgdbh;
-    @TableField("YPBM")
-    private String ypbm;
-    @TableField("YPMC")
-    private String ypmc;
-    @TableField("JXMC")
-    private String jxmc;
-    @TableField("GGMC")
-    private String ggmc;
-    @TableField("BZDW")
-    private String bzdw;
-    @TableField("ZXSYDW")
-    private String zxsydw;
-    @TableField("ZHB")
-    private String zhb;
-    @TableField("SCQYBM")
-    private String scqybm;
-    @TableField("SCQYMC")
-    private String scqymc;
-    @TableField("YKBM")
-    private String ykbm;
-    @TableField("YKMC")
-    private String ykmc;
-    @TableField("ZBJ")
-    private String zbj;
-    @TableField("GJJ")
-    private String gjj;
-    @TableField("GMSL")
-    private String gmsl;
-    @TableField("PSQYBM")
-    private String psqybm;
-    @TableField("PSQYMC")
-    private String psqymc;
-    @TableField("BZ")
-    private String bz;
-    @TableField("TPJG")
-    private String tpjg;
-
-
-}

src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPhysicDict.java

@@ -0,0 +1,42 @@
+package com.glxp.mipsdl.entity.ctqyy;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "V_YPZS_PHYSIC_DICT")
+public class VYpzsPhysicDict {
+
+    @TableField(value = "PHYSIC_CODE")
+    private String PHYSIC_CODE;
+
+    @TableField(value = "PHYSIC_NO")
+    private String PHYSIC_NO;
+
+    @TableField(value = "PHYSIC_NAME")
+    private String PHYSIC_NAME;
+
+    @TableField(value = "PHYSIC_SPEC")
+    private String PHYSIC_SPEC;
+
+    @TableField(value = "PHYSIC_UNIT")
+    private String PHYSIC_UNIT;
+
+    @TableField(value = "PACK_UNIT")
+    private String PACK_UNIT;
+
+    @TableField(value = "PACK_SPEC")
+    private String PACK_SPEC;
+
+    @TableField(value = "PACK_UNTUCK")
+    private String PACK_UNTUCK;
+
+    @TableField(value = "PACK_UNTUCK_RESI")
+    private String PACK_UNTUCK_RESI;
+
+    @TableField(value = "COUNTRY_CODE")
+    private String COUNTRY_CODE;
+
+}

src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPlanInfo.java

@@ -0,0 +1,70 @@
+package com.glxp.mipsdl.entity.ctqyy;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "V_YPZS_PLAN_INFO")
+public class VYpzsPlanInfo {
+
+    @TableField(value = "CGDBH")
+    private String CGDBH;
+
+    @TableField(value = "YPBM")
+    private String YPBM;
+
+    @TableField(value = "YPMC")
+    private String YPMC;
+
+    @TableField(value = "JXMC")
+    private String JXMC;
+
+    @TableField(value = "GGMC")
+    private String GGMC;
+
+    @TableField(value = "BZDW")
+    private String BZDW;
+
+    @TableField(value = "ZXSYDW")
+    private String ZXSYDW;
+
+    @TableField(value = "ZHB")
+    private String ZHB;
+
+    @TableField(value = "SCQYBM")
+    private String SCQYBM;
+
+    @TableField(value = "SCQYMC")
+    private String SCQYMC;
+
+    @TableField(value = "YKBM")
+    private String YKBM;
+
+    @TableField(value = "YKMC")
+    private String YKMC;
+
+    @TableField(value = "ZBJ")
+    private String ZBJ;
+
+    @TableField(value = "GJJ")
+    private String GJJ;
+
+    @TableField(value = "GMSL")
+    private String GMSL;
+
+    @TableField(value = "PSQYBM")
+    private String PSQYBM;
+
+    @TableField(value = "PSQYMC")
+    private String PSQYMC;
+
+    @TableField(value = "BZ")
+    private String BZ;
+
+    @TableField(value = "TPJG")
+    private String TPJG;
+
+
+}

src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPhysicDictMapper.java

@@ -2,15 +2,12 @@ package com.glxp.mipsdl.thirddao.ctqyy;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.mipsdl.entity.ctqyy.PhysicDictEntity;
+import com.glxp.mipsdl.entity.ctqyy.VYpzsPhysicDict;
-import com.glxp.mipsdl.req.base.UdiwmsProductRequest;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 
 @Mapper
 @DS("ctqyySql")
-public interface PhysicDictMapper extends BaseMapper<PhysicDictEntity> {
+public interface VYpzsPhysicDictMapper extends BaseMapper<VYpzsPhysicDict> {
 
 }

src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPlanInfoMapper.java

@@ -2,12 +2,12 @@ package com.glxp.mipsdl.thirddao.ctqyy;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.mipsdl.entity.ctqyy.PlanInfoEntity;
+import com.glxp.mipsdl.entity.ctqyy.VYpzsPlanInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper
 @DS("ctqyySql")
-public interface PlanInfoMapper extends BaseMapper<PlanInfoEntity> {
+public interface VYpzsPlanInfoMapper extends BaseMapper<VYpzsPlanInfo> {
 
 }

src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPhysicDictMapper.xml

@@ -1,5 +1,5 @@
 <?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.thirddao.ctqyy.PlanInfoMapper">
+<mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VYpzsPhysicDictMapper">
 
 </mapper>

src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml

@@ -1,5 +1,5 @@
 <?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.thirddao.ctqyy.PhysicDictMapper">
+<mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VYpzsPlanInfoMapper">
 
 </mapper>