线边管理

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductClassifyServiceImpl.java

@@ -2,7 +2,9 @@ package com.fjhx.item.service.product.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.dto.ProductClassifyDto;
 import com.fjhx.item.entity.product.po.ProductClassify;
 import com.fjhx.item.mapper.product.ProductClassifyMapper;
@@ -22,6 +24,7 @@ import java.util.List;
  * @author zlj
  * @since 2023-03-15
  */
+@DS(SourceConstant.ITEM)
 @Service
 public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMapper, ProductClassify> implements ProductClassifyService {
 

hx-mes/src/main/java/com/fjhx/mes/controller/border/BorderOfLineController.java

@@ -0,0 +1,71 @@
+package com.fjhx.mes.controller.border;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineSelectDto;
+import com.fjhx.mes.entity.border.dto.BorderOfLineDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.service.border.BorderOfLineService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 线边管理 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@DS(SourceConstant.MES)
+@RestController
+@RequestMapping("/borderOfLine")
+public class BorderOfLineController {
+
+    @Autowired
+    private BorderOfLineService borderOfLineService;
+
+    /**
+     * 线边管理分页
+     */
+    @PostMapping("/page")
+    public Page<BorderOfLineVo> page(@RequestBody BorderOfLineSelectDto dto) {
+        return borderOfLineService.getPage(dto);
+    }
+
+    /**
+     * 线边管理明细
+     */
+    @PostMapping("/detail")
+    public BorderOfLineVo detail(@RequestBody BaseSelectDto dto) {
+        return borderOfLineService.detail(dto.getId());
+    }
+
+    /**
+     * 线边管理新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BorderOfLineDto borderOfLineDto) {
+        borderOfLineService.add(borderOfLineDto);
+    }
+
+    /**
+     * 线边管理编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BorderOfLineDto borderOfLineDto) {
+        borderOfLineService.edit(borderOfLineDto);
+    }
+
+    /**
+     * 线边管理删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        borderOfLineService.delete(dto.getId());
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/controller/border/BorderOfLineJournalController.java

@@ -0,0 +1,68 @@
+package com.fjhx.mes.controller.border;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalSelectDto;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.service.border.BorderOfLineJournalService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 线边流水记录 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@RestController
+@RequestMapping("/borderOfLineJournal")
+public class BorderOfLineJournalController {
+
+    @Autowired
+    private BorderOfLineJournalService borderOfLineJournalService;
+
+    /**
+     * 线边流水记录分页
+     */
+    @PostMapping("/page")
+    public Page<BorderOfLineJournalVo> page(@RequestBody BorderOfLineJournalSelectDto dto) {
+        return borderOfLineJournalService.getPage(dto);
+    }
+
+    /**
+     * 线边流水记录明细
+     */
+    @PostMapping("/detail")
+    public BorderOfLineJournalVo detail(@RequestBody BaseSelectDto dto) {
+        return borderOfLineJournalService.detail(dto.getId());
+    }
+
+    /**
+     * 线边流水记录新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BorderOfLineJournalDto borderOfLineJournalDto) {
+        borderOfLineJournalService.add(borderOfLineJournalDto);
+    }
+
+    /**
+     * 线边流水记录编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BorderOfLineJournalDto borderOfLineJournalDto) {
+        borderOfLineJournalService.edit(borderOfLineJournalDto);
+    }
+
+    /**
+     * 线边流水记录删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        borderOfLineJournalService.delete(dto.getId());
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/dto/BorderOfLineDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.mes.entity.border.dto;
+
+import com.fjhx.mes.entity.border.po.BorderOfLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边管理新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineDto extends BorderOfLine {
+
+    /**操作类型*/
+    private Integer type;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/dto/BorderOfLineJournalDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.border.dto;
+
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边流水记录新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineJournalDto extends BorderOfLineJournal {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/dto/BorderOfLineJournalSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.border.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边流水记录列表查询入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineJournalSelectDto extends BaseSelectDto {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/dto/BorderOfLineSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.border.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边管理列表查询入参实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineSelectDto extends BaseSelectDto {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/po/BorderOfLine.java

@@ -0,0 +1,34 @@
+package com.fjhx.mes.entity.border.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线边管理
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+@TableName("border_of_line")
+public class BorderOfLine extends BasePo {
+
+    /**
+     * 物料id
+     */
+    private Long productId;
+
+    /**
+     * 线边数量
+     */
+    private BigDecimal quantity;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/po/BorderOfLineJournal.java

@@ -0,0 +1,39 @@
+package com.fjhx.mes.entity.border.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线边流水记录
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+@TableName("border_of_line_journal")
+public class BorderOfLineJournal extends BasePo {
+
+    /**
+     * 线边管理id
+     */
+    private Long borderOfLineId;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 操作类型 1用料 2回仓 3报废 4其他 5添加
+     */
+    private Integer type;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/vo/BorderOfLineJournalVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.border.vo;
+
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边流水记录列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineJournalVo extends BorderOfLineJournal {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/border/vo/BorderOfLineVo.java

@@ -0,0 +1,27 @@
+package com.fjhx.mes.entity.border.vo;
+
+import com.fjhx.mes.entity.border.po.BorderOfLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 线边管理列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Getter
+@Setter
+public class BorderOfLineVo extends BorderOfLine {
+
+    /**
+     * 物料名称
+     */
+    private String productName;
+
+    /**
+     * 物料类型
+     */
+    private String productTypeName;
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/border/BorderOfLineJournalMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.border;
+
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 线边流水记录 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface BorderOfLineJournalMapper extends BaseMapper<BorderOfLineJournal> {
+
+    /**
+     * 线边流水记录分页
+     */
+    Page<BorderOfLineJournalVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BorderOfLineJournal> wrapper);
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/border/BorderOfLineMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.border;
+
+import com.fjhx.mes.entity.border.po.BorderOfLine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 线边管理 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface BorderOfLineMapper extends BaseMapper<BorderOfLine> {
+
+    /**
+     * 线边管理分页
+     */
+    Page<BorderOfLineVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BorderOfLine> wrapper);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/border/BorderOfLineJournalService.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.service.border;
+
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalSelectDto;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalDto;
+
+
+/**
+ * <p>
+ * 线边流水记录 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface BorderOfLineJournalService extends BaseService<BorderOfLineJournal> {
+
+    /**
+     * 线边流水记录分页
+     */
+    Page<BorderOfLineJournalVo> getPage(BorderOfLineJournalSelectDto dto);
+
+    /**
+     * 线边流水记录明细
+     */
+    BorderOfLineJournalVo detail(Long id);
+
+    /**
+     * 线边流水记录新增
+     */
+    void add(BorderOfLineJournalDto borderOfLineJournalDto);
+
+    /**
+     * 线边流水记录编辑
+     */
+    void edit(BorderOfLineJournalDto borderOfLineJournalDto);
+
+    /**
+     * 线边流水记录删除
+     */
+    void delete(Long id);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/border/BorderOfLineService.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.service.border;
+
+import com.fjhx.mes.entity.border.po.BorderOfLine;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineSelectDto;
+import com.fjhx.mes.entity.border.dto.BorderOfLineDto;
+
+
+/**
+ * <p>
+ * 线边管理 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+public interface BorderOfLineService extends BaseService<BorderOfLine> {
+
+    /**
+     * 线边管理分页
+     */
+    Page<BorderOfLineVo> getPage(BorderOfLineSelectDto dto);
+
+    /**
+     * 线边管理明细
+     */
+    BorderOfLineVo detail(Long id);
+
+    /**
+     * 线边管理新增
+     */
+    void add(BorderOfLineDto borderOfLineDto);
+
+    /**
+     * 线边管理编辑
+     */
+    void edit(BorderOfLineDto borderOfLineDto);
+
+    /**
+     * 线边管理删除
+     */
+    void delete(Long id);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/border/impl/BorderOfLineJournalServiceImpl.java

@@ -0,0 +1,60 @@
+package com.fjhx.mes.service.border.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import com.fjhx.mes.mapper.border.BorderOfLineJournalMapper;
+import com.fjhx.mes.service.border.BorderOfLineJournalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.mes.entity.border.dto.BorderOfLineJournalDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 线边流水记录 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@DS(SourceConstant.MES)
+@Service
+public class BorderOfLineJournalServiceImpl extends ServiceImpl<BorderOfLineJournalMapper, BorderOfLineJournal> implements BorderOfLineJournalService {
+
+    @Override
+    public Page<BorderOfLineJournalVo> getPage(BorderOfLineJournalSelectDto dto) {
+        IWrapper<BorderOfLineJournal> wrapper = getWrapper();
+        wrapper.orderByDesc("bolj", BorderOfLineJournal::getId);
+        Page<BorderOfLineJournalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public BorderOfLineJournalVo detail(Long id) {
+        BorderOfLineJournal BorderOfLineJournal = this.getById(id);
+        BorderOfLineJournalVo result = BeanUtil.toBean(BorderOfLineJournal, BorderOfLineJournalVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(BorderOfLineJournalDto borderOfLineJournalDto) {
+        this.save(borderOfLineJournalDto);
+    }
+
+    @Override
+    public void edit(BorderOfLineJournalDto borderOfLineJournalDto) {
+        this.updateById(borderOfLineJournalDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/border/impl/BorderOfLineServiceImpl.java

@@ -0,0 +1,152 @@
+package com.fjhx.mes.service.border.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fjhx.item.entity.product.po.ProductClassify;
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductClassifyService;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.mes.entity.border.po.BorderOfLine;
+import com.fjhx.mes.entity.border.po.BorderOfLineJournal;
+import com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo;
+import com.fjhx.mes.mapper.border.BorderOfLineMapper;
+import com.fjhx.mes.service.border.BorderOfLineJournalService;
+import com.fjhx.mes.service.border.BorderOfLineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.service.stock.StockWaitService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
+import com.fjhx.mes.entity.border.dto.BorderOfLineSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.mes.entity.border.dto.BorderOfLineDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 线边管理 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-31
+ */
+@Service
+public class BorderOfLineServiceImpl extends ServiceImpl<BorderOfLineMapper, BorderOfLine> implements BorderOfLineService {
+    @Autowired
+    BorderOfLineJournalService borderOfLineJournalService;
+    @Autowired
+    ProductInfoService productInfoService;
+    @Autowired
+    ProductClassifyService productClassifyService;
+    @Autowired
+    StockWaitService stockWaitService;
+
+    @Override
+    public Page<BorderOfLineVo> getPage(BorderOfLineSelectDto dto) {
+        IWrapper<BorderOfLine> wrapper = getWrapper();
+        wrapper.orderByDesc("bol", BorderOfLine::getId);
+        Page<BorderOfLineVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<BorderOfLineVo> records = page.getRecords();
+        //赋值产品信息
+        List<Long> productIds = records.stream().map(BorderOfLine::getProductId).collect(Collectors.toList());
+        if(ObjectUtil.isNotEmpty(productIds)) {
+            List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
+            if(ObjectUtil.isNotEmpty(productInfos)) {
+                List<Long> productClassifyIds = productInfos.stream().map(ProductInfo::getProductClassifyId).collect(Collectors.toList());
+                if(ObjectUtil.isNotEmpty(productClassifyIds)) {
+                    List<ProductClassify> productClassifies = productClassifyService.listByIds(productClassifyIds);
+                    if(ObjectUtil.isNotEmpty(productClassifies)) {
+                        Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
+                                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+                        Map<Long, ProductClassify> productClassifyMap = productClassifies.stream().collect(Collectors.groupingBy(ProductClassify::getId,
+                                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+                        for (BorderOfLineVo borderOfLineVo : records) {
+                            ProductInfo productInfo = productInfoMap.get(borderOfLineVo.getProductId());
+                            if (ObjectUtil.isNotEmpty(productInfo)){
+                                borderOfLineVo.setProductName(productInfo.getName());
+                                ProductClassify productClassify = productClassifyMap.get(productInfo.getProductClassifyId());
+                                if (ObjectUtil.isNotEmpty(productClassify)){
+                                    borderOfLineVo.setProductTypeName(productClassify.getName());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return page;
+    }
+
+    @Override
+    public BorderOfLineVo detail(Long id) {
+        BorderOfLine BorderOfLine = this.getById(id);
+        BorderOfLineVo result = BeanUtil.toBean(BorderOfLine, BorderOfLineVo.class);
+        ProductInfo productInfo = productInfoService.getById(result.getProductId());
+        if(ObjectUtil.isNotEmpty(productInfo)){
+            result.setProductName(productInfo.getName());
+            ProductClassify productClassify = productClassifyService.getById(productInfo.getProductClassifyId());
+            if(ObjectUtil.isNotEmpty(productClassify)){
+                result.setProductTypeName(productClassify.getName());
+            }
+        }
+        return result;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(BorderOfLineDto borderOfLineDto) {
+        BorderOfLine borderOfLine = getOne(q -> q.eq(BorderOfLine::getProductId, borderOfLineDto.getProductId()));
+        if(ObjectUtil.isNotEmpty(borderOfLine)){
+            borderOfLine.setQuantity(borderOfLine.getQuantity().add(borderOfLineDto.getQuantity()));
+        }else {
+            borderOfLine = BeanUtil.toBean(borderOfLineDto,BorderOfLine.class);
+        }
+        saveOrUpdate(borderOfLine);
+        //创建流水记录
+        BorderOfLineJournal borderOfLineJournal = new BorderOfLineJournal();
+        borderOfLineJournal.setBorderOfLineId(borderOfLine.getId());
+        borderOfLineJournal.setQuantity(borderOfLineDto.getQuantity());
+        borderOfLineJournal.setType(5);
+        borderOfLineJournalService.save(borderOfLineJournal);
+    }
+
+    @Override
+    public void edit(BorderOfLineDto borderOfLineDto) {
+        BorderOfLine borderOfLine = getById(borderOfLineDto.getId());
+        borderOfLine.setQuantity(borderOfLine.getQuantity().subtract(borderOfLineDto.getQuantity()));
+        updateById(borderOfLine);
+        //创建流水记录
+        BorderOfLineJournal borderOfLineJournal = new BorderOfLineJournal();
+        borderOfLineJournal.setBorderOfLineId(borderOfLine.getId());
+        borderOfLineJournal.setQuantity(borderOfLineDto.getQuantity());
+        borderOfLineJournal.setType(borderOfLineDto.getType());
+        borderOfLineJournalService.save(borderOfLineJournal);
+        //如果类型是"回仓"创建待入库数据
+        if(borderOfLineDto.getType()==2){
+            StockWait stockWait = new StockWait();
+            stockWait.setType(1);
+            stockWait.setBusinessType(1);
+            stockWait.setBusinessId(borderOfLineJournal.getId());
+            stockWait.setProductId(borderOfLine.getProductId());
+            stockWait.setQuantity(borderOfLineDto.getQuantity());
+            stockWait.setReceiptQuantity(BigDecimal.ZERO);
+            stockWait.setStatus(0);
+            stockWaitService.save(stockWait);
+        }
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mes/src/main/resources/mapper/border/BorderOfLineJournalMapper.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.mes.mapper.border.BorderOfLineJournalMapper">
+    <select id="getPage" resultType="com.fjhx.mes.entity.border.vo.BorderOfLineJournalVo">
+        select
+            bolj.id,
+            bolj.border_of_line_id,
+            bolj.quantity,
+            bolj.type,
+            bolj.create_user,
+            bolj.create_time,
+            bolj.update_user,
+            bolj.update_time
+        from border_of_line_journal bolj
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-mes/src/main/resources/mapper/border/BorderOfLineMapper.xml

@@ -0,0 +1,17 @@
+<?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.mes.mapper.border.BorderOfLineMapper">
+    <select id="getPage" resultType="com.fjhx.mes.entity.border.vo.BorderOfLineVo">
+        select
+            bol.id,
+            bol.product_id,
+            bol.quantity,
+            bol.create_user,
+            bol.create_time,
+            bol.update_user,
+            bol.update_time
+        from border_of_line bol
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>