楚江ERP-查询可撤销或变更的订货单数据接口开发

@@ -124,14 +124,14 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     }
 
     /**
-     * 查询列表可以撤销数据
+     * 查询可以撤销/变更的订货单数据
      */
     @ApiOperation("查询列表")
-    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
-    @GetMapping("/queryRevokeList")
-    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> queryRevokeList(@Valid QueryPurchaseOrderInfoVo vo) {
+    @HasPermission({"order-manage:order-list:query"})
+    @GetMapping("/listCanRevokeOrChangeOrderInfo")
+    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> listCanRevokeOrChangeOrderInfo(@Valid QueryPurchaseOrderInfoVo vo) {
 
-        PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryRevokeList(getPageIndex(vo), getPageSize(vo), vo);
+        PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryCanRevokeOrChangeList(getPageIndex(vo), getPageSize(vo), vo);
 
         List<PurchaseOrderInfo> datas = pageResult.getDatas();
         List<GetPurchaseOrderInfoBo> results = null;

@@ -80,13 +80,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
-    public PageResult<PurchaseOrderInfo> queryRevokeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
+    public PageResult<PurchaseOrderInfo> queryCanRevokeOrChangeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
 
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
 
         PageHelperUtil.startPage(pageIndex, pageSize);
-        List<PurchaseOrderInfo> datas = this.queryRevokeList(vo);
+        List<PurchaseOrderInfo> datas = this.queryCanRevokeOrChangeList(vo);
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -98,9 +98,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
-    public List<PurchaseOrderInfo> queryRevokeList(QueryPurchaseOrderInfoVo vo) {
+    public List<PurchaseOrderInfo> queryCanRevokeOrChangeList(QueryPurchaseOrderInfoVo vo) {
 
-        return getBaseMapper().queryRevokeList(vo);
+        return getBaseMapper().queryCanRevokeOrChangeList(vo);
     }
 
     @Override

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

@@ -23,7 +23,7 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * 查询列表
      * @return
      */
-    PageResult<PurchaseOrderInfo> queryRevokeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
+    PageResult<PurchaseOrderInfo> queryCanRevokeOrChangeList(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
 
     /**
      * 查询列表
@@ -37,7 +37,7 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param vo
      * @return
      */
-    List<PurchaseOrderInfo> queryRevokeList(QueryPurchaseOrderInfoVo vo);
+    List<PurchaseOrderInfo> queryCanRevokeOrChangeList(QueryPurchaseOrderInfoVo vo);
 
     /**
      * 根据ID查询

@@ -100,4 +100,9 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     @ApiModelProperty(value = "创建时间")
     private String createTimeStr;
 
+    /**
+     * 公司单位名称
+     */
+    @ApiModelProperty("公司单位名称")
+    private String companyName;
 }

@@ -12,6 +12,14 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     private static final long serialVersionUID = 1L;
 
     /**
+     * 查询类型
+     * REVOKE：撤销
+     * CHANGE：变更
+     */
+    @ApiModelProperty("查询类型")
+    private String queryType;
+
+    /**
      * 订单编号
      */
     @ApiModelProperty("订单编号")

@@ -202,6 +202,9 @@
             <if test="id != null">
                 AND tb.id = #{id}
             </if>
+            <if test="vo.companyName != null and vo.companyName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.companyName},'%')
+            </if>
         </where>
     </select>
 

@@ -134,7 +134,7 @@
         ORDER BY tb.update_time DESC
     </select>
 
-    <select id="queryRevokeList" resultMap="PurchaseOrderInfo">
+    <select id="queryCanRevokeOrChangeList" resultMap="PurchaseOrderInfo">
         <include refid="PurchaseOrderInfo_sql"/>
         <where>
             <if test="vo.orderNo != null and vo.orderNo != ''">
@@ -166,10 +166,17 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
+            <if test="vo.queryType == 'REVOKE'">
             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')
             AND tb.type ='PRODUCTION'
+            </if>
+            <if test="vo.queryType == 'CHANGE'">
+                and tb.examine_status = 'PASS'
+                and tb.status != 'SHIPPED'
+                and tb.revoke_status != 'UNDOING'
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>