wms-master.git - Gitblit

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.vincent.rsf.framework.common.Cools;
			import com.vincent.rsf.framework.common.R;
			@@ -30,6 +31,7 @@
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.*;
			import org.springframework.web.multipart.MultipartFile;

			@@ -52,7 +54,10 @@
			public R page(@RequestBody Map<String, Object> map) {
			BaseParam baseParam = buildParam(map, BaseParam.class);
			PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
			return R.ok().add(asnOrderService.page(pageParam, pageParam.buildWrapper(true)));
			QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
			List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);
			queryWrapper.notIn("type", asList);
			return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
			}

			@PreAuthorize("hasAuthority('manager:asnOrder:list')")
			@@ -107,11 +112,20 @@
			@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
			@OperationLog("Delete ASN单据")
			@PostMapping("/asnOrder/remove/{ids}")
			@Transactional(rollbackFor = Exception.class)
			public R remove(@PathVariable Long[] ids) {
			if (!asnOrderService.removeByIds(Arrays.asList(ids))) {
			return R.error("Delete Fail");
			if (!asnOrderService.remove(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, Arrays.asList(ids)).eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
			return R.error("任务中单据不可删除！！");
			}
			return R.ok("Delete Success").add(ids);
			for (Long id : ids) {
			List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
			if (!list.isEmpty()) {
			if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, ids))) {
			throw new CoolException("Details Delete Fail");
			}
			}
			}
			return R.ok("删除成功！！").add(ids);
			}

			@PreAuthorize("hasAuthority('manager:asnOrder:list')")