| | |
| | | import com.zy.common.model.OrderMergeVo; |
| | | import com.zy.common.model.TaskDto; |
| | | import com.zy.common.web.BaseController; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | | import org.springframework.web.bind.annotation.*; |
| | |
| | | /** |
| | | * Created by vincent on 2022/3/26 |
| | | */ |
| | | |
| | | @Slf4j |
| | | @RestController |
| | | public class OutController extends BaseController { |
| | | |
| | |
| | | @ManagerAuth(memo = "订单出库") |
| | | @Transactional |
| | | public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { |
| | | |
| | | log.info("订单出库:{}", locDtos); |
| | | //判断是否可以生成出库工作档 |
| | | boolean lack = true; |
| | | for (LocDto locDto : locDtos) { |
| | |
| | | @RequestMapping(value = "/order/merge/preview/auth") |
| | | @ManagerAuth |
| | | public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){ |
| | | return R.ok().add(orderService.mergePreview(orderIds)); |
| | | List<OrderMergeVo> orderMergeVos = orderService.mergePreview(orderIds); |
| | | log.info("合并出库汇总locDtoList:{}", orderMergeVos); |
| | | return R.ok().add(orderMergeVos); |
| | | } |
| | | |
| | | @PostMapping("/out/pakout/preview/merge/auth") |
| | |
| | | } |
| | | |
| | | } |
| | | |
| | | log.info("合并出库预览locDtoList:{}", locDtoList); |
| | | return R.ok().add(locDtoList); |
| | | |
| | | } |