客户名称带入出货计划

yudao-order-server/src/main/java/cn/iocoder/yudao/module/order/controller/admin/delivery/vo/OrderDeliveryPageItemVO.java

@@ -40,6 +40,9 @@ public class OrderDeliveryPageItemVO {
     @Schema(description = "客户编码")
     private String customNo;
 
+    @Schema(description = "客户名称")
+    private String customName;
+
     @Schema(description = "客户订单号")
     private String customOrderBillNo;
 

yudao-order-server/src/main/resources/mapper/order/OrderDeliveryMapper.xml

@@ -14,6 +14,7 @@
             entry.specification,
             entry.unit,
             sorder.custom_no as customNo,
+            sorder.custom_name as customName,
             entry.custom_order_bill_no as customOrderBillNo,
             entry.custom_order_itemno as customOrderItemno,
             sorder.custom_level as customLevel,

yudao-ui/yudao-ui-admin-vue3/src/views/jiaohuo/OrderDelivery.vue

@@ -78,6 +78,7 @@
       >
         <el-table-column type="selection" width="55" fixed="left" />
         <el-table-column prop="customNo" label="客户编码" width="120" fixed="left" />
+        <el-table-column prop="customName" label="客户名称" width="150" show-overflow-tooltip />
         <el-table-column prop="billNo" label="订单号" width="180" />
         <el-table-column prop="moentryMono" label="工单编号" width="150" />
         <el-table-column prop="itemNumber" label="物料编码" width="150" />

yudao-ui/yudao-ui-admin-vue3/src/views/jiaohuo/components/ShippingPlanForm.vue

@@ -313,7 +313,7 @@ const loadOrderData = (orders) => {
       ordNbr: order.customOrderBillNo || '', // 客户订单号
       billNo: order.billNo || '', // 订单号
       customNo: order.customNo || '', // 客户编码
-      customName: '', // 客户名称(需要从其他地方获取)
+      customName: order.customName || '', // 客户名称
       ordDate: order.createTime ? (typeof order.createTime === 'string' ? order.createTime.substring(0, 10) : new Date(order.createTime).toISOString().substring(0, 10)) : '', // 下单日期
       country: '中国', // 默认中国
       itemNum: order.itemNumber || '', // 物料编号