wms-master.git - Gitblit

			@@ -11,6 +11,8 @@
			import com.vincent.rsf.server.common.domain.BaseParam;
			import com.vincent.rsf.server.common.domain.KeyValVo;
			import com.vincent.rsf.server.common.domain.PageParam;
			import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
			import com.vincent.rsf.server.manager.entity.AsnOrder;
			import com.vincent.rsf.server.manager.entity.AsnOrderItem;
			import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
			import com.vincent.rsf.server.manager.service.AsnOrderItemService;
			@@ -73,7 +75,6 @@
			return R.error("Save Fail");
			}
			return R.ok("Save Success");

			}


			@@ -123,23 +124,36 @@
			ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
			}


			@PostMapping("/asnOrderItem/generate/barcode")
			@ApiOperation("生成ASN标签")
			@PreAuthorize("hasAuthority('manager:asnOrder:list')")
			public R generateBarcode(@RequestBody List<Long> orders) {
			if (orders.isEmpty()) {
			return R.error("单据不能为空!!");
			}
			return asnOrderItemService.generateBarcode(orders);
			}

			/**
			* ASN单据明细导入
			* @param file
			* @return
			*/
			@PostMapping("/asnOrder/import")
			@PostMapping("/asnOrderItem/import")
			@ApiOperation("ASN导入接口")
			@PreAuthorize("hasAuthority('manager:asnOrder:update')")
			@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
			public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
			if (Objects.isNull(file)) {
			throw new CoolException("文件不能为空！！");
			R.error("文件不能为空！！");
			}
			HashMap<String, Object> hashMap = new HashMap<>();
			if (!Objects.isNull(asnId)) {
			hashMap.put("asnId", asnId);
			}

			return asnOrderItemService.excelImport(file, hashMap);
			}


			}