fix: 南靖初始化

pom.xml

@@ -185,6 +185,26 @@
             <version>5.10.0</version>
         </dependency>
 
+        <!--分页插件-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.2</version>
+            <!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
+    因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
+    所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
+-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.client.CommonHttpClient;
+import com.glxp.mipsdl.client.ctqyy.entity.InvResultEntity;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;
 import com.glxp.mipsdl.constant.Constants;
@@ -31,6 +33,7 @@ import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
 import com.glxp.mipsdl.entity.inout.*;
+import com.glxp.mipsdl.entity.njxyy.A005;
 import com.glxp.mipsdl.entity.njxyy.ProductEntity;
 import com.glxp.mipsdl.entity.njxyy.SickerEntity;
 import com.glxp.mipsdl.entity.system.UdiEntity;
@@ -38,6 +41,8 @@ import com.glxp.mipsdl.entity.thrsys.*;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
 import com.glxp.mipsdl.req.base.forthird.*;
+import com.glxp.mipsdl.req.ctqyy.CtqyyInvRequest;
+import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.njxyy.PostThrProductRequest;
 import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest;
@@ -48,8 +53,10 @@ import com.glxp.mipsdl.res.BaseResponse;
 import com.glxp.mipsdl.res.PageSimpleResponse;
 import com.glxp.mipsdl.res.udiwms.*;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
+import com.glxp.mipsdl.service.njxyy.A005Service;
 import com.glxp.mipsdl.service.order.OrderUploadLogService;
 import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
+import com.glxp.mipsdl.thirddao.njxyy.A005Mapper;
 import com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper;
 import com.glxp.mipsdl.thirddao.njxyy.ThrProductsMapper;
 import com.glxp.mipsdl.thirddao.njxyy.ThrSickerMapper;
@@ -739,4 +746,61 @@ public class NjxyyClient extends CommonHttpClient {
     }
 
 
+    @Resource
+    A005Service a005Service;
+
+    /**
+     * 获取库存出入库明细 （普耗出库明细）
+     *
+     * @param udiwmsInvProductsRequest
+     * @return
+     */
+    @Override
+    public BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+
+
+        List<A005> a005s = a005Service.filterList(udiwmsInvProductsRequest);
+
+            List<ThrInvResultResponse> thrInvResultResponses = new ArrayList<>();
+            if (CollUtil.isNotEmpty(a005s)) {
+                for (A005 ptxhInvResponse : a005s) {
+                    //判断是否普耗 是 add
+                    Integer byMainId = basicUdirelDao.findByMainId(ptxhInvResponse.getThrcode());
+                    if (byMainId == null || byMainId == 0){
+                    ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse();
+                    thrInvResultResponse.setThrCode(ptxhInvResponse.getThrcode());
+                    thrInvResultResponse.setCpmctymc(ptxhInvResponse.getCpmctymc());
+                    thrInvResultResponse.setGgxh(ptxhInvResponse.getGgxh());
+                    thrInvResultResponse.setBatchNo(ptxhInvResponse.getBatchno());
+                    thrInvResultResponse.setMeasname(ptxhInvResponse.getMeasname());
+                    thrInvResultResponse.setPrice(ptxhInvResponse.getPrice());
+                    thrInvResultResponse.setAmount(ptxhInvResponse.getAmount());
+//                    thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName());
+//                    thrInvResultResponse.setDeptCode(ptxhInvResponse.getDebit());
+//                    thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName());
+//                    thrInvResultResponse.setInvCode(ptxhInvResponse.getCredit());
+
+                    thrInvResultResponse.setDeptName(ptxhInvResponse.getCorpname());
+                    thrInvResultResponse.setDeptCode(ptxhInvResponse.getCorpid());
+                    thrInvResultResponse.setInvName(ptxhInvResponse.getInvname());
+                    thrInvResultResponse.setInvCode(ptxhInvResponse.getInvcode());
+
+                    thrInvResultResponse.setManufacturer(ptxhInvResponse.getManufacturer());
+                    thrInvResultResponse.setManufactoryCode(ptxhInvResponse.getManufactorycode());
+                    thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
+                    thrInvResultResponse.setBillType(ptxhInvResponse.getInouttype());
+                    thrInvResultResponse.setType("1");
+                    thrInvResultResponse.setOutCount(ptxhInvResponse.getRecount() + "");
+                    thrInvResultResponse.setReCount(ptxhInvResponse.getRecount() + "");
+                    thrInvResultResponses.add(thrInvResultResponse);
+                    }
+                }
+            }
+            PageSimpleResponse<ThrInvResultResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(thrInvResultResponses.size() + 0l);
+            pageSimpleResponse.setList(thrInvResultResponses);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
+
+
 }

src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java

@@ -3,9 +3,10 @@ package com.glxp.mipsdl.dao.basic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.basic.BasicProductsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface BasicProductsDao extends BaseMapper<BasicProductsEntity> {
 
-
+    Integer findByNameCode(@Param("nameCode") String nameCode);
 }

src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java

@@ -10,5 +10,7 @@ public interface BasicUdirelDao extends BaseMapper<BasicUdirelEntity> {
 
     public BasicUdirelEntity selectByNameCode(String nameCode);
 
+    public Integer findByMainId(String thirdId);
+
     UdiRelevanceResponse selectOneUdi(BasicUdirelEntity basicUdirel);
 }

src/main/java/com/glxp/mipsdl/entity/njxyy/A005.java

@@ -0,0 +1,139 @@
+package com.glxp.mipsdl.entity.njxyy;
+
+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.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "view_nj.a005")
+public class A005 {
+    @TableField(value = "CPMCTYMC")
+    private String cpmctymc;
+
+    @TableField(value = "THRCODE")
+    private String thrcode;
+
+    @TableField(value = "AMECODE")
+    private String amecode;
+
+    @TableField(value = "GGXH")
+    private String ggxh;
+
+    @TableField(value = "BATCHNO")
+    private String batchno;
+
+    @TableField(value = "MEASNAME")
+    private String measname;
+
+    @TableField(value = "PRICE")
+    private BigDecimal price;
+
+    @TableField(value = "PRODUCTIONDATE")
+    private Date productiondate;
+
+    @TableField(value = "EXPIREDATE")
+    private Date expiredate;
+
+    @TableField(value = "YLQXZCRBARMC")
+    private String ylqxzcrbarmc;
+
+    @TableField(value = "ZCZBHHZBAPZBH")
+    private String zczbhhzbapzbh;
+
+    @TableField(value = "MANUFACTURER")
+    private String manufacturer;
+
+    @TableField(value = "MANUFACTORYCODE")
+    private String manufactorycode;
+
+    @TableField(value = "AMOUNT")
+    private BigDecimal amount;
+
+    @TableField(value = "RECOUNT")
+    private Integer recount;
+
+    @TableField(value = "INOUTTYPE")
+    private String inouttype;
+
+    @TableField(value = "INVCODE")
+    private String invcode;
+
+    @TableField(value = "INVNAME")
+    private String invname;
+
+    @TableField(value = "CORPID")
+    private String corpid;
+
+    @TableField(value = "CORPNAME")
+    private String corpname;
+
+    @TableField(value = "REMARK")
+    private String remark;
+
+    @TableField(value = "REMARK1")
+    private String remark1;
+
+    @TableField(value = "REMARK2")
+    private String remark2;
+
+    @TableField(value = "REMARK3")
+    private String remark3;
+
+    public static final String COL_CPMCTYMC = "CPMCTYMC";
+
+    public static final String COL_THRCODE = "THRCODE";
+
+    public static final String COL_AMECODE = "AMECODE";
+
+    public static final String COL_GGXH = "GGXH";
+
+    public static final String COL_BATCHNO = "BATCHNO";
+
+    public static final String COL_MEASNAME = "MEASNAME";
+
+    public static final String COL_PRICE = "PRICE";
+
+    public static final String COL_PRODUCTIONDATE = "PRODUCTIONDATE";
+
+    public static final String COL_EXPIREDATE = "EXPIREDATE";
+
+    public static final String COL_YLQXZCRBARMC = "YLQXZCRBARMC";
+
+    public static final String COL_ZCZBHHZBAPZBH = "ZCZBHHZBAPZBH";
+
+    public static final String COL_MANUFACTURER = "MANUFACTURER";
+
+    public static final String COL_MANUFACTORYCODE = "MANUFACTORYCODE";
+
+    public static final String COL_AMOUNT = "AMOUNT";
+
+    public static final String COL_RECOUNT = "RECOUNT";
+
+    public static final String COL_INOUTTYPE = "INOUTTYPE";
+
+    public static final String COL_INVCODE = "INVCODE";
+
+    public static final String COL_INVNAME = "INVNAME";
+
+    public static final String COL_CORPID = "CORPID";
+
+    public static final String COL_CORPNAME = "CORPNAME";
+
+    public static final String COL_REMARK = "REMARK";
+
+    public static final String COL_REMARK1 = "REMARK1";
+
+    public static final String COL_REMARK2 = "REMARK2";
+
+    public static final String COL_REMARK3 = "REMARK3";
+}

src/main/java/com/glxp/mipsdl/service/njxyy/A005Service.java

@@ -0,0 +1,35 @@
+package com.glxp.mipsdl.service.njxyy;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic;
+import com.glxp.mipsdl.entity.njxyy.A005;
+import com.glxp.mipsdl.req.base.UdiwmsInvProductsRequest;
+import com.glxp.mipsdl.thirddao.ctqyy.VInsurNationGoodsPhysicMapper;
+import com.glxp.mipsdl.thirddao.njxyy.A005Mapper;
+import com.glxp.mipsdl.util.DateUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class A005Service extends ServiceImpl<A005Mapper, A005> {
+
+    public List<A005> filterList(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+//        if (null == udiwmsInvProductsRequest) {
+//            return Collections.emptyList();
+//        }
+//        if (null != udiwmsInvProductsRequest.getPage() && null != udiwmsInvProductsRequest.getLimit()) {
+//            PageHelper.offsetPage((udiwmsInvProductsRequest.getPage() - 1) * udiwmsInvProductsRequest.getLimit(), udiwmsInvProductsRequest.getLimit());
+//        }
+
+        LambdaQueryWrapper<A005> qw = new LambdaQueryWrapper<>();
+        qw.ge(A005::getRemark,DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd") + " 00:00:00");
+        qw.le(A005::getRemark,DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd") + " 23:59:59");
+
+        return this.list(qw);
+    }
+}

src/main/java/com/glxp/mipsdl/thirddao/njxyy/A005Mapper.java

@@ -0,0 +1,12 @@
+package com.glxp.mipsdl.thirddao.njxyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.njxyy.A005;
+import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("njsql")
+public interface A005Mapper extends BaseMapper<A005> {
+}

src/main/resources/application-dev.yml

@@ -10,34 +10,7 @@ spring:
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
         njsql:
-          #          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/view_nj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          #          username: SD_UDIJK
-          #          password: SD_UDIJK
-          #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: root
-          password: 123456
-          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-        #        thirdSql:
-        #          url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        #          username: root
-        #          password: 123456
-        #          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-        ptxhSql:
-          #          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
-          #          username: SD_UDIJK
-          #          password: SD_UDIJK
-          #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: root
-          password: 123456
-          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-        ctqyySql:
-          #          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
-          #          username: I_YPZS
-          #          password: zy02v4ys
-          #          driver-class-name: oracle.jdbc.driver.OracleDrive
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver

src/main/resources/application-pro.yml

@@ -10,20 +10,10 @@ spring:
           password: Glxp@6066
           driver-class-name: com.mysql.cj.jdbc.Driver
         njsql:
-          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: root
-          password: Glxp@6066
-          driver-class-name: com.mysql.cj.jdbc.Driver
-        ptxhSql:
-          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: root
-          password: Glxp@6066
-          driver-class-name: com.mysql.cj.jdbc.Driver
-        ctqyySql:
           driver-class-name: oracle.jdbc.driver.OracleDriver
-          url: jdbc:oracle:thin:@192.168.0.3:1521/yxfybjy
+          url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
-          username: I_YPZS
+          username: SD_UDIJK
-          password: zy02v4ys
+          password: SD_UDIJK
           hikari:
             connection-timeout: 60000
             maximum-pool-size: 60

src/main/resources/mybatis/mapper/master/basic/BasicUdirelDao.xml

@@ -43,6 +43,16 @@
         limit 1
     </select>
 
+
+    <select id="findByMainId" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT basic_products.requireScanCode
+        FROM basic_products
+        LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
+        WHERE
+        (basic_udirel.thirdId = #{thirdId})
+        limit 1
+    </select>
+
     <select id="selectOneUdi" parameterType="com.glxp.mipsdl.entity.basic.BasicUdirelEntity" resultType="com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse">
         select bu.*,
         bp.originUuid,

src/main/resources/mybatis/mapper/other/njxyy/A005Mapper.xml

@@ -0,0 +1,38 @@
+<?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.njxyy.A005Mapper">
+  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.njxyy.A005">
+    <!--@mbg.generated-->
+    <!--@Table view_nj.a005-->
+    <result column="CPMCTYMC" jdbcType="VARCHAR" property="cpmctymc" />
+    <result column="THRCODE" jdbcType="VARCHAR" property="thrcode" />
+    <result column="AMECODE" jdbcType="VARCHAR" property="amecode" />
+    <result column="GGXH" jdbcType="VARCHAR" property="ggxh" />
+    <result column="BATCHNO" jdbcType="VARCHAR" property="batchno" />
+    <result column="MEASNAME" jdbcType="VARCHAR" property="measname" />
+    <result column="PRICE" jdbcType="DECIMAL" property="price" />
+    <result column="PRODUCTIONDATE" jdbcType="TIMESTAMP" property="productiondate" />
+    <result column="EXPIREDATE" jdbcType="TIMESTAMP" property="expiredate" />
+    <result column="YLQXZCRBARMC" jdbcType="VARCHAR" property="ylqxzcrbarmc" />
+    <result column="ZCZBHHZBAPZBH" jdbcType="VARCHAR" property="zczbhhzbapzbh" />
+    <result column="MANUFACTURER" jdbcType="VARCHAR" property="manufacturer" />
+    <result column="MANUFACTORYCODE" jdbcType="VARCHAR" property="manufactorycode" />
+    <result column="AMOUNT" jdbcType="DECIMAL" property="amount" />
+    <result column="RECOUNT" jdbcType="INTEGER" property="recount" />
+    <result column="INOUTTYPE" jdbcType="VARCHAR" property="inouttype" />
+    <result column="INVCODE" jdbcType="VARCHAR" property="invcode" />
+    <result column="INVNAME" jdbcType="VARCHAR" property="invname" />
+    <result column="CORPID" jdbcType="VARCHAR" property="corpid" />
+    <result column="CORPNAME" jdbcType="VARCHAR" property="corpname" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+    <result column="REMARK1" jdbcType="VARCHAR" property="remark1" />
+    <result column="REMARK2" jdbcType="VARCHAR" property="remark2" />
+    <result column="REMARK3" jdbcType="VARCHAR" property="remark3" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    CPMCTYMC, THRCODE, AMECODE, GGXH, BATCHNO, MEASNAME, PRICE, PRODUCTIONDATE, EXPIREDATE, 
+    YLQXZCRBARMC, ZCZBHHZBAPZBH, MANUFACTURER, MANUFACTORYCODE, AMOUNT, RECOUNT, INOUTTYPE, 
+    INVCODE, INVNAME, CORPID, CORPNAME, REMARK, REMARK1, REMARK2, REMARK3
+  </sql>
+</mapper>