2023年1月3日17:57:33

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

@@ -1167,6 +1167,12 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "微信预付单号")
 	private String prepayId;
 
+	/**
+	 * 单据状态（1 收货  2 发货）
+	 */
+	@TableField(exist = false)
+	private String billStatus;
+
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderDescClient.java

@@ -30,6 +30,9 @@ public interface IOrderDescClient {
 	String GET_BY_BILLNO = API_PREFIX + "/getByBillNo";
 	String GET_BY_ORDER_FILES=API_PREFIX+"/getByOrderFiles";
 	String CORP_ANALYSIS=API_PREFIX+"/corpAnalysis";
+	String UNDER_REVIEW_TH=API_PREFIX+"/underReviewTH";
+	String PASS_CANCEL_TH=API_PREFIX+"/passCancelTH";
+	String PASS_CHECK_TH=API_PREFIX+"/passCheckTH";
 
 	/**
 	 * 修改采购订单状态
@@ -82,4 +85,13 @@ public interface IOrderDescClient {
 	 */
 	@PostMapping(CORP_ANALYSIS)
 	int corpAnalysis(@RequestBody Order order);
+
+	@GetMapping(UNDER_REVIEW_TH)
+	R underReviewTH(@RequestParam("id") Long id);
+
+	@GetMapping(PASS_CANCEL_TH)
+	R passCancelTH(@RequestParam("id") Long id);
+
+	@GetMapping(PASS_CHECK_TH)
+	R passCheckTH(@RequestParam("id") Long id);
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -79,6 +79,14 @@ public interface IFinanceClient {
 	@PostMapping("settlement/paymentApplyBoxTube")
 	R paymentApplyBoxTube(@Valid @RequestBody ApplyDTO dto);
 
+	/**
+	 * 销售生成账单
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("settlement/paymentApplyLandOrder")
+	R paymentApplyLandOrder(@Valid @RequestBody ApplyDTO dto);
+
 
 	/**
 	 * 根据订单号获取账单信息

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Acc.java

@@ -403,19 +403,19 @@ public class Acc implements Serializable {
 	/**
 	 * 起运港
 	 */
-	@ApiModelProperty(value = "起运港")
+	@ApiModelProperty(value = "起运港（场站）")
 	private String departureHarbor;
 
 	/**
 	 * 目的港
 	 */
-	@ApiModelProperty(value = "目的港")
+	@ApiModelProperty(value = "目的港（货运地点）")
 	private String objectiveHarbor;
 
 	/**
 	 * 船名
 	 */
-	@ApiModelProperty(value = "船名")
+	@ApiModelProperty(value = "船名(运输调度)")
 	private String shipName;
 
 	/**
@@ -459,4 +459,33 @@ public class Acc implements Serializable {
 	@ApiModelProperty(value = "来源业务模块")
 	private String srcBoxBillType;
 
+	/**
+	 * 车队id
+	 */
+	@ApiModelProperty(value = "车队")
+	private Long fleetId;
+
+	/**
+	 * 车队id
+	 */
+	@TableField(exist = false)
+	private String fleetName;
+	/**
+	 * 车号
+	 */
+	@ApiModelProperty(value = "车号")
+	private String plateNo;
+
+	/**
+	 * 箱型
+	 */
+	@ApiModelProperty(value = "箱型")
+	private String ctnType;
+
+	/**
+	 * 来源业务日期检索
+	 */
+	@TableField(exist = false)
+	private List<String> srcDateList;
+
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Items.java

@@ -275,19 +275,19 @@ public class Items implements Serializable {
 	/**
 	 * 起运港
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "起运港（场站）")
 	private String departureHarbor;
 
 	/**
 	 * 目的港
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "目的港（货运地点）")
 	private String objectiveHarbor;
 
 	/**
 	 * 船名
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "船名(运输调度)")
 	private String shipName;
 
 	/**
@@ -324,4 +324,22 @@ public class Items implements Serializable {
 	 */
 	@ApiModelProperty(value = "来源业务模块")
 	private String srcBoxBillType;
+
+	/**
+	 * 车队id
+	 */
+	@ApiModelProperty(value = "车队")
+	private Long fleetId;
+	/**
+	 * 车号
+	 */
+	@ApiModelProperty(value = "车号")
+	private String plateNo;
+
+	/**
+	 * 箱型
+	 */
+	@ApiModelProperty(value = "箱型")
+	private String ctnType;
+
 }