wms-master.git - Gitblit

			@@ -13,6 +13,7 @@
			import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
			import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
			import com.vincent.rsf.server.manager.entity.AsnOrder;
			import com.vincent.rsf.server.manager.entity.Matnr;
			import com.vincent.rsf.server.manager.service.AsnOrderService;
			import com.vincent.rsf.server.system.constant.SerialRuleCode;
			import com.vincent.rsf.server.system.controller.BaseController;
			@@ -121,7 +122,13 @@
			@PostMapping("/asnOrder/export")
			@ApiOperation("导出")
			public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
			ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response);
			List<AsnOrder> orders = new ArrayList<>();
			if (!Objects.isNull(map.get("ids"))) {
			orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")).eq(AsnOrder::getStatus, 1));
			} else {
			orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().last("limit 1"));
			}
			ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
			}

			/**
			@@ -157,18 +164,17 @@
			@PostMapping("/asnOrder/items/save")
			@ApiOperation("保存主单及明细")
			@PreAuthorize("hasAuthority('manager:asnOrder:save')")
			public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
			public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
			if (Objects.isNull(params)) {
			return R.error("参数不能为空！！");
			}

			return asnOrderService.saveOrderAndItems(params, getLoginUserId());
			}

			@ApiOperation("单据信息修改")
			@PostMapping("/asnOrder/items/update")
			@PreAuthorize("hasAuthority('manager:asnOrder:update')")
			public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) {
			public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
			if (Objects.isNull(params)) {
			return R.error("参数不能为空！！");
			}
			@@ -190,4 +196,25 @@
			}
			return R.ok(asnOrderService.batchUpdate(params, getLoginUserId()));
			}

			@ApiOperation("一键收货")
			@PostMapping("/asnOrder/complete/{id}")
			@PreAuthorize("hasAuthority('manager:asnOrder:update')")
			public R completeOrder(@PathVariable Long id) {
			if (Objects.isNull(id)) {
			return R.error("参数不能为空！！");
			}
			return asnOrderService.completeOrder(id, getLoginUserId());
			}

			@ApiOperation("关闭收货单")
			@PostMapping("/asnOrder/close/{id}")
			@PreAuthorize("hasAuthority('manager:asnOrder:update')")
			public R closeOrder(@PathVariable Long id) {
			if (Objects.isNull(id)) {
			return R.error("参数不能为空！！");
			}
			return asnOrderService.closeOrder(id);
			}

			}