#

Junjie

2024-07-29 e50e0ab213aceb077922c51af2f69e4b24f8478b

#

 zy-asrs-admin/src/components/order/edit.vue

@@ -47,6 +47,7 @@

    if (!isSave.value) {
        param.deleteDetlId = orderDetlChild.value.deleteDetlId;
        param.orderId = formData.value.id;
    }

    post(isSave.value ? '/api/order/save' : '/api/order/update', param).then((resp) => {

 zy-asrs-admin/src/components/orderDetl/show.vue

@@ -165,15 +165,22 @@
<template>
    <div>
        <a-modal v-model:open="openDetl" width="60%" @ok="handleOk">
            <h3>
                订单号：{{ orderInfo.orderNo }}
            </h3>
            <h3>
                单据类型：{{ orderInfo.orderType$ }}
            </h3>
            <h3>
                单据状态：{{ orderInfo.orderSettle$ }}
            </h3>
            <div class="component-header">
                <div>
                    <h3>
                        订单号：{{ orderInfo.orderNo }}
                    </h3>
                    <h3>
                        单据类型：{{ orderInfo.orderType$ }}
                    </h3>
                    <h3>
                        单据状态：{{ orderInfo.orderSettle$ }}
                    </h3>
                </div>
                <div class="qrcode">
                    <a-qrcode :value="orderInfo.orderNo" :size="100" :bordered="false" />
                </div>
            </div>
            <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
                :scroll="{ y: 768 }" :columns="state.columns">
            </a-table>
@@ -181,4 +188,18 @@
    </div>
</template>

<style></style>
<style>
.component-header {
    display: flex;
}

.component-header > div {
    flex: 1;
}

.qrcode {
    display: flex;
    justify-content: flex-end;
    margin-right: 30px;
}
</style>

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java

@@ -8,6 +8,9 @@
@Data
public class UpdateOrderParam {

    //订单ID
    private Long orderId;

    //订单号
    private String orderNo;


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java

@@ -95,7 +95,7 @@

    @Override
    public boolean updateOrder(UpdateOrderParam param) {
        Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.getOrderNo()));
        Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, param.getOrderId()));
        order.setOrderNo(param.getOrderNo());
        order.setOrderType(param.getOrderType());
        order.setOrderSettle(param.getOrderSettle());