From 3ed8c2657aac930c601c7c39edb1a746d013c137 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Thu, 22 Sep 2022 15:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/lims/goods/entity/Goods.java  |  4 ++
 .../goods/controller/GoodsController.java     |  7 +++
 .../lims/goods/mapper/GoodsMapper.java        |  2 +-
 .../lims/goods/mapper/GoodsMapper.xml         | 43 +++++++++++++++++++
 .../lims/goods/service/IGoodsService.java     |  2 +
 .../goods/service/impl/GoodsServiceImpl.java  |  7 ++-
 6 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml

diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
index dd28ab4..db81c95 100644
--- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
+++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
@@ -96,4 +96,8 @@ public class Goods extends BaseEntity {
 
 	@TableField(exist = false)
 	private String sort;
+
+	@TableField(exist = false)
+	// 批次数
+	private Integer pNum;
 }
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
index 383e449..395e7c1 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
@@ -104,6 +104,13 @@ public class GoodsController extends BladeController {
         return page;
     }
 
+    @GetMapping("/listByPnum")
+    public IPage<Goods> listByPnum(Goods goods, Query query) {
+        return goodsService.listByPnum(goods,Condition.getPage(query));
+
+    }
+
+
     //查看详情
     @GetMapping("/detail")
     public Goods detail(Goods goods) {
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java
index 23f1869..08fe0da 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java
@@ -14,5 +14,5 @@ import java.util.List;
  * 物品表 Mapper 接口
  */
 public interface GoodsMapper extends BaseMapper<Goods> {
-
+    IPage<Goods> listByPnum(Goods goods,IPage<Goods> page);
 }
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml
new file mode 100644
index 0000000..1f7ed10
--- /dev/null
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml
@@ -0,0 +1,43 @@
+<?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="org.springblade.lims.goods.mapper.GoodsMapper">
+
+    <select id="listByPnum" parameterType="org.springblade.lims.goods.entity.Goods" resultType="org.springblade.lims.goods.entity.Goods">
+        SELECT
+            A.id,A.big_class_id AS bigClassId,A.big_class AS bigClass,A.name,
+            A.code,A.xh,A.rule,B.num,A.brand,A.company,A.company_id AS companyId,
+            A.type,A.unit,A.location,A.ccfs,A.yt,A.danger,A.warn_num AS warnNum,
+            A.warn_time AS warnTime,A.deactivate,A.beyond_time AS beyondTime,
+            B.p_num AS pNum
+        FROM
+            f_goods A
+        INNER JOIN
+              t_product_store_detial B
+        ON
+          A.id = B.goods_id
+        AND
+          B.status = 1
+        <where>
+            <if test="goods.name != null and goods.name != ''">
+                A.name like concat(concat('%',#{goods.name}),'%')
+                OR
+                  A.company like concat(concat('%',#{goods.name}),'%')
+                OR
+                  A.brand like concat(concat('%',#{goods.name}),'%')
+                OR
+                  A.yt like concat(concat('%',#{goods.name}),'%')
+            </if>
+
+            <if test="goods.bigClassId != null and goods.bigClassId != ''">
+                AND
+                  A.big_class_id = #{goods.bigClassId}
+            </if>
+            <if test="goods.location != null and goods.location != ''">
+                AND
+                A.location = #{goods.location}
+            </if>
+        </where>
+        ORDER BY
+            A.create_time desc,B.num asc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java
index 221a790..c47b4c1 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java
@@ -1,7 +1,9 @@
 package org.springblade.lims.goods.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.lims.goods.entity.Goods;
 
 public interface IGoodsService extends BaseService<Goods> {
+    IPage<Goods> listByPnum(Goods goods,IPage<Goods> page);
 }
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java
index ded5cd2..11b7271 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java
@@ -1,6 +1,7 @@
 
 package org.springblade.lims.goods.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.lims.goods.entity.Goods;
@@ -14,5 +15,9 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class GoodsServiceImpl extends BaseServiceImpl<GoodsMapper, Goods> implements IGoodsService {
-
+    private final GoodsMapper goodsMapper;
+    @Override
+    public IPage<Goods> listByPnum(Goods goods, IPage<Goods> page){
+        return goodsMapper.listByPnum(goods,page);
+    }
 }