楚江ERP：撤销单-增加办事处

@@ -53,6 +53,18 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     private String orderingUnitName;
     private String orderingUnitName;
 
 
     /**
     /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 办事处名称(非持久化字段)
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 原订货日期
      * 原订货日期
      */
      */
     @ApiModelProperty("原订货日期")
     @ApiModelProperty("原订货日期")

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -52,6 +53,17 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String orderingUnitName;
     private String orderingUnitName;
 
 
     /**
     /**
+     * 办事处
+     */
+    private String deptId;
+
+    /**
+     * 办事处名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
      * 原订货日期
      * 原订货日期
      */
      */
     private LocalDate orderDate;
     private LocalDate orderDate;

@@ -108,6 +108,9 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         if (!StringUtil.isBlank(vo.getOrderingUnit())) {
         if (!StringUtil.isBlank(vo.getOrderingUnit())) {
             data.setOrderingUnit(vo.getOrderingUnit());
             data.setOrderingUnit(vo.getOrderingUnit());
         }
         }
+        if (!StringUtil.isBlank(vo.getDeptId())) {
+            data.setDeptId(vo.getDeptId());
+        }
         if (vo.getOrderDate() != null) {
         if (vo.getOrderDate() != null) {
             data.setOrderDate(vo.getOrderDate());
             data.setOrderDate(vo.getOrderDate());
         }
         }
@@ -212,7 +215,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
 
 
         //撤销单物料行修改
         //撤销单物料行修改
         BigDecimal sumRevokeQuantity = BigDecimal.ZERO;
         BigDecimal sumRevokeQuantity = BigDecimal.ZERO;
-        List<UpdatePurchaseOrderRevokeLineVo> voList = vo.getUpdatePurchaseOrderRevokeLineVoList();
+        List<UpdatePurchaseOrderRevokeLineVo> voList = vo.getPurchaseOrderRevokeLineList();
         if (CollectionUtil.isNotEmpty(voList)) {
         if (CollectionUtil.isNotEmpty(voList)) {
             for (UpdatePurchaseOrderRevokeLineVo vo1 : voList) {
             for (UpdatePurchaseOrderRevokeLineVo vo1 : voList) {
                 if (vo1.getRevokeQuantity() != null) {
                 if (vo1.getRevokeQuantity() != null) {

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.vo.order;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,6 +43,12 @@ public class CreatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     private String orderingUnit;
     private String orderingUnit;
 
 
     /**
     /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
      * 原订货日期
      * 原订货日期
      */
      */
     @ApiModelProperty("原订货日期")
     @ApiModelProperty("原订货日期")

@@ -32,6 +32,18 @@ public class QueryPurchaseOrderRevokeVo extends PageVo implements BaseVo, Serial
     private String orderingUnitName;
     private String orderingUnitName;
 
 
     /**
     /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 办事处名称(非持久化字段)
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 制单日期
      * 制单日期
      */
      */
     @ApiModelProperty("制单日期")
     @ApiModelProperty("制单日期")

@@ -56,7 +56,7 @@ public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
      * 订货单撤销单物料行
      * 订货单撤销单物料行
      */
      */
     @ApiModelProperty("订货单撤销单物料行")
     @ApiModelProperty("订货单撤销单物料行")
-    List<UpdatePurchaseOrderRevokeLineVo> updatePurchaseOrderRevokeLineVoList;
+    List<UpdatePurchaseOrderRevokeLineVo> purchaseOrderRevokeLineList;
 
 
     /**
     /**
      * 原总数量
      * 原总数量

@@ -7,6 +7,8 @@
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="ordering_unit" property="orderingUnit"/>
         <result column="ordering_unit" property="orderingUnit"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
         <result column="order_date" property="orderDate"/>
         <result column="order_date" property="orderDate"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="document_preparation_date" property="documentPreparationDate"/>
         <result column="document_preparation_date" property="documentPreparationDate"/>
@@ -30,6 +32,8 @@
             tb.order_no,
             tb.order_no,
             tb.ordering_unit,
             tb.ordering_unit,
             cu.name AS ordering_unit_name,
             cu.name AS ordering_unit_name,
+            tb.dept_id,
+            sd.name AS dept_name,
             tb.order_date,
             tb.order_date,
             tb.delivery_date,
             tb.delivery_date,
             tb.document_preparation_date,
             tb.document_preparation_date,
@@ -47,6 +51,7 @@
             tb.update_time
             tb.update_time
         FROM purchase_order_revoke AS tb
         FROM purchase_order_revoke AS tb
         left join base_data_customer as cu on cu.id = tb.ordering_unit
         left join base_data_customer as cu on cu.id = tb.ordering_unit
+        left join sys_dept as sd on sd.id = tb.dept_id
     </sql>
     </sql>
 
 
     <select id="query" resultMap="PurchaseOrderRevoke">
     <select id="query" resultMap="PurchaseOrderRevoke">
@@ -58,6 +63,12 @@
             <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
             <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
                 AND tb.ordering_unit = #{vo.orderingUnit}
                 AND tb.ordering_unit = #{vo.orderingUnit}
             </if>
             </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND tb.dept_id = #{vo.deptId}
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
+            </if>
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
             </if>
             </if>