维多利亚

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "order_follow";
+        CodeGenerator.INCLUDE = "check_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/check/CheckDetails.java

@@ -0,0 +1,58 @@
+package com.fjhx.entity.check;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckDetails extends BaseEntity {
+
+
+    /**
+     * 盘点id
+     */
+    private Long checkInfoId;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 库存数量
+     */
+    private BigDecimal inventoryQuantity;
+
+    /**
+     * 盘点数量
+     */
+    private BigDecimal checkQuantity;
+
+    /**
+     * 盘点结果 0正常 1异常
+     */
+    private Integer resultType;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/check/CheckInfo.java

@@ -0,0 +1,49 @@
+package com.fjhx.entity.check;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckInfo extends BaseEntity {
+
+
+    /**
+     * 盘点单号
+     */
+    private String code;
+
+    /**
+     * 盘点仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 盘点结论 0正常 1异常
+     */
+    private Integer resultType;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/check/CheckDetailsEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.check;
+
+import com.fjhx.entity.check.CheckDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckDetailsEx extends CheckDetails {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/check/CheckDetailsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.check;
+
+import com.fjhx.entity.check.CheckDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckDetailsVo extends CheckDetails {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/check/CheckInfoEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.check;
+
+import com.fjhx.entity.check.CheckInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckInfoEx extends CheckInfo {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/check/CheckInfoVo.java

@@ -0,0 +1,23 @@
+package com.fjhx.params.check;
+
+import com.fjhx.entity.check.CheckDetails;
+import com.fjhx.entity.check.CheckInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckInfoVo extends CheckInfo {
+
+    /**
+     * 盘点明细
+     */
+    private List<CheckDetails> checkDetailsList;
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/check/CheckDetailsController.java

@@ -0,0 +1,65 @@
+package com.fjhx.controller.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.check.CheckDetails;
+import com.fjhx.params.check.CheckDetailsVo;
+import com.fjhx.service.check.CheckDetailsService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@RestController
+@RequestMapping("/checkDetails")
+public class CheckDetailsController {
+
+    @Autowired
+    private CheckDetailsService checkDetailsService;
+
+    @PostMapping("/list")
+    public R list(@RequestBody Condition condition) {
+        Long checkInfoId = condition.getLong("checkInfoId");
+        List<Map<String, Object>> result = checkDetailsService.getList(checkInfoId);
+        return R.success(result);
+    }
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, Object> condition) {
+        Page<CheckDetails> result = checkDetailsService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody CheckDetailsVo checkDetailsVo) {
+        checkDetailsService.add(checkDetailsVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody CheckDetailsVo checkDetailsVo) {
+        checkDetailsService.edit(checkDetailsVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody CheckDetailsVo checkDetailsVo) {
+        checkDetailsService.delete(checkDetailsVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/controller/check/CheckInfoController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
+import com.fjhx.params.check.CheckInfoVo;
+import com.fjhx.service.check.CheckInfoService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@RestController
+@RequestMapping("/checkInfo")
+public class CheckInfoController {
+
+    @Autowired
+    private CheckInfoService checkInfoService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Condition condition){
+        Page<Map<String, Object>> result = checkInfoService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody CheckInfoVo checkInfoVo){
+        checkInfoService.add(checkInfoVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody CheckInfoVo checkInfoVo){
+        checkInfoService.edit(checkInfoVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody CheckInfoVo checkInfoVo){
+        checkInfoService.delete(checkInfoVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/controller/warehouse/WarehouseController.java

@@ -1,6 +1,7 @@
 package com.fjhx.controller.warehouse;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.warehouse.Warehouse;
 import com.fjhx.params.warehouse.WarehouseVo;
 import com.fjhx.service.warehouse.WarehouseService;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -61,5 +63,12 @@ public class WarehouseController {
     public R select() {
         return R.success(warehouseService.select());
     }
+
+    @PostMapping("list")
+    public R getList() {
+        List<Warehouse> list = warehouseService.list(q -> q.select(BaseEntity::getId, Warehouse::getName, Warehouse::getType));
+        return R.success(list);
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/check/CheckDetailsMapper.java

@@ -0,0 +1,22 @@
+package com.fjhx.mapper.check;
+
+import com.fjhx.entity.check.CheckDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+public interface CheckDetailsMapper extends BaseMapper<CheckDetails> {
+
+    List<Map<String, Object>> getList(@Param("checkInfoId") Long checkInfoId);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/check/CheckDetailsMapper.xml

@@ -0,0 +1,18 @@
+<?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.fjhx.mapper.check.CheckDetailsMapper">
+
+    <select id="getList" resultType="java.util.Map">
+        select pi.code,
+               pi.name,
+               pi.type,
+               pi.unit,
+               cd.inventory_quantity,
+               cd.check_quantity,
+               cd.result_type
+        from check_details cd
+                 left join product_info pi on cd.product_id = pi.id
+        where cd.check_info_id = #{checkInfoId}
+    </select>
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/check/CheckInfoMapper.java

@@ -0,0 +1,23 @@
+package com.fjhx.mapper.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.check.CheckInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+public interface CheckInfoMapper extends BaseMapper<CheckInfo> {
+
+    Page<Map<String, Object>> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CheckInfo> wrapper);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/check/CheckInfoMapper.xml

@@ -0,0 +1,18 @@
+<?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.fjhx.mapper.check.CheckInfoMapper">
+
+    <select id="getPage" resultType="java.util.Map">
+        select ci.id,
+               ci.code,
+               w.type warehouseType,
+               w.name warehouseName,
+               ci.create_time,
+               ci.create_user,
+               ci.result_type
+        from check_info ci
+                 left join warehouse w on ci.warehouse_id = w.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/check/CheckDetailsService.java

@@ -0,0 +1,31 @@
+package com.fjhx.service.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.check.CheckDetails;
+import com.fjhx.params.check.CheckDetailsVo;
+import com.fjhx.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+public interface CheckDetailsService extends BaseService<CheckDetails> {
+
+    Page<CheckDetails> getPage(Map<String, Object> condition);
+
+    void add(CheckDetailsVo checkDetailsVo);
+
+    void edit(CheckDetailsVo checkDetailsVo);
+
+    void delete(CheckDetailsVo checkDetailsVo);
+
+    List<Map<String, Object>> getList(Long checkInfoId);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/check/CheckInfoService.java

@@ -0,0 +1,29 @@
+package com.fjhx.service.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.check.CheckInfo;
+import com.fjhx.params.check.CheckInfoVo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+public interface CheckInfoService extends BaseService<CheckInfo> {
+
+    Page<Map<String, Object>> getPage(Condition condition);
+
+    void add(CheckInfoVo checkInfoVo);
+
+    void edit(CheckInfoVo checkInfoVo);
+
+    void delete(CheckInfoVo checkInfoVo);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/check/impl/CheckDetailsServiceImpl.java

@@ -0,0 +1,56 @@
+package com.fjhx.service.check.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.check.CheckDetails;
+import com.fjhx.mapper.check.CheckDetailsMapper;
+import com.fjhx.params.check.CheckDetailsVo;
+import com.fjhx.service.check.CheckDetailsService;
+import com.fjhx.utils.Assert;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Service
+public class CheckDetailsServiceImpl extends ServiceImpl<CheckDetailsMapper, CheckDetails> implements CheckDetailsService {
+
+    @Override
+    public Page<CheckDetails> getPage(Map<String, Object> condition) {
+
+        IWrapper<CheckDetails> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(CheckDetailsVo checkDetailsVo) {
+        save(checkDetailsVo);
+    }
+
+    @Override
+    public void edit(CheckDetailsVo checkDetailsVo) {
+        updateById(checkDetailsVo);
+    }
+
+    @Override
+    public void delete(CheckDetailsVo checkDetailsVo) {
+        removeById(checkDetailsVo.getId());
+    }
+
+    @Override
+    public List<Map<String, Object>> getList(Long checkInfoId) {
+        Assert.notEmpty(checkInfoId, "盘点id不能为空");
+        return baseMapper.getList(checkInfoId);
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/check/impl/CheckInfoServiceImpl.java

@@ -0,0 +1,112 @@
+package com.fjhx.service.check.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.check.CheckDetails;
+import com.fjhx.entity.check.CheckInfo;
+import com.fjhx.entity.warehouse.Warehouse;
+import com.fjhx.mapper.check.CheckInfoMapper;
+import com.fjhx.params.check.CheckInfoVo;
+import com.fjhx.service.check.CheckDetailsService;
+import com.fjhx.service.check.CheckInfoService;
+import com.fjhx.uitl.code.CodeEnum;
+import com.fjhx.utils.Assert;
+import com.fjhx.utils.UserClientUtil;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-23
+ */
+@Service
+public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo> implements CheckInfoService {
+
+    @Autowired
+    private CheckDetailsService checkDetailsService;
+
+    @Override
+    public Page<Map<String, Object>> getPage(Condition condition) {
+
+        IWrapper<CheckInfo> wrapper = IWrapper.getWrapper(condition);
+        wrapper.eq("w", Warehouse::getType, condition.get("warehouseType"))
+                .eq("ci", CheckInfo::getResultType)
+                .eq("ci", CheckInfo::getCode)
+                .like("w", Warehouse::getName, condition.get("warehouseName"))
+                .eq("ci", CheckInfo::getCreateUser)
+                .periodTime("ci", CheckInfo::getCreateTime);
+
+        Page<Map<String, Object>> page = baseMapper.getPage(condition.getPage(), wrapper);
+
+        List<Map<String, Object>> records = page.getRecords();
+        UserClientUtil.setUserName(records, "createUser", "createUserName");
+        return page;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(CheckInfoVo checkInfoVo) {
+        Long id = IdWorker.getId();
+
+        Long warehouseId = checkInfoVo.getWarehouseId();
+        Assert.notEmpty(warehouseId, "仓库id不能为空");
+
+        int checkResultType = 0;
+
+        List<CheckDetails> checkDetailsList = checkInfoVo.getCheckDetailsList();
+
+        for (CheckDetails checkDetails : checkDetailsList) {
+            BigDecimal checkQuantity = checkDetails.getCheckQuantity();
+            BigDecimal inventoryQuantity = checkDetails.getInventoryQuantity();
+
+            Assert.notEmpty(checkDetails.getProductId(), "产品id不能为空");
+            Assert.notEmpty(checkQuantity, "盘点数量不能为空");
+            Assert.notEmpty(inventoryQuantity, "现有库存不能为空");
+
+            checkDetails.setCheckInfoId(id);
+
+            int compareTo = inventoryQuantity.compareTo(checkQuantity);
+            if (compareTo > 0) {
+                checkDetails.setResultType(2);
+                checkResultType = 1;
+            } else if (compareTo < 0) {
+                checkDetails.setResultType(1);
+                checkResultType = 1;
+            } else {
+                checkDetails.setResultType(0);
+            }
+        }
+
+        synchronized (this) {
+            checkInfoVo.setId(id);
+            checkInfoVo.setResultType(checkResultType);
+            checkInfoVo.setCode(CodeEnum.CHECK_CODE.getCode());
+            save(checkInfoVo);
+        }
+
+        checkDetailsService.saveBatch(checkDetailsList);
+    }
+
+    @Override
+    public void edit(CheckInfoVo checkInfoVo) {
+        updateById(checkInfoVo);
+    }
+
+    @Override
+    public void delete(CheckInfoVo checkInfoVo) {
+        removeById(checkInfoVo.getId());
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.service.apply.ApplyPurchaseService;
+import com.fjhx.service.check.CheckInfoService;
 import com.fjhx.service.customer.CustomerInfoService;
 import com.fjhx.service.order.OrderInfoService;
 import com.fjhx.service.product.ProductInfoService;
@@ -52,8 +53,8 @@ public enum CodeEnum {
     JD_IN_JOURNAL("JDI", "yyyyMM-", "code", 5, StockJournalService.class),
     // 销售入库流水单号
     S_IN_JOURNAL("SI", "yyyyMM-", "code", 5, StockJournalService.class),
-
-    ;
+    // 盘点单号
+    CHECK_CODE("CK", "yyyyMM-", "code", 5, CheckInfoService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;