结构重构

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockArea.java

@@ -0,0 +1,66 @@
+package com.fjhx.entity.stock;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 仓库
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+@Data
+public class StockArea implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 软删除
+     */
+    @TableField("IsDelete")
+    private Boolean isdelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date createdtime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date updatedtime;
+
+    /**
+     * 仓库名称
+     */
+    @TableField("Name")
+    private String name;
+
+    /**
+     * 仓库名称
+     */
+    @TableField("StockHouseId")
+    private String stockhouseId;
+
+    /**
+     * 仓库名称
+     */
+    @TableField("Remark")
+    private String remark;
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockDetail.java

@@ -0,0 +1,121 @@
+package com.fjhx.entity.stock;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 物料库存明细
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+@Data
+public class StockDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 软删除
+     */
+    @TableField("IsDelete")
+    private Boolean isdelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date createdtime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date updatedtime;
+
+    /**
+     * 物料编号
+     */
+    @TableField("MaterialCode")
+    private String materialcode;
+
+    /**
+     * 仓库ID
+     */
+    @TableField("StockHouseId")
+    private String stockhouseid;
+
+    /**
+     * 放置区域
+     */
+    @TableField("PlaceAreaId")
+    private String placeareaid;
+
+    /**
+     * 物料数量
+     */
+    @TableField("Quantity")
+    private BigDecimal quantity;
+
+    /**
+     * 二维码
+     */
+    @TableField("QRCode")
+    private String qrcode;
+
+    /**
+     * RFID码
+     */
+    @TableField("RfidCode")
+    private String rfidcode;
+
+    /**
+     * 是否自动盘点
+     */
+    @TableField("IsAutoCheck")
+    private Boolean isautocheck;
+
+    /**
+     * 单价
+     */
+    @TableField("Price")
+    private BigDecimal price;
+
+    /**
+     * 批次号
+     */
+    @TableField("BatchNo")
+    private String batchno;
+
+    /**
+     * 是否确认在库
+     */
+    @TableField("IsSureInStock")
+    private Boolean issureinstock;
+
+    /**
+     * 确认在库过期时间 一个礼拜
+     */
+    @TableField("ExpiredDt")
+    private Date expireddt;
+
+    /**
+     * 手工盘点所有库存标签（不过滤手动盘点修正后的标签）
+     */
+    @TableField("HandleCheck")
+    private Boolean handlecheck;
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockAreaController.java

@@ -0,0 +1,40 @@
+package com.fjhx.stock.controller;
+
+import com.fjhx.entity.stock.StockArea;
+import com.fjhx.stock.service.StockAreaService;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+@TenantIgnore
+@RestController
+@RequestMapping("/stockArea")
+public class StockAreaController {
+
+    @Autowired
+    private StockAreaService stockAreaService;
+
+    /**
+     * 货架id
+     */
+    @PostMapping("/list")
+    public R list() {
+        List<StockArea> result = stockAreaService.getList();
+        return R.success(result);
+    }
+
+}
+

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockDetailController.java

@@ -0,0 +1,51 @@
+package com.fjhx.stock.controller;
+
+import com.fjhx.entity.stock.StockDetail;
+import com.fjhx.stock.service.StockDetailService;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+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-08-01
+ */
+@TenantIgnore
+@RestController
+@RequestMapping("/stockDetail")
+public class StockDetailController {
+
+    @Autowired
+    private StockDetailService stockDetailService;
+
+    /**
+     * 根据qrcode查询物料信息
+     */
+    @PostMapping("/getMaterialInfoByQrCode")
+    public R getMaterialInfoByQrCode(@RequestBody Map<String, String> condition) {
+        Map<String,Object> result = stockDetailService.getMaterialInfoByQrCode(condition);
+        return R.success(result);
+    }
+
+    /**
+     * 赋值货架
+     */
+    @PostMapping("/setAreaId")
+    public R setAreaId(@RequestBody List<StockDetail> stockDetail) {
+        stockDetailService.setAreaId(stockDetail);
+        return R.success();
+    }
+
+}
+

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockAreaMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.stock.mapper;
+
+import com.fjhx.entity.stock.StockArea;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 仓库 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+public interface StockAreaMapper extends BaseMapper<StockArea> {
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockAreaMapper.xml

@@ -0,0 +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.fjhx.stock.mapper.StockAreaMapper">
+
+</mapper>

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockDetailMapper.java

@@ -0,0 +1,21 @@
+package com.fjhx.stock.mapper;
+
+import com.fjhx.entity.stock.StockDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料库存明细 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+public interface StockDetailMapper extends BaseMapper<StockDetail> {
+
+    Map<String,Object> getMaterialInfoByQrCode(@Param("qrCode") String qrCode);
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockDetailMapper.xml

@@ -0,0 +1,19 @@
+<?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.stock.mapper.StockDetailMapper">
+
+    <select id="getMaterialInfoByQrCode" resultType="java.util.Map">
+        select sd.id,
+               m.Name  materialName,
+               m.Code  materialCode,
+               sd.Quantity,
+               sh.Name houseName,
+               sd.PlaceAreaId
+        from stock_detail sd
+                 left join stock_tag st on sd.QRCode = st.QRCode
+                 left join material m on st.MaterialCode = m.code
+                 left join stock_house sh on sh.ID = sd.StockHouseId
+        where sd.QRCode = #{qrCode}
+    </select>
+
+</mapper>

hx-service/storage/src/main/java/com/fjhx/stock/service/StockAreaService.java

@@ -0,0 +1,20 @@
+package com.fjhx.stock.service;
+
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.stock.StockArea;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+public interface StockAreaService extends BaseService<StockArea> {
+
+    List<StockArea> getList();
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/service/StockDetailService.java

@@ -0,0 +1,23 @@
+package com.fjhx.stock.service;
+
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.stock.StockDetail;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料库存明细 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+public interface StockDetailService extends BaseService<StockDetail> {
+
+    Map<String,Object> getMaterialInfoByQrCode(Map<String, String> condition);
+
+    void setAreaId(List<StockDetail> stockDetail);
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockAreaServiceImpl.java

@@ -0,0 +1,31 @@
+package com.fjhx.stock.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.stock.StockArea;
+import com.fjhx.stock.mapper.StockAreaMapper;
+import com.fjhx.stock.service.StockAreaService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+@Service
+public class StockAreaServiceImpl extends ServiceImpl<StockAreaMapper, StockArea> implements StockAreaService {
+
+    @Override
+    public List<StockArea> getList() {
+        return list(Wrappers.<StockArea>lambdaQuery()
+                .eq(StockArea::getIsdelete, 0)
+                .eq(StockArea::getStockhouseId, "c185883dba22478cb593d33f6b66cc53")
+        );
+    }
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -0,0 +1,44 @@
+package com.fjhx.stock.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.stock.StockDetail;
+import com.fjhx.stock.mapper.StockDetailMapper;
+import com.fjhx.stock.service.StockDetailService;
+import com.fjhx.utils.Assert;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料库存明细 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-01
+ */
+@Service
+@TenantIgnore
+public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, StockDetail> implements StockDetailService {
+
+    @Override
+    public Map<String, Object> getMaterialInfoByQrCode(Map<String, String> condition) {
+        String qrCode = condition.get("qrCode");
+        Assert.notEmpty(qrCode, "二维码不能为空");
+
+        Map<String, Object> result = baseMapper.getMaterialInfoByQrCode(qrCode);
+
+        Assert.notEmpty(result, "没有找到此物料");
+
+        return result;
+    }
+
+    @Override
+    public void setAreaId(List<StockDetail> stockDetail) {
+        updateBatchById(stockDetail);
+    }
+
+
+}