快递100集成

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/PurchaseInStockController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.params.stock.StockChangeVo;
-import com.fjhx.service.apply.ApplyPurchaseService;
 import com.fjhx.service.logistics.LogisticsDetailsService;
 import com.fjhx.service.stock.StockService;
 import org.springblade.core.tool.api.R;
@@ -25,9 +24,6 @@ import java.util.Map;
 public class PurchaseInStockController {
 
     @Autowired
-    private ApplyPurchaseService applyPurchaseService;
-
-    @Autowired
     private LogisticsDetailsService logisticsDetailsService;
 
     @Autowired
@@ -35,7 +31,7 @@ public class PurchaseInStockController {
 
     @PostMapping("/page")
     public R page(@RequestBody Condition condition) {
-        Page<Map<String, Object>> result = applyPurchaseService.applyInPage(condition);
+        Page<Map<String, Object>> result = null;
         return R.success(result);
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java

@@ -6,8 +6,6 @@ import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Map;
-
 /**
  * <p>
  * 申购单 Mapper 接口
@@ -20,6 +18,4 @@ public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
 
     Page<ApplyPurchase> getPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<ApplyPurchase> wrapper);
 
-    Page<Map<String, Object>> applyInPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<Object> wrapper);
-
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.xml

@@ -29,23 +29,4 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="applyInPage" resultType="java.util.LinkedHashMap">
-        select ap.id,
-               ap.code,
-               pi.code                             productCode,
-               pi.name                             productName,
-               pi.type                             productType,
-               ap.quantity,
-               ap.receipt_quantity,
-               (ap.quantity - ap.receipt_quantity) not_receipt_quantity,
-               w.name                              warehouse_name,
-               receipt_time,
-               ap.create_user,
-               ap.status
-        from apply_purchase ap
-                 left join product_info pi on ap.goods_id = pi.id
-                 LEFT JOIN warehouse w ON ap.receipt_warehouse_id = w.id
-            ${ew.customSqlSegment}
-    </select>
-
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/ApplyPurchaseService.java

@@ -2,7 +2,6 @@ package com.fjhx.service.apply;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.base.Condition;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.params.apply.ApplyPurchaseVo;
 
@@ -28,11 +27,6 @@ public interface ApplyPurchaseService extends BaseService<ApplyPurchase> {
     void delete(ApplyPurchaseVo applyPurchaseVo);
 
     /**
-     * 申购入库分页
-     */
-    Page<Map<String, Object>> applyInPage(Condition condition);
-
-    /**
      * 待采购列表
      *
      * @param condition 查询条件

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/impl/ApplyPurchaseServiceImpl.java

@@ -2,7 +2,6 @@ package com.fjhx.service.apply.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.Condition;
 import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.entity.product.ProductInfo;
@@ -127,35 +126,6 @@ public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, A
         removeById(applyPurchaseVo.getId());
     }
 
-    /**
-     * 申购入库分页
-     */
-    @Override
-    public Page<Map<String, Object>> applyInPage(Condition condition) {
-        IWrapper<Object> wrapper = IWrapper.getWrapper(condition);
-        wrapper
-                .func(q -> {
-                    Integer status = condition.getStatus();
-                    if (status == null) {
-                        q.in("ap", ApplyPurchase::getStatus,
-                                ApplyPurchaseStatusEnum.STATUS_30.getKey(),
-                                ApplyPurchaseStatusEnum.STATUS_40.getKey(),
-                                ApplyPurchaseStatusEnum.STATUS_50.getKey());
-                    } else {
-                        q.eq("ap", ApplyPurchase::getStatus);
-                    }
-                })
-                .eq("ap", ApplyPurchase::getReceiptWarehouseId, condition.getLong("warehouseId"))
-                .like("ap", ApplyPurchase::getCode)
-                .like("pi", ProductInfo::getName, condition.getStr("productName"))
-                .eq("ap", ApplyPurchase::getCreateUser)
-                .periodTime("ap", ApplyPurchase::getReceiptTime);
-
-        Page<Map<String, Object>> page = baseMapper.applyInPage(createPage(condition), wrapper);
-        UserClientUtil.setUserName(page.getRecords(), "createUser", "createUserName");
-        return page;
-    }
-
     @Override
     public ApplyPurchase getById(Serializable id) {
         ApplyPurchase purchase = super.getById(id);