取消feign 参数名称

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java

@@ -43,7 +43,7 @@ public interface IWarehouseUpdownTypeClient {
     String TOP = API_PREFIX + "/top";
 
 	@GetMapping(TOP + "/downPackage")
-	R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark);
+	R downPackage(@RequestParam String orderPackageCodes, @RequestParam Long warehouseId,@RequestParam String remark);
 
 
 	@PostMapping(TOP + "/downDeliveryPackage")
@@ -55,26 +55,23 @@ public interface IWarehouseUpdownTypeClient {
 	@PostMapping(TOP + "/downStock")
 	R downStock(@RequestBody List<JSONObject> stockLists);
 
-	@PostMapping(TOP + "/packageChangeStock")
-	boolean packageChangeStock(@RequestBody List<String> orderPackageCodes);
 
 	@GetMapping(TOP + "/downPackageOrDelTray")
-	R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark);
+	R downPackageOrDelTray(@RequestParam String orderPackageCodes, @RequestParam Long warehouseId,@RequestParam String remark);
 
 	@GetMapping(TOP + "/downPackageAndDelTrayAndIsUpdate")
-	R downPackageAndDelTrayAndIsUpdate(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark,@RequestParam("isOrNo") boolean isOrNo);
+	R downPackageAndDelTrayAndIsUpdate(@RequestParam String orderPackageCodes, @RequestParam Long warehouseId,@RequestParam String remark,@RequestParam boolean isOrNo);
 
 	@GetMapping(TOP + "/downTray")
-	R downTray(@RequestParam("trayCode") String trayCode, @RequestParam("warehouseId") Long warehouseId);
+	R downTray(@RequestParam String trayCode, @RequestParam Long warehouseId);
 
 	@GetMapping(TOP + "/upShelfTray")
-    boolean upShelfTray(@RequestParam("trayCode") String trayCode, @RequestParam("locationId") Long locationId, @RequestParam("warehouseId") Long warehouseId);
+    boolean upShelfTray(@RequestParam String trayCode, @RequestParam Long locationId, @RequestParam Long warehouseId);
 
 	@GetMapping(TOP + "/upShelfPackage")
 	boolean upShelfPackage(@RequestParam String orderPackageCode, @RequestParam Long locationId, @RequestParam Long warehouseId,@RequestParam String remark);
 
-	@GetMapping(TOP + "/findUpdownTypeInforByAllocationId")
-	R findUpdownTypeInforByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId);
+
 	@GetMapping(TOP + "/findAllGoodsByAllocationId")
 	R findAllGoodsByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId);
 	@GetMapping(TOP + "/findZeroAllocation")

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchOrderDetailMapper.xml

@@ -21,60 +21,6 @@
             </if>
         </where>
     </select>
-    <select id="selectExpenseDispatchOrderDetailPage" resultType="com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO">
-        select t.order_code orderCode,
-        t.waybill_number waybillNumber,
-        t.brand_name brand,
-        t.warehouse_name destinationWarehouse,
-        t.shipper_unit shippingOrg,
-        t.consignee_unit consigneeOrg,
-        t.delivery_type waybillType,
-        t.open_order_time documentCreationTime,
-        count(*) totalQuantity,
-        sum(t.review_num) reviewNumber,
-        sum(case when t.settlement_time is not null then t.review_num end) settlementNumber,
-        sum(t.weight) totalWeight,
-        sum(t.volume) totalVolume,
-        sum(t.total_distribution_cost) totalDistributionCost,
-        sum(t.distribution_cost) distributionCost,
-        sum(t.inventory_distribution_cost) inventoryDistributionCost,
-        sum(t.apstairs_cost) stairCarryingFee,
-        sum(t.apart_cost) goodsAllocationCost,
-        sum(t.move_cost) repositioningCost,
-        sum(t.stevedore_cost) handlingCost,
-        sum(t.kilo_allow_cost) mileageCost,
-        sum(t.allow_kilo_allow_cost) subsidizedKilometerCost,
-        sum(t.ultr_allpw_cost) excessZoneMileageCost,
-        sum(t.point_allow_cost) locationSubsidyCost,
-        sum(t.guar_cost) minimumGuaranteeCost,
-        sum(t.fuel_cost) fuelCost,
-        sum(t.other_cost) otherCosts,
-        sum(t.change_amount) changeAmount,
-        t.shipper_person shipper,
-        t.shipper_mobile shippingPhone,
-        t.shipper_address shippingAddress,
-        t.begin_warehouse_name departureWarehouse,
-        t.consignee_person consignee,
-        t.consignee_mobile consigneePhone,
-        t.consignee_address consigneeAddress,
-        t.train_number customerTrip
-        from logpm_quality_deliver t
-        where
-            t.waybill_number is not null
-            and t.order_code is not null
-            and review_user_name is not null
-            <if test="expenseDispatchOrderDetail.orderCode != null and expenseDispatchOrderDetail.orderCode != ''">
-                and t.order_code like concat('%',#{expenseDispatchOrderDetail.orderCode},'%')
-            </if>
-            <if test="expenseDispatchOrderDetail.destinationWarehouse != null and expenseDispatchOrderDetail.destinationWarehouse != ''">
-                and t.destination_warehouse = #{expenseDispatchOrderDetail.destinationWarehouse}
-            </if>
-            <if test="expenseDispatchOrderDetail.waybillNumber != null and expenseDispatchOrderDetail.waybillNumber != ''">
-                and t.waybill_number = #{expenseDispatchOrderDetail.waybillNumber}
-            </if>
-        group by t.order_code, t.waybill_number
-    </select>
-
 
     <select id="exportExpenseDispatchOrderDetail" resultType="com.logpm.statistics.excel.ExpenseDispatchOrderDetailExcel">
         SELECT * FROM logpm_expense_dispatch_order_detail ${ew.customSqlSegment}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

@@ -203,24 +203,14 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 			ls.add(dto);
 		}
 
-		if(ls.size() > 0){
+		if(!ls.isEmpty()){
 			return warehouseUpdownTypeService.downStock(ls,warehouseId,remark);
 		}else{
 			return R.fail(403,"处理失败");
 		}
 	}
 
-	@Override
-	public boolean packageChangeStock(List<String> orderPackageCodes) {
-		return warehouseUpdownTypeService.packageChangeStock(orderPackageCodes);
-	}
-
-	@Override
-	public R findUpdownTypeInforByAllocationId(Long allocationId, Long warehouseId) {
-		UpShelfAllocationVO upShelfAllocationVO = warehouseUpdownTypeService.upShelfScanAllocation(allocationId, warehouseId);
 
-		return R.data(JSONObject.toJSONString(upShelfAllocationVO));
-	}
 
 	@Override
 	public R findAllGoodsByAllocationId(Long allocationId, Long warehouseId) {