Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -6,6 +6,7 @@ import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.util.List;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
@@ -26,12 +27,6 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     private String id;
 
     /**
-     * 第几次撤销
-     */
-    @ApiModelProperty("第几次撤销")
-    private String sort;
-
-    /**
      * 订货单ID
      */
     @ApiModelProperty("订货单ID")
@@ -101,7 +96,7 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     private String confirmationVoucherFileName;
 
     /**
-     * 创建人
+     * 创建人(制单人)
      */
     @ApiModelProperty("创建人")
     private String createBy;
@@ -110,7 +105,7 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
      * 订货单撤销表物料行
      */
     @ApiModelProperty("订货单撤销表物料行")
-    private List<GetPurchaseOrderRevokeLineBo> getPurchaseOrderRevokeLineBoList;
+    private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
 
     public GetPurchaseOrderRevokeBo() {
 

@@ -68,6 +68,26 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     }
 
     /**
+     * 查询列表可以撤销数据
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
+    @GetMapping("/queryRevokeList")
+    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> queryRevokeList(@Valid QueryPurchaseOrderInfoVo vo) {
+
+        PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryRevokeList(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PurchaseOrderInfo> datas = pageResult.getDatas();
+        List<GetPurchaseOrderInfoBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetPurchaseOrderInfoBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
      * 根据ID查询
      */
     @ApiOperation("根据ID查询")

@@ -9,15 +9,12 @@ 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.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.PurchaseOrderRevokeLineService;
 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 com.lframework.xingyun.sc.vo.order.*;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -50,6 +47,8 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
 
     /**
      * 查询列表
@@ -86,6 +85,12 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
         }
 
         GetPurchaseOrderRevokeBo result = new GetPurchaseOrderRevokeBo(data);
+        QueryPurchaseOrderRevokeLineVo vo = new QueryPurchaseOrderRevokeLineVo();
+        vo.setPurchaseOrderRevokeId(id);
+        List<PurchaseOrderRevokeLine> query = purchaseOrderRevokeLineService.query(vo);
+        if (CollectionUtil.isNotEmpty(query)) {
+            result.setPurchaseOrderRevokeLineList(query);
+        }
 
         return InvokeResultBuilder.success(result);
     }
@@ -114,7 +119,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:add"})
     @PostMapping("/create")
-    public InvokeResult<Void> create(@Valid CreatePurchaseOrderRevokeVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderRevokeVo vo) {
 
         purchaseOrderRevokeService.create(vo);
 
@@ -127,7 +132,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     @ApiOperation("修改")
     @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:modify"})
     @PutMapping("/update")
-    public InvokeResult<Void> update(@Valid UpdatePurchaseOrderRevokeVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderRevokeVo vo) {
 
         purchaseOrderRevokeService.update(vo);
 
@@ -135,6 +140,20 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
     }
 
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id,
+                                     @NotBlank(message = "status不能为空！") String status) {
+
+        purchaseOrderRevokeService.updateStatus(id, status);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      */
     @ApiOperation("根据ID删除")
@@ -175,29 +194,29 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
         vo.setPurchaseOrderId(purchaseOrderInfo.getId());
         List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
-            List<GetPurchaseOrderRevokeLineBo> revokeLineBoList = new ArrayList<>(purchaseOrderLineList.size());
+            List<PurchaseOrderRevokeLine> revokeLineList = 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);
+                PurchaseOrderRevokeLine line = new PurchaseOrderRevokeLine();
+                line.setPurchaseOrderLineId(purchaseOrderLine.getId());
+                line.setIndustry(purchaseOrderLine.getIndustry());
+                line.setQuality(purchaseOrderLine.getQuality());
+                line.setBrand(purchaseOrderLine.getBrand());
+                line.setThickness(purchaseOrderLine.getThickness());
+                line.setThicknessTolPos(purchaseOrderLine.getThicknessTolPos());
+                line.setThicknessTolNeg(purchaseOrderLine.getThicknessTolNeg());
+                line.setWidth(purchaseOrderLine.getWidth());
+                line.setWidthTolPos(purchaseOrderLine.getWidthTolPos());
+                line.setWidthTolNeg(purchaseOrderLine.getWidthTolNeg());
+                line.setLength(purchaseOrderLine.getLength());
+                line.setLengthTolPos(purchaseOrderLine.getLengthTolPos());
+                line.setLengthTolNeg(purchaseOrderLine.getLengthTolNeg());
+                line.setQuantity(purchaseOrderLine.getQuantity());
+                line.setSalesPrice(purchaseOrderLine.getSalesPrice());
+                line.setDeliveryDate(purchaseOrderLine.getDeliveryDate());
+                line.setShowOrder(purchaseOrderLine.getShowOrder());
+                revokeLineList.add(line);
             }
-            data.setGetPurchaseOrderRevokeLineBoList(revokeLineBoList);
+            data.setPurchaseOrderRevokeLineList(revokeLineList);
         }
 
         return data;

@@ -29,11 +29,6 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String id;
 
     /**
-     * 第几次撤销
-     */
-    private String sort;
-
-    /**
      * 订货单ID
      */
     private String purchaseOrderId;
@@ -49,6 +44,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String orderingUnit;
 
     /**
+     * 订货单位名称（非持久化字段）
+     */
+    @TableField(exist = false)
+    private String orderingUnitName;
+
+    /**
      * 原订货日期
      */
     private LocalDate orderDate;

@@ -57,12 +57,30 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
+    public PageResult<PurchaseOrderInfo> queryRevokeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PurchaseOrderInfo> datas = this.queryRevokeList(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
     public List<PurchaseOrderInfo> query(QueryPurchaseOrderInfoVo vo) {
 
         return getBaseMapper().query(vo);
     }
 
     @Override
+    public List<PurchaseOrderInfo> queryRevokeList(QueryPurchaseOrderInfoVo vo) {
+
+        return getBaseMapper().queryRevokeList(vo);
+    }
+
+    @Override
     public PurchaseOrderInfo findById(String id) {
 
         return getBaseMapper().findById(id);
@@ -290,6 +308,19 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新撤销状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateRevokeStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getRevokeStatus, status)
+                .eq(PurchaseOrderInfo::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -3,6 +3,7 @@ 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.common.utils.CollectionUtil;
 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;
@@ -17,19 +18,29 @@ 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.PurchaseOrderRevoke;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeService;
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderRevokeVo;
-import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeVo;
-import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderRevokeVo;
+import com.lframework.xingyun.sc.vo.order.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.List;
 
 @Service
 public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOrderRevokeMapper, PurchaseOrderRevoke> implements PurchaseOrderRevokeService {
 
+    @Resource
+    private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+
+
     @Override
     public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) {
 
@@ -51,7 +62,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
     @Override
     public PurchaseOrderRevoke findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增订货单撤销表，ID：{}", params = {"#id"})
@@ -61,7 +72,6 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
 
         PurchaseOrderRevoke data = new PurchaseOrderRevoke();
         data.setId(IdUtil.getId());
-        data.setSort(vo.getSort());
         data.setPurchaseOrderId(vo.getPurchaseOrderId());
         if (!StringUtil.isBlank(vo.getOrderNo())) {
             data.setOrderNo(vo.getOrderNo());
@@ -75,11 +85,12 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         if (vo.getDeliveryDate() != null) {
             data.setDeliveryDate(vo.getDeliveryDate());
         }
-        if (vo.getDocumentPreparationDate() != null) {
-            data.setDocumentPreparationDate(vo.getDocumentPreparationDate());
-        }
+        //制单日期
+        data.setDocumentPreparationDate(LocalDate.now());
         if (!StringUtil.isBlank(vo.getStatus())) {
             data.setStatus(vo.getStatus());
+        } else {
+            data.setStatus("AUDIT");
         }
         if (!StringUtil.isBlank(vo.getRevokeReason())) {
             data.setRevokeReason(vo.getRevokeReason());
@@ -96,6 +107,36 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
+        //新增订货单撤销表物料行
+        if (CollectionUtil.isNotEmpty(vo.getPurchaseOrderRevokeLineList())) {
+            List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList = vo.getPurchaseOrderRevokeLineList();
+            for (PurchaseOrderRevokeLine purchaseOrderRevokeLine : purchaseOrderRevokeLineList) {
+                CreatePurchaseOrderRevokeLineVo vo1 = new CreatePurchaseOrderRevokeLineVo();
+                vo1.setPurchaseOrderRevokeId(data.getId());
+                vo1.setPurchaseOrderLineId(purchaseOrderRevokeLine.getPurchaseOrderLineId());
+                vo1.setIndustry(purchaseOrderRevokeLine.getIndustry());
+                vo1.setQuality(purchaseOrderRevokeLine.getQuality());
+                vo1.setBrand(purchaseOrderRevokeLine.getBrand());
+                vo1.setThickness(purchaseOrderRevokeLine.getThickness());
+                vo1.setThicknessTolPos(purchaseOrderRevokeLine.getThicknessTolPos());
+                vo1.setThicknessTolNeg(purchaseOrderRevokeLine.getThicknessTolNeg());
+                vo1.setWidth(purchaseOrderRevokeLine.getWidth());
+                vo1.setWidthTolPos(purchaseOrderRevokeLine.getWidthTolPos());
+                vo1.setWidthTolNeg(purchaseOrderRevokeLine.getWidthTolNeg());
+                vo1.setLength(purchaseOrderRevokeLine.getLength());
+                vo1.setLengthTolPos(purchaseOrderRevokeLine.getLengthTolPos());
+                vo1.setLengthTolNeg(purchaseOrderRevokeLine.getLengthTolNeg());
+                vo1.setQuantity(purchaseOrderRevokeLine.getQuantity());
+                vo1.setSalesPrice(purchaseOrderRevokeLine.getSalesPrice());
+                vo1.setDeliveryDate(purchaseOrderRevokeLine.getDeliveryDate());
+                vo1.setRevokeQuantity(purchaseOrderRevokeLine.getRevokeQuantity());
+                vo1.setShowOrder(purchaseOrderRevokeLine.getShowOrder());
+                purchaseOrderRevokeLineService.create(vo1);
+            }
+        }
+        //更新订货单撤销状态为：撤销中
+        purchaseOrderInfoService.updateRevokeStatus(vo.getPurchaseOrderId(), "UNDOING");
+
         return data.getId();
     }
 
@@ -110,14 +151,8 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         }
 
         LambdaUpdateWrapper<PurchaseOrderRevoke> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderRevoke.class)
-                .set(PurchaseOrderRevoke::getSort, vo.getSort())
-                .set(PurchaseOrderRevoke::getPurchaseOrderId, vo.getPurchaseOrderId())
-                .set(PurchaseOrderRevoke::getOrderNo, StringUtil.isBlank(vo.getOrderNo()) ? null : vo.getOrderNo())
-                .set(PurchaseOrderRevoke::getOrderingUnit, StringUtil.isBlank(vo.getOrderingUnit()) ? null : vo.getOrderingUnit())
-                .set(PurchaseOrderRevoke::getOrderDate, vo.getOrderDate() == null ? null : vo.getOrderDate())
                 .set(PurchaseOrderRevoke::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
-                .set(PurchaseOrderRevoke::getDocumentPreparationDate, vo.getDocumentPreparationDate() == null ? null : vo.getDocumentPreparationDate())
-                .set(PurchaseOrderRevoke::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
+                .set(PurchaseOrderRevoke::getStatus, "AUDIT")
                 .set(PurchaseOrderRevoke::getRevokeReason, StringUtil.isBlank(vo.getRevokeReason()) ? null : vo.getRevokeReason())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileId, StringUtil.isBlank(vo.getConfirmationVoucherFileId()) ? null : vo.getConfirmationVoucherFileId())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileName, StringUtil.isBlank(vo.getConfirmationVoucherFileName()) ? null : vo.getConfirmationVoucherFileName())
@@ -125,10 +160,39 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
 
         getBaseMapper().update(updateWrapper);
 
+        //撤销单物料行修改
+        List<UpdatePurchaseOrderRevokeLineVo> voList = vo.getUpdatePurchaseOrderRevokeLineVoList();
+        if (CollectionUtil.isNotEmpty(voList)) {
+            for (UpdatePurchaseOrderRevokeLineVo vo1 : voList) {
+                purchaseOrderRevokeLineService.update(vo1);
+            }
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderRevoke> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderRevoke.class)
+                .set(PurchaseOrderRevoke::getStatus, status)
+                .eq(PurchaseOrderRevoke::getId, id);
+        getBaseMapper().update(updateWrapper);
+
+        if ("CANCEL".equals(status)) {
+            PurchaseOrderRevoke revoke = findById(id);
+            //更新订货单撤销状态为已取消
+            purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), status);
+        }
+
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除订货单撤销表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -22,5 +22,12 @@ public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
      */
     List<PurchaseOrderInfo> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
 
+    /**
+     * 查询可撤销操作列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderInfo> queryRevokeList(@Param("vo") QueryPurchaseOrderInfoVo vo);
+
     PurchaseOrderInfo findById(@Param("id") String id);
 }

@@ -21,4 +21,6 @@ public interface PurchaseOrderRevokeMapper extends BaseMapper<PurchaseOrderRevok
      * @return
      */
     List<PurchaseOrderRevoke> query(@Param("vo") QueryPurchaseOrderRevokeVo vo);
+
+    PurchaseOrderRevoke findById(@Param("id") String id);
 }

@@ -21,12 +21,25 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
 
     /**
      * 查询列表
+     * @return
+     */
+    PageResult<PurchaseOrderInfo> queryRevokeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
+
+    /**
+     * 查询列表
      * @param vo
      * @return
      */
     List<PurchaseOrderInfo> query(QueryPurchaseOrderInfoVo vo);
 
     /**
+     * 查询可撤销列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderInfo> queryRevokeList(QueryPurchaseOrderInfoVo vo);
+
+    /**
      * 根据ID查询
      * @param id
      * @return
@@ -67,4 +80,12 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param vo 更新数据
      */
     void updateNoFlowInstance(UpdatePurchaseOrderInfoVo vo);
+
+    /**
+     * 根据主键ID更新撤销状态
+     *
+     * @param id     主键ID
+     * @param status 撤销状态
+     */
+    void updateRevokeStatus(String id, String status);
 }

@@ -47,6 +47,14 @@ public interface PurchaseOrderRevokeService extends BaseMpService<PurchaseOrderR
     void update(UpdatePurchaseOrderRevokeVo vo);
 
     /**
+     * 更新状态
+     *
+     * @param id 主键
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
      * 根据ID删除
      * @param id
      * @return

@@ -3,10 +3,13 @@ package com.lframework.xingyun.sc.vo.order;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 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 java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -15,14 +18,6 @@ public class CreatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 第几次撤销
-     */
-    @ApiModelProperty(value = "第几次撤销", required = true)
-    @NotBlank(message = "请输入第几次撤销！")
-    @Length(message = "第几次撤销最多允许20个字符！")
-    private String sort;
-
-    /**
      * 订货单ID
      */
     @ApiModelProperty(value = "订货单ID", required = true)
@@ -93,4 +88,10 @@ public class CreatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     @Length(message = "撤销确认凭证文件名称最多允许100个字符！")
     private String confirmationVoucherFileName;
 
+    /**
+     * 订货单撤销表物料行
+     */
+    @ApiModelProperty("订货单撤销表物料行")
+    private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
+
 }

@@ -25,9 +25,9 @@ public class UpdatePurchaseOrderRevokeLineVo implements BaseVo, Serializable {
     /**
      * 撤销数量kg
      */
-    @ApiModelProperty("撤销数量kg")
-    @TypeMismatch(message = "撤销数量kg格式有误！")
-    @IsNumberPrecision(message = "撤销数量kg最多允许4位小数！", value = 4)
+    @ApiModelProperty("撤销数量")
+    @TypeMismatch(message = "撤销数量格式有误！")
+    @IsNumberPrecision(message = "撤销数量最多允许4位小数！", value = 4)
     private BigDecimal revokeQuantity;
 
 }

@@ -8,6 +8,7 @@ import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
@@ -21,42 +22,6 @@ public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     @NotBlank(message = "id不能为空！")
     private String id;
 
-    /**
-     * 第几次撤销
-     */
-    @ApiModelProperty(value = "第几次撤销", required = true)
-    @NotBlank(message = "请输入第几次撤销！")
-    @Length(message = "第几次撤销最多允许20个字符！")
-    private String sort;
-
-    /**
-     * 订货单ID
-     */
-    @ApiModelProperty(value = "订货单ID", required = true)
-    @NotBlank(message = "请输入订货单ID！")
-    @Length(message = "订货单ID最多允许32个字符！")
-    private String purchaseOrderId;
-
-    /**
-     * 订单编号
-     */
-    @ApiModelProperty("订单编号")
-    @Length(message = "订单编号最多允许50个字符！")
-    private String orderNo;
-
-    /**
-     * 订货单位ID
-     */
-    @ApiModelProperty("订货单位ID")
-    @Length(message = "订货单位ID最多允许100个字符！")
-    private String orderingUnit;
-
-    /**
-     * 原订货日期
-     */
-    @ApiModelProperty("原订货日期")
-    @TypeMismatch(message = "原订货日期格式有误！")
-    private LocalDate orderDate;
 
     /**
      * 要求交货日期
@@ -66,20 +31,6 @@ public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     private LocalDate deliveryDate;
 
     /**
-     * 制单日期
-     */
-    @ApiModelProperty("制单日期")
-    @TypeMismatch(message = "制单日期格式有误！")
-    private LocalDate documentPreparationDate;
-
-    /**
-     * 状态
-     */
-    @ApiModelProperty("状态")
-    @Length(message = "状态最多允许20个字符！")
-    private String status;
-
-    /**
      * 撤销原因
      */
     @ApiModelProperty("撤销原因")
@@ -100,4 +51,10 @@ public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     @Length(message = "撤销确认凭证文件名称最多允许100个字符！")
     private String confirmationVoucherFileName;
 
+    /**
+     * 订货单撤销单物料行
+     */
+    @ApiModelProperty("订货单撤销单物料行")
+    List<UpdatePurchaseOrderRevokeLineVo> updatePurchaseOrderRevokeLineVoList;
+
 }

@@ -120,6 +120,45 @@
         ORDER BY tb.update_time DESC
     </select>
 
+    <select id="queryRevokeList" resultMap="PurchaseOrderInfo">
+        <include refid="PurchaseOrderInfo_sql"/>
+        <where>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND tb.order_no = #{vo.orderNo}
+            </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
+            </if>
+            <if test="vo.orderDateStart != null">
+                AND tb.order_date >= #{vo.orderDateStart}
+            </if>
+            <if test="vo.orderDateEnd != null">
+                <![CDATA[
+               AND tb.order_date <= #{vo.orderDateEnd}
+                ]]>
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+            <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>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
+            tb.revoke_status='PARTIAL')
+            AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
+        </where>
+        ORDER BY tb.update_time DESC
+    </select>
+
     <select id="findById" resultType="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
         <include refid="PurchaseOrderInfo_sql"/>
         <where>

@@ -4,7 +4,6 @@
 
     <resultMap id="PurchaseOrderRevoke" type="com.lframework.xingyun.sc.entity.PurchaseOrderRevoke">
         <id column="id" property="id"/>
-        <result column="sort" property="sort"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="ordering_unit" property="orderingUnit"/>
@@ -26,10 +25,10 @@
     <sql id="PurchaseOrderRevoke_sql">
         SELECT
             tb.id,
-            tb.sort,
             tb.purchase_order_id,
             tb.order_no,
             tb.ordering_unit,
+            cu.name AS ordering_unit_name,
             tb.order_date,
             tb.delivery_date,
             tb.document_preparation_date,
@@ -44,6 +43,7 @@
             tb.create_time,
             tb.update_time
         FROM purchase_order_revoke AS tb
+        left join base_data_customer as cu on cu.id = tb.ordering_unit
     </sql>
 
     <select id="query" resultMap="PurchaseOrderRevoke">
@@ -55,6 +55,9 @@
             <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
                 AND tb.ordering_unit = #{vo.orderingUnit}
             </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
+            </if>
             <if test="vo.startDate != null">
                 AND tb.document_preparation_date >= #{vo.startDate}
             </if>
@@ -69,4 +72,13 @@
         </where>
         ORDER BY tb.update_time DESC
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.PurchaseOrderRevoke">
+        <include refid="PurchaseOrderRevoke_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>