采购订单修改

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -1,5 +1,6 @@
 package com.trade.purchase.order.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.trade.purchase.order.common.entity.OrderBase;
@@ -495,5 +496,7 @@ public class Order extends OrderBase {
 	 */
 	@ApiModelProperty(value = "销售核价备注")
 	private String sellPricingRemarks;
+    @TableField(exist = false)
+	private Boolean hasItem=false;
 
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/ImportOrderController.java

@@ -1,11 +1,17 @@
 package com.trade.purchase.order.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.entity.OrderFees;
 import com.trade.purchase.order.entity.OrderFiles;
+import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.service.IOrderFeesService;
 import com.trade.purchase.order.service.IOrderFilesService;
@@ -25,6 +31,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 进口采购订单表 控制器
@@ -65,12 +73,20 @@ public class ImportOrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询所有", notes = "传入order")
-	public R<IPage<Order>> list(Order order, Query query) {
-		order.setIsDeleted(0);
-		order.setTenantId(AuthUtil.getTenantId());
-		order.setBillType(OrderTypeEnum.PURCHASE.getType());
-		order.setTradeType(OrderTypeEnum.IMPORT.getType());
-		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
+	public R<IPage<Order>> list(@RequestParam Map<String, Object> order, Query query) {
+		order.put("bill_type","CG");
+		order.put("trade_type","JK");
+		order.put("tenant_id",AuthUtil.getTenantId());
+		order.put("is_deleted",0);
+		IPage<Order> pages = orderService.page(Condition.getPage(query),Condition.getQueryWrapper(order, Order.class));
+		List<Order> records = pages.getRecords();
+		if(CollectionUtils.isNotEmpty(records))
+		{
+			records.forEach(e->{
+				Boolean flag=orderItemsService.count(new LambdaQueryWrapper<OrderItems>().eq(OrderItems::getPid,e.getId()))>0?true:false;
+				e.setHasItem(flag);
+			});
+		}
 		return R.data(pages);
 	}
 
@@ -138,6 +154,20 @@ public class ImportOrderController extends BladeController {
 	}
 
 	/**
+	 * 删除采购明细信息
+	 */
+	@PostMapping("/removeByItem")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除采购明细信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderItems items) {
+		if (items.getId() == null) {
+			return R.fail(ERROR_MSG);
+		}
+		items.setIsDeleted(1);
+		return R.status(orderItemsService.updateById(items));
+	}
+
+	/**
 	 * 删除费用信息
 	 */
 	@PostMapping("/removeByFees")
@@ -168,4 +198,13 @@ public class ImportOrderController extends BladeController {
 		return R.status(orderFilesService.updateById(order));
 	}
 
+    @GetMapping("getItemByPid")
+	public R getItemByPid(@RequestParam(value = "id",required = true)Long id)
+	{
+		LambdaQueryWrapper<OrderItems> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(OrderItems::getPid,id);
+		List<OrderItems> itemsList = orderItemsService.list(lambdaQueryWrapper);
+		return R.data(itemsList);
+	}
+
 }