楚江ERP:订货单撤销 实体、基础方法建设

@@ -144,6 +144,13 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String examineStatus;
 
     /**
+     * 撤销状态
+     */
+    @ApiModelProperty("撤销状态")
+    private String revokeStatus;
+
+
+    /**
      * 生产工艺
      */
     @ApiModelProperty("生产工艺")

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
+import java.util.List;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -49,6 +50,12 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     private String orderingUnit;
 
     /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
      * 原订货日期
      */
     @ApiModelProperty("原订货日期")
@@ -99,6 +106,12 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     @ApiModelProperty("创建人")
     private String createBy;
 
+    /**
+     * 订货单撤销表物料行
+     */
+    @ApiModelProperty("订货单撤销表物料行")
+    private List<GetPurchaseOrderRevokeLineBo> getPurchaseOrderRevokeLineBoList;
+
     public GetPurchaseOrderRevokeBo() {
 
     }

+package com.lframework.xingyun.sc.bo.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订货单撤销表物料行 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetPurchaseOrderRevokeLineBo extends BaseBo<PurchaseOrderRevokeLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 订货单撤销主表ID
+     */
+    @ApiModelProperty("订货单撤销主表ID")
+    private String purchaseOrderRevokeId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 原数量kg
+     */
+    @ApiModelProperty("原数量kg")
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    private BigDecimal salesPrice;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 撤销数量kg
+     */
+    @ApiModelProperty("撤销数量kg")
+    private BigDecimal revokeQuantity;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
+    public GetPurchaseOrderRevokeLineBo() {
+
+    }
+
+    public GetPurchaseOrderRevokeLineBo(PurchaseOrderRevokeLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PurchaseOrderRevokeLine> convert(PurchaseOrderRevokeLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PurchaseOrderRevokeLine dto) {
+
+    }
+}

 package com.lframework.xingyun.sc.controller.order;
 
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeBo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
+import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeLineBo;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeService;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderRevokeVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderRevokeVo;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +46,10 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
 
     @Autowired
     private PurchaseOrderRevokeService purchaseOrderRevokeService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
 
     /**
      * 查询列表
@@ -66,7 +77,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:query"})
-    @GetMapping
+    @GetMapping("/get")
     public InvokeResult<GetPurchaseOrderRevokeBo> get(@NotBlank(message = "id不能为空！") String id) {
 
         PurchaseOrderRevoke data = purchaseOrderRevokeService.findById(id);
@@ -80,11 +91,29 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     }
 
     /**
+     * 根据订货单ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:query"})
+    @GetMapping("/getByPurchaseOrderId")
+    public InvokeResult<GetPurchaseOrderRevokeBo> getByPurchaseOrderId(@NotBlank(message = "id不能为空！") String id) {
+
+        PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("订货单表不存在！");
+        }
+        //封装数据
+        GetPurchaseOrderRevokeBo getPurchaseOrderRevokeBo = packPurchaseOrderRevokeData(data);
+
+        return InvokeResultBuilder.success(getPurchaseOrderRevokeBo);
+    }
+    /**
      * 新增
      */
     @ApiOperation("新增")
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:add"})
-    @PostMapping
+    @PostMapping("/create")
     public InvokeResult<Void> create(@Valid CreatePurchaseOrderRevokeVo vo) {
 
         purchaseOrderRevokeService.create(vo);
@@ -97,7 +126,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
      */
     @ApiOperation("修改")
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:modify"})
-    @PutMapping
+    @PutMapping("/update")
     public InvokeResult<Void> update(@Valid UpdatePurchaseOrderRevokeVo vo) {
 
         purchaseOrderRevokeService.update(vo);
@@ -111,11 +140,66 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:delete"})
-    @DeleteMapping
+    @DeleteMapping("/deleteById")
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 
         purchaseOrderRevokeService.deleteById(id);
 
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 封装订货单撤销数据
+     *
+     * @param purchaseOrderInfo 数据实体
+     * @return GetPurchaseOrderRevokeBo
+     */
+    private GetPurchaseOrderRevokeBo packPurchaseOrderRevokeData(PurchaseOrderInfo purchaseOrderInfo) {
+        GetPurchaseOrderRevokeBo data = new GetPurchaseOrderRevokeBo();
+        if (StringUtil.isNotEmpty(purchaseOrderInfo.getId())) {
+            data.setPurchaseOrderId(purchaseOrderInfo.getId());
+        }
+        if (StringUtil.isNotEmpty(purchaseOrderInfo.getOrderNo())) {
+            data.setOrderNo(purchaseOrderInfo.getOrderNo());
+        }
+        if (StringUtil.isNotEmpty(purchaseOrderInfo.getOrderingUnit())) {
+            data.setOrderingUnit(purchaseOrderInfo.getOrderingUnit());
+        }
+        if (StringUtil.isNotEmpty(purchaseOrderInfo.getOrderingUnitName())) {
+            data.setOrderingUnitName(purchaseOrderInfo.getOrderingUnitName());
+        }
+        if (purchaseOrderInfo.getOrderDate() != null) {
+            data.setOrderDate(purchaseOrderInfo.getOrderDate());
+        }
+        QueryPurchaseOrderLineVo vo = new QueryPurchaseOrderLineVo();
+        vo.setPurchaseOrderId(purchaseOrderInfo.getId());
+        List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
+        if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
+            List<GetPurchaseOrderRevokeLineBo> revokeLineBoList = new ArrayList<>(purchaseOrderLineList.size());
+            for (PurchaseOrderLine purchaseOrderLine : purchaseOrderLineList) {
+                GetPurchaseOrderRevokeLineBo bo = new GetPurchaseOrderRevokeLineBo();
+                bo.setPurchaseOrderLineId(purchaseOrderLine.getId());
+                bo.setIndustry(purchaseOrderLine.getIndustry());
+                bo.setQuality(purchaseOrderLine.getQuality());
+                bo.setBrand(purchaseOrderLine.getBrand());
+                bo.setThickness(purchaseOrderLine.getThickness());
+                bo.setThicknessTolPos(purchaseOrderLine.getThicknessTolPos());
+                bo.setThicknessTolNeg(purchaseOrderLine.getThicknessTolNeg());
+                bo.setWidth(purchaseOrderLine.getWidth());
+                bo.setWidthTolPos(purchaseOrderLine.getWidthTolPos());
+                bo.setWidthTolNeg(purchaseOrderLine.getWidthTolNeg());
+                bo.setLength(purchaseOrderLine.getLength());
+                bo.setLengthTolPos(purchaseOrderLine.getLengthTolPos());
+                bo.setLengthTolNeg(purchaseOrderLine.getLengthTolNeg());
+                bo.setQuantity(purchaseOrderLine.getQuantity());
+                bo.setSalesPrice(purchaseOrderLine.getSalesPrice());
+                bo.setDeliveryDate(purchaseOrderLine.getDeliveryDate());
+                bo.setShowOrder(purchaseOrderLine.getShowOrder());
+                revokeLineBoList.add(bo);
+            }
+            data.setGetPurchaseOrderRevokeLineBoList(revokeLineBoList);
+        }
+
+        return data;
+    }
 }

+package com.lframework.xingyun.sc.controller.order;
+
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeLineBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderRevokeLineVo;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订货单撤销表物料行 Controller
+ *
+ */
+@Api(tags = "订货单撤销表物料行")
+@Validated
+@RestController
+@RequestMapping("/purchaseOrderRevokeLine")
+public class PurchaseOrderRevokeLineController extends DefaultBaseController {
+
+    @Autowired
+    private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"purchaseOrderRevokeLine:purchaseorderrevokeline:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetPurchaseOrderRevokeLineBo>> query(@Valid QueryPurchaseOrderRevokeLineVo vo) {
+
+        PageResult<PurchaseOrderRevokeLine> pageResult = purchaseOrderRevokeLineService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PurchaseOrderRevokeLine> datas = pageResult.getDatas();
+        List<GetPurchaseOrderRevokeLineBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetPurchaseOrderRevokeLineBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderRevokeLine:purchaseorderrevokeline:query"})
+    @GetMapping
+    public InvokeResult<GetPurchaseOrderRevokeLineBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        PurchaseOrderRevokeLine data = purchaseOrderRevokeLineService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("订货单撤销表物料行不存在！");
+        }
+
+        GetPurchaseOrderRevokeLineBo result = new GetPurchaseOrderRevokeLineBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"purchaseOrderRevokeLine:purchaseorderrevokeline:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreatePurchaseOrderRevokeLineVo vo) {
+
+        purchaseOrderRevokeLineService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"purchaseOrderRevokeLine:purchaseorderrevokeline:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdatePurchaseOrderRevokeLineVo vo) {
+
+        purchaseOrderRevokeLineService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderRevokeLine:purchaseorderrevokeline:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        purchaseOrderRevokeLineService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

@@ -131,6 +131,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String examineStatus;
 
     /**
+     * 撤销状态
+     */
+    private String revokeStatus;
+
+    /**
      * 生产工艺
      */
     private String productionProcess;

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 订货单撤销表物料行
+ * </p>
+ *
+ */
+@Data
+@TableName("tbl_purchase_order_revoke_line")
+public class PurchaseOrderRevokeLine extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "PurchaseOrderRevokeLine";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 订货单撤销主表ID
+     */
+    private String purchaseOrderRevokeId;
+
+    /**
+     * 订货单物料行ID
+     */
+    private String purchaseOrderLineId;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 品质
+     */
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 原数量kg
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    private BigDecimal salesPrice;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 撤销数量kg
+     */
+    private BigDecimal revokeQuantity;
+
+    /**
+     * 排序
+     */
+    private Integer showOrder;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.sc.impl.order;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeLineMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderRevokeLineVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PurchaseOrderRevokeLineServiceImpl extends BaseMpServiceImpl<PurchaseOrderRevokeLineMapper, PurchaseOrderRevokeLine> implements PurchaseOrderRevokeLineService {
+
+    @Override
+    public PageResult<PurchaseOrderRevokeLine> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeLineVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PurchaseOrderRevokeLine> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<PurchaseOrderRevokeLine> query(QueryPurchaseOrderRevokeLineVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public PurchaseOrderRevokeLine findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增订货单撤销表物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePurchaseOrderRevokeLineVo vo) {
+
+        PurchaseOrderRevokeLine data = new PurchaseOrderRevokeLine();
+        data.setId(IdUtil.getId());
+        data.setPurchaseOrderRevokeId(vo.getPurchaseOrderRevokeId());
+        data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
+        if (!StringUtil.isBlank(vo.getIndustry())) {
+            data.setIndustry(vo.getIndustry());
+        }
+        if (!StringUtil.isBlank(vo.getQuality())) {
+            data.setQuality(vo.getQuality());
+        }
+        if (!StringUtil.isBlank(vo.getBrand())) {
+            data.setBrand(vo.getBrand());
+        }
+        if (vo.getThickness() != null) {
+            data.setThickness(vo.getThickness());
+        }
+        if (vo.getThicknessTolPos() != null) {
+            data.setThicknessTolPos(vo.getThicknessTolPos());
+        }
+        if (vo.getThicknessTolNeg() != null) {
+            data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        }
+        if (vo.getWidth() != null) {
+            data.setWidth(vo.getWidth());
+        }
+        if (vo.getWidthTolPos() != null) {
+            data.setWidthTolPos(vo.getWidthTolPos());
+        }
+        if (vo.getWidthTolNeg() != null) {
+            data.setWidthTolNeg(vo.getWidthTolNeg());
+        }
+        if (vo.getLength() != null) {
+            data.setLength(vo.getLength());
+        }
+        if (vo.getLengthTolPos() != null) {
+            data.setLengthTolPos(vo.getLengthTolPos());
+        }
+        if (vo.getLengthTolNeg() != null) {
+            data.setLengthTolNeg(vo.getLengthTolNeg());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
+        if (vo.getQuantity() != null) {
+            data.setQuantity(vo.getQuantity());
+        }
+        if (vo.getSalesPrice() != null) {
+            data.setSalesPrice(vo.getSalesPrice());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (vo.getRevokeQuantity() != null) {
+            data.setRevokeQuantity(vo.getRevokeQuantity());
+        }
+        if (vo.getShowOrder() != null) {
+            data.setShowOrder(vo.getShowOrder());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改订货单撤销表物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdatePurchaseOrderRevokeLineVo vo) {
+
+        PurchaseOrderRevokeLine data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单撤销表物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderRevokeLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderRevokeLine.class)
+                .set(PurchaseOrderRevokeLine::getRevokeQuantity, vo.getRevokeQuantity() == null ? null : vo.getRevokeQuantity())
+                .eq(PurchaseOrderRevokeLine::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除订货单撤销表物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订货单撤销表物料行 Mapper 接口
+ * </p>
+ *
+ */
+public interface PurchaseOrderRevokeLineMapper extends BaseMapper<PurchaseOrderRevokeLine> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderRevokeLine> query(@Param("vo") QueryPurchaseOrderRevokeLineVo vo);
+}

+package com.lframework.xingyun.sc.service.order;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderRevokeLineVo;
+import java.util.List;
+
+/**
+ * 订货单撤销表物料行 Service
+ */
+public interface PurchaseOrderRevokeLineService extends BaseMpService<PurchaseOrderRevokeLine> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<PurchaseOrderRevokeLine> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeLineVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderRevokeLine> query(QueryPurchaseOrderRevokeLineVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    PurchaseOrderRevokeLine findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePurchaseOrderRevokeLineVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePurchaseOrderRevokeLineVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

@@ -154,6 +154,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String examineStatus;
 
     /**
+     * 撤销状态
+     */
+    @ApiModelProperty("撤销状态")
+    private String revokeStatus;
+
+    /**
      * 生产工艺
      */
     @ApiModelProperty("生产工艺")

+package com.lframework.xingyun.sc.vo.order;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreatePurchaseOrderRevokeLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单撤销主表ID
+     */
+    @ApiModelProperty(value = "订货单撤销主表ID", required = true)
+    @NotBlank(message = "请输入订货单撤销主表ID！")
+    @Length(message = "订货单撤销主表ID最多允许32个字符！")
+    private String purchaseOrderRevokeId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty(value = "订货单物料行ID", required = true)
+    @NotBlank(message = "请输入订货单物料行ID！")
+    @Length(message = "订货单物料行ID最多允许32个字符！")
+    private String purchaseOrderLineId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 原数量kg
+     */
+    @ApiModelProperty("原数量kg")
+    @TypeMismatch(message = "原数量kg格式有误！")
+    @IsNumberPrecision(message = "原数量kg最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    @TypeMismatch(message = "销售价格格式有误！")
+    @IsNumberPrecision(message = "销售价格最多允许4位小数！", value = 4)
+    private BigDecimal salesPrice;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 撤销数量kg
+     */
+    @ApiModelProperty("撤销数量kg")
+    @TypeMismatch(message = "撤销数量kg格式有误！")
+    @IsNumberPrecision(message = "撤销数量kg最多允许4位小数！", value = 4)
+    private BigDecimal revokeQuantity;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+}

@@ -54,6 +54,12 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     private String examineStatus;
 
     /**
+     * 撤销状态
+     */
+    @ApiModelProperty("撤销状态")
+    private String revokeStatus;
+
+    /**
      * 办事处
      */
     @ApiModelProperty("办事处")

+package com.lframework.xingyun.sc.vo.order;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryPurchaseOrderRevokeLineVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单撤销主表ID
+     */
+    @ApiModelProperty("订货单撤销主表ID")
+    private String purchaseOrderRevokeId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+}

@@ -161,6 +161,12 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String examineStatus;
 
     /**
+     * 撤销状态
+     */
+    @ApiModelProperty("撤销状态")
+    private String revokeStatus;
+
+    /**
      * 生产工艺
      */
     @ApiModelProperty("生产工艺")

+package com.lframework.xingyun.sc.vo.order;
+
+import lombok.Data;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class UpdatePurchaseOrderRevokeLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+
+    /**
+     * 撤销数量kg
+     */
+    @ApiModelProperty("撤销数量kg")
+    @TypeMismatch(message = "撤销数量kg格式有误！")
+    @IsNumberPrecision(message = "撤销数量kg最多允许4位小数！", value = 4)
+    private BigDecimal revokeQuantity;
+
+}

@@ -24,6 +24,7 @@
         <result column="remarks" property="remarks"/>
         <result column="status" property="status"/>
         <result column="examine_status" property="examineStatus"/>
+        <result column="revoke_status" property="revokeStatus"/>
         <result column="production_process" property="productionProcess"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
@@ -62,6 +63,7 @@
             tb.remarks,
             tb.status,
             tb.examine_status,
+            tb.revoke_status,
             tb.production_process,
             tb.dept_id,
             sd.name AS dept_name,
@@ -105,6 +107,9 @@
             <if test="vo.examineStatus != null and vo.examineStatus != ''">
                 AND tb.examine_status = #{vo.examineStatus}
             </if>
+            <if test="vo.revokeStatus != null and vo.revokeStatus != ''">
+                AND tb.revoke_status = #{vo.revokeStatus}
+            </if>
             <if test="vo.deptId != null and vo.deptId != ''">
                 AND tb.dept_id = #{vo.deptId}
             </if>

+<?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.lframework.xingyun.sc.mappers.PurchaseOrderRevokeLineMapper">
+
+    <resultMap id="PurchaseOrderRevokeLine" type="com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine">
+        <id column="id" property="id"/>
+        <result column="purchase_order_revoke_id" property="purchaseOrderRevokeId"/>
+        <result column="purchase_order_line_id" property="purchaseOrderLineId"/>
+        <result column="industry" property="industry"/>
+        <result column="quality" property="quality"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="sales_price" property="salesPrice"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="revoke_quantity" property="revokeQuantity"/>
+        <result column="show_order" property="showOrder"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="PurchaseOrderRevokeLine_sql">
+        SELECT
+            tb.id,
+            tb.purchase_order_revoke_id,
+            tb.purchase_order_line_id,
+            tb.industry,
+            tb.quality,
+            tb.brand,
+            tb.thickness,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.status,
+            tb.quantity,
+            tb.sales_price,
+            tb.delivery_date,
+            tb.revoke_quantity,
+            tb.show_order,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM tbl_purchase_order_revoke_line AS tb
+    </sql>
+
+    <select id="query" resultMap="PurchaseOrderRevokeLine">
+        <include refid="PurchaseOrderRevokeLine_sql"/>
+        <where>
+            <if test="vo.purchaseOrderRevokeId != null and vo.purchaseOrderRevokeId != ''">
+                AND tb.purchase_order_revoke_id = #{vo.purchaseOrderRevokeId}
+            </if>
+            <if test="vo.purchaseOrderLineId != null and vo.purchaseOrderLineId != ''">
+                AND tb.purchase_order_line_id = #{vo.purchaseOrderLineId}
+            </if>
+            <if test="vo.industry != null and vo.industry != ''">
+                AND tb.industry = #{vo.industry}
+            </if>
+            <if test="vo.brand != null and vo.brand != ''">
+                AND tb.brand = #{vo.brand}
+            </if>
+        </where>
+        ORDER BY tb.show_order ASC
+    </select>
+</mapper>