代码提交

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -575,5 +575,10 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private List<Map<String,Object>> belongToCorpList;
 
+	/**
+	 * 是否开票
+	 */
+	@ApiModelProperty(value = "是否开票")
+	private String ifInvoice;
 
 }

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

@@ -498,5 +498,11 @@ public class Order extends OrderBase {
 	private String sellPricingRemarks;
     @TableField(exist = false)
 	private Boolean hasItem=false;
+	/**
+	 * 是否开票
+	 */
+	@ApiModelProperty(value = "是否开票")
+	private String ifInvoice;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -34,10 +34,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @NonDS
 @ApiIgnore
@@ -195,6 +192,22 @@ public class PortController
 		return R.data(portTypeVOS);
 	}
 
+	@GetMapping("listPort")
+	public List<Map<String,Object>> listPort()
+	{
+		List<Map<String,Object>> result=new ArrayList<>();
+		List<BasicPortDesc> list = basicPortDescService.list();
+		if(!CollectionUtils.isEmpty(list))
+		{
+			list.forEach(e->{
+                Map<String,Object> model=new HashMap();
+				model.put("id",e.getId());
+				model.put("name",e.getName());
+				result.add(model);
+			});
+		}
+		return result;
+	}
 
 
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -60,6 +60,8 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		saveFees(orderSubmitDto.getOrderFeesList(), orderSubmitDto.getDelFeesIds(),order.getId());
 		// 保存文件信息
 		saveFiles(orderSubmitDto.getOrderFilesList(), orderSubmitDto.getDelFilesIds(),order.getId());
+
+		orderSubmitDto.setId(order.getId());
 	}
 
 	/**

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

@@ -77,25 +77,28 @@ public class PurchaseOrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "采购订单表列表(内贸 外贸 出口)", notes = "传入order")
-	public R<IPage<Order>> list(@RequestParam(name = "current", defaultValue = "1") Integer current,
-								@RequestParam(name = "size", defaultValue = "10") Integer size,
+	public R<IPage<Order>> list( @RequestParam(name = "current", defaultValue = "1") Integer current,
+								 @RequestParam(name = "size", defaultValue = "10") Integer size,
 								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间
 								 @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
 								 @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//付款开始时间
 								 @RequestParam(value = "accountsCollectionEndDate",required = false) String accountsCollectionEndDate,//付款结束时间
 								 @RequestParam(value = "dateOfStartArrival",required = false) String dateOfStartArrival,//付款开始时间
-								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//付款开始时间
-								 @RequestParam(value = "tradeType",required = false) String tradeType//采购订单类型 GN JK CK
+								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//付款开始时间,
+								 @RequestParam(value = "requiredDeliveryStartDate",required = false) String requiredDeliveryStartDate,//付款开始时间
+								 @RequestParam(value = "requiredDeliveryEndDate",required = false) String requiredDeliveryEndDate,//付款开始时间
+								 Order order
 								)
 	{
 
-		QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<Order> queryWrapper = Condition.getQueryWrapper(order);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());
-		queryWrapper.eq("trade_type",tradeType);
+		queryWrapper.eq("trade_type",order.getTradeType());
 		queryWrapper.between(StringUtils.isNotBlank(businesStartDate)&&StringUtils.isNotBlank(businesEndDate),"busines_date",businesStartDate,businesEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(accountsCollectionStartDate)&&StringUtils.isNotBlank(accountsCollectionEndDate),"accounts_collection_date",accountsCollectionStartDate,accountsCollectionEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"arrival_date",dateOfStartArrival,dateOfEndArrival);
+		queryWrapper.between(StringUtils.isNotBlank(requiredDeliveryStartDate)&&StringUtils.isNotBlank(requiredDeliveryEndDate),"required_delivery_date",requiredDeliveryStartDate,requiredDeliveryEndDate);
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);
 		List<Order> records = pages.getRecords();
@@ -156,10 +159,10 @@ public class PurchaseOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto)
 	{
-		if(ObjectUtil.isEmpty(submitDto.getBillType())||ObjectUtil.isEmpty(submitDto.getSrcId())||ObjectUtil.isEmpty(submitDto.getBusinesDate()))
+		/*if(ObjectUtil.isEmpty(submitDto.getBillType())||ObjectUtil.isEmpty(submitDto.getSrcId())||ObjectUtil.isEmpty(submitDto.getBusinesDate()))
 		{
 			throw new ServiceException("来源、合同日期、贸易类型不能为空!");
-		}
+		}*/
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
 		return orderService.submitOrderMessage(submitDto);
 	}
@@ -184,8 +187,7 @@ public class PurchaseOrderController extends BladeController {
 		if (items.getId() == null) {
 			return R.fail(ERROR_MSG);
 		}
-		items.setIsDeleted(1);
-		return R.status(orderItemsService.updateById(items));
+		return R.status(orderItemsService.removeById(items.getId()));
 	}
 
 	/**
@@ -198,8 +200,7 @@ public class PurchaseOrderController extends BladeController {
 		if (order.getId() == null) {
 			return R.fail(ERROR_MSG);
 		}
-		order.setIsDeleted(1);
-		return R.status(orderFeesService.updateById(order));
+		return R.status(orderFeesService.removeById(order.getId()));
 	}
 
 	/**
@@ -215,8 +216,7 @@ public class PurchaseOrderController extends BladeController {
 		if (order.getId() == null) {
 			return R.fail(ERROR_MSG);
 		}
-		order.setIsDeleted(1);
-		return R.status(orderFilesService.updateById(order));
+		return R.status(orderFilesService.removeById(order.getId()));
 	}
 
     @GetMapping("getItemByPid")
@@ -229,4 +229,10 @@ public class PurchaseOrderController extends BladeController {
 		return R.data(itemsList);
 	}
 
+	@GetMapping("getSysNo")
+	@ApiOperation(value = "采购订单获取系统编号prefix=GN JK CK", notes = "采购订单获取系统编号prefix=GN JK CK")
+	public R  getSysNo(@RequestParam(value = "prefix",required = true)String prefix)
+	{
+		return orderService.getSysNo(prefix);
+	}
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.vo.OrderVO;
+import lombok.Synchronized;
 import org.springblade.core.tool.api.R;
 
 /**
@@ -77,4 +78,7 @@ public interface IOrderService extends IService<Order> {
 	 */
 	R<OrderVO> getShippingMessage(String id);
 
+	R  getSysNo(String prefix);
+
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCaseExpr;
 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.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -63,6 +64,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 
+
 	private final IOrderSave orderSave;
 
 	private final OrderItemMapstructMapper orderItemMapstructMapper;
@@ -147,7 +149,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		// 落库
 		orderSave.save(submitDto);
 		// todo:: 是否需要加日志
-		return R.status(true);
+		return R.data(String.valueOf(submitDto.getId()));
 	}
 
 	/**
@@ -165,7 +167,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (Objects.isNull(orderMessage)) {
 			throw new OrderException("未找到订单信息");
 		}
-		OrderVO vo = OrderMapstructMapper.INSTANCE.toVo(orderMessage);
+		OrderVO vo=new OrderVO();
+		BeanUtil.copyProperties(orderMessage,vo);
+		/*OrderVO vo = OrderMapstructMapper.INSTANCE.toVo(orderMessage);*/
 		//获取创建人中文名
 		R<User> createUser = userClient.userInfoById(vo.getCreateUser());
 
@@ -348,6 +352,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return R.data(vo);
 	}
 
+	@Override
+	@Transactional
+	public synchronized R getSysNo(String prefix)
+	{
+		R billNo = serialClient.getBillNo(prefix);
+		if (billNo.getCode() != 200){
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			throw new RuntimeException("生成系统编号失败");
+		}
+		return billNo;
+	}
+
 	/**
 	 * 获取订单明细数据
 	 *