diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml index f4da183b2..df310a067 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml @@ -456,83 +456,83 @@ select * from ( SELECT - OUT_ORDER_ID AS orderId, - ORGANIZATION_ID AS organizationId, - organization_name AS topOrganizationId, - out_order_number AS orderNumber, + OUT_ORDER_ID AS "orderId", + ORGANIZATION_ID AS "organizationId", + organization_name AS "topOrganizationId", + out_order_number AS "orderNumber", status, - warehouse_id AS warehouseId, - warehouse_code AS warehouseCode, - warehouse_name AS warehouseName, - shipper_id AS shipperId, - shipper_name AS shipperName, + warehouse_id AS "warehouseId", + warehouse_code AS "warehouseCode", + warehouse_name AS "warehouseName", + shipper_id AS "shipperId", + shipper_name AS "shipperName", quantity, - create_time AS createTime, - create_by AS createBy, - create_by_name AS createByName, - update_time AS updateTime, - update_by AS updateBy, - update_by_name AS updateByName, - del_flag AS delFlag, - issue_status AS issueStatus, - issue_time AS issueTime, - issue_id AS issueId, - issue_name AS issueName, - reservation_audit_id AS reservationAuditId, - reservation_audit_name AS reservationAuditName, - reservation_audit_time AS reservationAuditTime, - RESERVATION_ORDER_SOURCE AS reservationOrderSource, - DIRECTOR_ID AS directorId, - DIRECTOR_PHONE AS directorPhone, - DIRECTOR_NAME AS directorName, - '' AS storageTime, - '' AS inQuantity, - CUSTOMER_ID AS customerId, - CUSTOMER_NAME AS customerName, - CUSTOMER_CODE AS customerCode, - OUTBOUND_TIME AS outboundTime, - BUSINESS_ORDER_NO AS businessOrderNo, - 'out' as inOrOut + create_time AS "createTime", + create_by AS "createBy", + create_by_name AS "createByName", + update_time AS "updateTime", + update_by AS "updateBy", + update_by_name AS "updateByName", + del_flag AS "delFlag", + issue_status AS "issueStatus", + issue_time AS "issueTime", + issue_id AS "issueId", + issue_name AS "issueName", + reservation_audit_id AS "reservationAuditId", + reservation_audit_name AS "reservationAuditName", + reservation_audit_time AS "reservationAuditTime", + RESERVATION_ORDER_SOURCE AS "reservationOrderSource", + DIRECTOR_ID AS "directorId", + DIRECTOR_PHONE AS "directorPhone", + DIRECTOR_NAME AS "directorName", + '' AS "storageTime", + '' AS "inQuantity", + CUSTOMER_ID AS "customerId", + CUSTOMER_NAME AS "customerName", + CUSTOMER_CODE AS "customerCode", + OUTBOUND_TIME AS "outboundTime", + BUSINESS_ORDER_NO AS "businessOrderNo", + 'out' as "inOrOut" FROM RESERVE_STOCK_OUT_ORDER UNION ALL SELECT - IN_ORDER_ID AS orderId, - ORGANIZATION_ID AS organizationId, - organization_name AS topOrganizationId, - in_order_number AS orderNumber, + IN_ORDER_ID AS "orderId", + ORGANIZATION_ID AS "organizationId", + organization_name AS "topOrganizationId", + in_order_number AS "orderNumber", status, - warehouse_id AS warehouseId, - warehouse_code AS warehouseCode, - warehouse_name AS warehouseName, - shipper_id AS shipperId, - shipper_name AS shipperName, + warehouse_id AS "warehouseId", + warehouse_code AS "warehouseCode", + warehouse_name AS "warehouseName", + shipper_id AS "shipperId", + shipper_name AS "shipperName", quantity, - create_time AS createTime, - create_by AS createBy, - create_by_name AS createByName, - update_time AS updateTime, - update_by AS updateBy, - update_by_name AS updateByName, - del_flag AS delFlag, - issue_status AS issueStatus, - issue_time AS issueTime, - issue_id AS issueId, - issue_name AS issueName, - reservation_audit_id AS reservationAuditId, - reservation_audit_name AS reservationAuditName, - reservation_audit_time AS reservationAuditTime, - RESERVATION_ORDER_SOURCE AS reservationOrderSource, - DIRECTOR_ID AS directorId, - DIRECTOR_PHONE AS directorPhone, - DIRECTOR_NAME AS directorName, - STORAGE_TIME AS storageTime, - IN_QUANTITY AS inQuantity, - CUSTOMER_ID AS customerId, - CUSTOMER_NAME AS customerName, - CUSTOMER_CODE AS customerCode, - NULL AS outboundTime, - '' AS businessOrderNo, - 'in' as inOrOut + create_time AS "createTime", + create_by AS "createBy", + create_by_name AS "createByName", + update_time AS "updateTime", + update_by AS "updateBy", + update_by_name AS "updateByName", + del_flag AS "delFlag", + issue_status AS "issueStatus", + issue_time AS "issueTime", + issue_id AS "issueId", + issue_name AS "issueName", + reservation_audit_id AS "reservationAuditId", + reservation_audit_name AS "reservationAuditName", + reservation_audit_time AS "reservationAuditTime", + RESERVATION_ORDER_SOURCE AS "reservationOrderSource", + DIRECTOR_ID AS "directorId", + DIRECTOR_PHONE AS "directorPhone", + DIRECTOR_NAME AS "directorName", + STORAGE_TIME AS "storageTime", + IN_QUANTITY AS "inQuantity", + CUSTOMER_ID AS "customerId", + CUSTOMER_NAME AS "customerName", + CUSTOMER_CODE AS "customerCode", + NULL AS "outboundTime", + '' AS "businessOrderNo", + 'in' as "inOrOut" FROM reserve_stock_in_order ) as a