diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
new file mode 100644
index 000000000..174014f1d
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -0,0 +1,57 @@
+
+/**
+ * @Project: emis
+ * @Title: EmisBrandController.java
+ * @author linfso
+ * @date 2023-12-14 13:02:48
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0
+ * @Description: 品牌 控制器
+ */
+
+package com.xdadan.erp.web.emis;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.emis.domain.EmisBrand;
+import com.xdadan.erp.emis.service.IEmisBrandService;
+import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * EMIS 公共 Controller
+ *
+ * @author linfso
+ * @date 2023-12-14 13:02:48
+ */
+@RestController
+@RequestMapping("/emis/common")
+public class EmisCommonController extends BaseController
+{
+ @Autowired
+ private IEmisElectronicPagService emisElectronicPagService;
+
+ /**
+ * 获取电子面单单号
+ */
+ @PostMapping(value = "/realMatchWaybill")
+ public AjaxResult realMatchWaybill()
+ {
+ try {
+ String waybillNo = emisElectronicPagService.realMatchWaybill();
+ return AjaxResult.success("处理成功",waybillNo);
+ }catch (Exception ex){
+ ex.printStackTrace();
+ return AjaxResult.error(ex.getMessage());
+ }
+ }
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index dc728d9b3..d1188452b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisWaybill.java
* @author linfso
- * @date 2024-03-08 16:14:21
+ * @date 2024-03-28 06:53:43
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: 运单列表 实体类
@@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisWaybill
* @Description 运单列表
* @author linfso
- * @date 2024-03-08 16:14:21
+ * @date 2024-03-28 06:53:43
*/
@Data
public class EmisWaybill extends BaseEntity
@@ -45,8 +45,6 @@ public class EmisWaybill extends BaseEntity
private String billCodeSub;
/* 订单状态 未接单、已转单、未指派、已指派订单、已揽收、订单取消 */
private String orderStatus;
- /* 订单状态描述 */
- private String orderStatusStr;
/* 订单类型 0-预报订单 1-正式订单 */
private String orderType;
/* 下单时间 - 取客户当地时间 */
@@ -58,6 +56,10 @@ public class EmisWaybill extends BaseEntity
private String customerCode;
/* 寄件客户客户名称 */
private String customerName;
+ /* 收件客户编号2502021 */
+ private String receiveCustomerCode;
+ /* 收件客户客户名称 */
+ private String receiveCustomerName;
/* wx openid */
private String openId;
/* 收货人名 */
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9c71ee77f..df24c9956 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -11,12 +11,13 @@
-
+
+
@@ -164,7 +165,7 @@
- select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_status_str, order_type, order_date, user_id, customer_code, customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
+ select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
@@ -345,12 +347,13 @@
bill_code,
bill_code_sub,
order_status,
- order_status_str,
order_type,
order_date,
user_id,
customer_code,
customer_name,
+ receive_customer_code,
+ receive_customer_name,
open_id,
receive_name,
receive_company,
@@ -503,12 +506,13 @@
#{billCode},
#{billCodeSub},
#{orderStatus},
- #{orderStatusStr},
#{orderType},
#{orderDate},
#{userId},
#{customerCode},
#{customerName},
+ #{receiveCustomerCode},
+ #{receiveCustomerName},
#{openId},
#{receiveName},
#{receiveCompany},
@@ -664,12 +668,13 @@
bill_code = #{billCode},
bill_code_sub = #{billCodeSub},
order_status = #{orderStatus},
- order_status_str = #{orderStatusStr},
order_type = #{orderType},
order_date = #{orderDate},
user_id = #{userId},
customer_code = #{customerCode},
customer_name = #{customerName},
+ receive_customer_code = #{receiveCustomerCode},
+ receive_customer_name = #{receiveCustomerName},
open_id = #{openId},
receive_name = #{receiveName},
receive_company = #{receiveCompany},