1.添加盘点功能基础接口

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountCodesController.java

@@ -1,14 +1,42 @@
 package com.glxp.api.admin.controller.inventory;
 
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.entity.inventory.InvCountCodes;
+import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.service.inventory.InvCountCodesService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 盘点单据码表
  */
 @RestController
 public class InvCountCodesController {
 
+    @Resource
+    private InvCountCodesService invCountCodesService;
 
+    /**
+     * 查询码表
+     *
+     * @param codesRequest
+     * @return
+     */
+    @GetMapping("/invCount/codes/filterList")
+    public BaseResponse filterList(FilterInvCountCodesRequest codesRequest) {
+        List<InvCountCodes> list = invCountCodesService.filterList(codesRequest);
+        PageInfo<InvCountCodes> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<InvCountCodes> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
 
 }

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java

@@ -1,14 +1,56 @@
 package com.glxp.api.admin.controller.inventory;
 
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.req.inout.DeleteRequest;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
+import com.glxp.api.admin.service.inventory.InvCountOrderService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 盘点单接口
  */
 @RestController
 public class InvCountOrderController {
 
+    @Resource
+    private InvCountOrderService invCountOrderService;
 
+    /**
+     * 查询盘点单列表
+     *
+     * @param filterInvCountOrderRequest
+     * @return
+     */
+    @GetMapping("/invCount/order/filterList")
+    public BaseResponse filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
+        List<InvCountOrderResponse> list = invCountOrderService.filterList(filterInvCountOrderRequest);
+        PageInfo<InvCountOrderResponse> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<InvCountOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(pageInfo.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
+    /**
+     * 删除盘点单据
+     *
+     * @param deleteRequest
+     * @return
+     */
+    @PostMapping("/invCount/order/delete")
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+        invCountOrderService.deleteOrder(deleteRequest.getId());
+        return ResultVOUtils.success();
+    }
 
 }

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java

@@ -1,14 +1,42 @@
 package com.glxp.api.admin.controller.inventory;
 
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 盘点单详情接口
  */
+@Slf4j
 @RestController
 public class InvCountOrderDetailController {
 
+    @Resource
+    private InvCountOrderDetailService invCountOrderDetailService;
 
-
+    /**
+     * 查询盘点单据详情
+     *
+     * @return
+     */
+    @GetMapping("/invCount/order/detail")
+    public BaseResponse filterList(FilterInvCountOrderDetailRequest detailRequest) {
+        List<InvCountOrderDetail> list = invCountOrderDetailService.filterList(detailRequest);
+        PageInfo<InvCountOrderDetail> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<InvCountOrderDetail> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(pageInfo.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountCodesDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.admin.dao.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountCodes;
+import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,19 @@ public interface InvCountCodesDao {
     int updateBatch(List<InvCountCodes> list);
 
     int batchInsert(@Param("list") List<InvCountCodes> list);
+
+    /**
+     * 根据盘点单号删除盘点单据码详情
+     *
+     * @param orderId
+     */
+    void deleteByOrderId(@Param("orderId") String orderId);
+
+    /**
+     * 查询盘点单据码详情
+     *
+     * @param codesRequest
+     * @return
+     */
+    List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java

@@ -32,4 +32,12 @@ public interface InvCountOrderDao {
      * @return
      */
     List<InvCountOrderResponse> selectList(FilterInvCountOrderRequest filterInvCountOrderRequest);
+
+    /**
+     * 根据id查询盘点单号
+     *
+     * @param id
+     * @return
+     */
+    String selectOrderIdById(@Param("id") String id);
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.admin.dao.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,19 @@ public interface InvCountOrderDetailDao {
     int updateBatch(List<InvCountOrderDetail> list);
 
     int batchInsert(@Param("list") List<InvCountOrderDetail> list);
+
+    /**
+     * 根据盘点单号删除单据详情
+     *
+     * @param orderId
+     */
+    void deleteByOrderId(@Param("orderId") String orderId);
+
+    /**
+     * 查询盘点单据详情
+     *
+     * @param detailRequest
+     * @return
+     */
+    List<InvCountOrderDetail> filterList(FilterInvCountOrderDetailRequest detailRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderController.java

@@ -1,43 +0,0 @@
-package com.glxp.api.admin.entity.inventory;
-
-import com.github.pagehelper.PageInfo;
-import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
-import com.glxp.api.admin.res.PageSimpleResponse;
-import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
-import com.glxp.api.admin.service.inventory.InvCountOrderService;
-import com.glxp.api.common.res.BaseResponse;
-import com.glxp.api.common.util.ResultVOUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 盘点单据接口
- */
-@Slf4j
-@RestController
-public class InvCountOrderController {
-
-    @Resource
-    private InvCountOrderService invCountOrderService;
-
-    /**
-     * 查询盘点单列表
-     *
-     * @param filterInvCountOrderRequest
-     * @return
-     */
-    @GetMapping("/invCount/order/filterList")
-    public BaseResponse filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
-        List<InvCountOrderResponse> list = invCountOrderService.filterList(filterInvCountOrderRequest);
-        PageInfo<InvCountOrderResponse> pageInfo = new PageInfo<>(list);
-        PageSimpleResponse<InvCountOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(pageInfo.getList());
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
-
-}

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountCodesRequest.java

@@ -0,0 +1,27 @@
+package com.glxp.api.admin.req.inventory;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 盘点单据码详情查询参数
+ */
+@Data
+public class FilterInvCountCodesRequest extends ListPageRequest {
+
+    /**
+     * 盘点单号
+     */
+    private String orderIdFk;
+
+    /**
+     * 产品ID
+     */
+    private String productId;
+
+    /**
+     * 码
+     */
+    private String code;
+
+}

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderDetailRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.api.admin.req.inventory;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 查询盘点单详情参数
+ */
+@Data
+public class FilterInvCountOrderDetailRequest extends ListPageRequest {
+
+    /**
+     * 盘点单号
+     */
+    private String orderIdFk;
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java

@@ -1,7 +1,20 @@
 package com.glxp.api.admin.service.inventory;
 
+import com.glxp.api.admin.entity.inventory.InvCountCodes;
+import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
+
+import java.util.List;
+
 /**
  * 盘点单Service
  */
 public interface InvCountCodesService {
+
+    /**
+     * 查询盘点单据码详情
+     *
+     * @param codesRequest
+     * @return
+     */
+    List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java

@@ -1,7 +1,14 @@
 package com.glxp.api.admin.service.inventory;
 
+import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
+
+import java.util.List;
+
 /**
  * 盘点单Service
  */
 public interface InvCountOrderDetailService {
+
+    List<InvCountOrderDetail> filterList(FilterInvCountOrderDetailRequest detailRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderService.java

@@ -18,4 +18,10 @@ public interface InvCountOrderService {
      */
     List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest);
 
+    /**
+     * 删除盘点单
+     *
+     * @param id
+     */
+    void deleteOrder(String id);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java

@@ -1,12 +1,34 @@
 package com.glxp.api.admin.service.inventory.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.inventory.InvCountCodesDao;
+import com.glxp.api.admin.entity.inventory.InvCountCodes;
+import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
 import com.glxp.api.admin.service.inventory.InvCountCodesService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class InvCountCodesServiceImpl implements InvCountCodesService {
+
+    @Resource
+    private InvCountCodesDao invCountCodesDao;
+
+    @Override
+    public List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest) {
+        if (null != codesRequest) {
+            return Collections.emptyList();
+        }
+        if (null != codesRequest.getPage() && null != codesRequest.getLimit()) {
+            PageHelper.offsetPage((codesRequest.getPage() - 1) * codesRequest.getLimit(), codesRequest.getLimit());
+        }
+        return invCountCodesDao.filterList(codesRequest);
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderDetailServiceImpl.java

@@ -1,12 +1,34 @@
 package com.glxp.api.admin.service.inventory.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
+import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
 import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailService {
+
+    @Resource
+    private InvCountOrderDetailDao invCountOrderDetailDao;
+
+    @Override
+    public List<InvCountOrderDetail> filterList(FilterInvCountOrderDetailRequest detailRequest) {
+        if (null == detailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        }
+        return invCountOrderDetailDao.filterList(detailRequest);
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -1,7 +1,9 @@
 package com.glxp.api.admin.service.inventory.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.inventory.InvCountCodesDao;
 import com.glxp.api.admin.dao.inventory.InvCountOrderDao;
+import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
 import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.admin.service.inventory.InvCountOrderService;
@@ -20,6 +22,10 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
 
     @Resource
     private InvCountOrderDao invCountOrderDao;
+    @Resource
+    private InvCountOrderDetailDao invCountOrderDetailDao;
+    @Resource
+    private InvCountCodesDao invCountCodesDao;
 
     @Override
     public List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
@@ -31,4 +37,13 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         }
         return invCountOrderDao.selectList(filterInvCountOrderRequest);
     }
+
+    @Override
+    public void deleteOrder(String id) {
+        String orderId = invCountOrderDao.selectOrderIdById(id);
+        invCountOrderDao.deleteByPrimaryKey(Integer.valueOf(id));
+        invCountOrderDetailDao.deleteByOrderId(orderId);
+        invCountCodesDao.deleteByOrderId(orderId);
+    }
+
 }

api-admin/src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=root
 spring.datasource.hikari.connection-timeout=60000
@@ -16,7 +16,7 @@ SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 spring.redis.database=8 
 spring.redis.host=192.168.235.137
 spring.redis.port=6379 
-spring.redis.password=
+spring.redis.password=123456
 spring.redis.jedis.pool.max-active=8 
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8 

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test1
+spring.profiles.active=dev
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountCodesDao.xml

@@ -138,4 +138,27 @@
              #{item.status,jdbcType=BOOLEAN})
         </foreach>
     </insert>
+
+    <delete id="deleteByOrderId">
+        delete
+        from inv_count_codes
+        where orderIdFk = #{orderId}
+    </delete>
+
+    <select id="filterList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from inv_count_codes
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="productId != null and productId != ''">
+                AND productId = #{productId}
+            </if>
+            <if test="code != null and code != ''">
+                AND code like concat('%', #{code}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml

@@ -55,7 +55,6 @@
                 #{auditTime,jdbcType=TIMESTAMP}, #{status,jdbcType=BOOLEAN}, #{remark,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.glxp.api.admin.entity.inventory.InvCountOrder">
-        <!--@mbg.generated-->
         insert into inv_count_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -301,4 +300,8 @@
             </if>
         </where>
     </select>
+
+    <select id="selectOrderIdById" resultType="java.lang.String">
+        select orderId from inv_count_order where id = #{id}
+    </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml

@@ -264,4 +264,17 @@
              #{item.profitNum,jdbcType=INTEGER}, #{item.lossNum,jdbcType=INTEGER}, #{item.status,jdbcType=BOOLEAN})
         </foreach>
     </insert>
+
+    <delete id="deleteByOrderId">
+        delete
+        from io_order_detail
+        where orderIdFk = #{orderId}
+    </delete>
+
+    <select id="filterList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from inv_count_order_detail
+        where orderIdFk = #{orderIdFk}
+    </select>
 </mapper>