|
|
|
|
@ -1,6 +1,7 @@ |
|
|
|
|
package org.springblade.desk.order.controller; |
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
|
import io.swagger.v3.oas.annotations.Parameter; |
|
|
|
|
@ -14,8 +15,10 @@ import org.springblade.core.boot.ctrl.BladeController; |
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.core.tool.utils.ObjectUtil; |
|
|
|
|
import org.springblade.desk.dashboard.utils.DateUtils; |
|
|
|
|
import org.springblade.desk.order.pojo.dto.YieldOrderDto; |
|
|
|
|
import org.springblade.desk.order.pojo.entity.YieldOrder; |
|
|
|
|
import org.springblade.desk.order.pojo.entity.YieldOrderCraft; |
|
|
|
|
@ -29,10 +32,7 @@ import org.springblade.desk.produce.pojo.dto.YieldOrderDTO; |
|
|
|
|
import org.springblade.scheduling.feign.IWorkOrderClient; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 应用管理控制器 - 生产订单 |
|
|
|
|
@ -195,6 +195,21 @@ public class YieldOrderController extends BladeController { |
|
|
|
|
return R.data(list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/confirmByDate") |
|
|
|
|
public void confirmByDate(String date) { |
|
|
|
|
Date start = DateUtil.parse(date,"yyyy-MM-dd 00:00:00"); |
|
|
|
|
Date end = DateUtil.plusDays(start, 1); |
|
|
|
|
|
|
|
|
|
List<YieldOrder> list = yieldOrderService.list( |
|
|
|
|
new LambdaQueryWrapper<YieldOrder>() |
|
|
|
|
.ge(YieldOrder::getCreateTime, start) |
|
|
|
|
.lt(YieldOrder::getCreateTime, end) |
|
|
|
|
); |
|
|
|
|
for (YieldOrder yieldOrder : list) { |
|
|
|
|
yieldOrderService.confirm(yieldOrder.getCardNo(),"0"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 批量确认 |
|
|
|
|
*/ |
|
|
|
|
|