Merge remote-tracking branch 'origin/master'

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/order/vo/OrderItemWithOrderRespVO.java

@@ -0,0 +1,185 @@
+package com.ningxia.yunxi.chemmes.module.biz.controller.admin.order.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 销售订单子项关联主表 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OrderItemWithOrderRespVO {
+
+    // ==================== 子表字段 (tso_order_item) ====================
+    
+    @Schema(description = "子表自增字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "26357")
+    @ExcelProperty("子表ID")
+    private Integer itemId;
+
+    @Schema(description = "销售订单主表id", example = "9457")
+    @ExcelProperty("销售订单主表id")
+    private Integer saleOrdId;
+
+    @Schema(description = "物料id", example = "9604")
+    @ExcelProperty("物料id")
+    private Integer materialId;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String materialCode;
+
+    @Schema(description = "物料名称", example = "王五")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
+    @Schema(description = "规格型号")
+    @ExcelProperty("规格型号")
+    private String spec;
+
+    @Schema(description = "单位")
+    @ExcelProperty("单位")
+    private String unit;
+
+    @Schema(description = "订单数量")
+    @ExcelProperty("订单数量")
+    private BigDecimal ordQty;
+
+    @Schema(description = "含税单价")
+    @ExcelProperty("含税单价")
+    private BigDecimal priceTax;
+
+    @Schema(description = "用途(1 用途1  2 用途2 3 用途3)")
+    @ExcelProperty("用途")
+    private String materialUse;
+
+    @Schema(description = "已发货数量")
+    @ExcelProperty("已发货数量")
+    private BigDecimal deliveriedQty;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String itemRemark;
+
+    @Schema(description = "已转生产数量")
+    @ExcelProperty("已转生产数量")
+    private BigDecimal produceQty;
+
+    @Schema(description = "行状态（0 正常 1部分转产 2-全部转产 9关闭）", example = "2")
+    @ExcelProperty("行状态")
+    private String ordItemStatus;
+
+    @Schema(description = "子表创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("子表创建时间")
+    private LocalDateTime itemCreateTime;
+
+    // ==================== 主表字段 (tso_order) ====================
+
+    @Schema(description = "销售订单编号(SO+年份+月份+3位流水号)")
+    @ExcelProperty("销售订单编号")
+    private String saleOrdNo;
+
+    @Schema(description = "下单日期")
+    @ExcelProperty("下单日期")
+    private LocalDate ordDate;
+
+    @Schema(description = "客户id", example = "23476")
+    @ExcelProperty("客户id")
+    private Integer custId;
+
+    @Schema(description = "客户名称", example = "王五")
+    @ExcelProperty("客户名称")
+    private String custName;
+
+    @Schema(description = "联系人")
+    @ExcelProperty("联系人")
+    private String contact;
+
+    @Schema(description = "联系电话")
+    @ExcelProperty("联系电话")
+    private String conPhone;
+
+    @Schema(description = "业务员id")
+    @ExcelProperty("业务员id")
+    private Long saleMan;
+
+    @Schema(description = "业务部门id", example = "11778")
+    @ExcelProperty("业务部门id")
+    private Long saleDeptId;
+
+    @Schema(description = "订单类型(1 备库订单 2 销售订单)", example = "1")
+    @ExcelProperty("订单类型")
+    private String ordType;
+
+    @Schema(description = "付款方式(1 款到发货 2月结 3承兑)")
+    @ExcelProperty("付款方式")
+    private String paymentTerms;
+
+    @Schema(description = "税率")
+    @ExcelProperty("税率")
+    private BigDecimal taxRate;
+
+    @Schema(description = "含税总金额")
+    @ExcelProperty("含税总金额")
+    private BigDecimal totalAmount;
+
+    @Schema(description = "要求交货日期")
+    @ExcelProperty("要求交货日期")
+    private LocalDate reqDeliveryDate;
+
+    @Schema(description = "是否急单(0 是 1 否)")
+    @ExcelProperty("是否急单")
+    private String isUrgent;
+
+    @Schema(description = "是否变更(0 是 1否)")
+    @ExcelProperty("是否变更")
+    private String isChange;
+
+    @Schema(description = "订单状态(1 已创建 2 已送审 3 已审批  5 打回   8已关闭9作废  )", example = "2")
+    @ExcelProperty("订单状态")
+    private String ordStatus;
+
+    @Schema(description = "合同编号")
+    @ExcelProperty("合同编号")
+    private String contractNo;
+
+    @Schema(description = "包装要求")
+    @ExcelProperty("包装要求")
+    private String packReq;
+
+    @Schema(description = "质量要求")
+    @ExcelProperty("质量要求")
+    private String qualityReq;
+
+    @Schema(description = "主表备注", example = "你猜")
+    @ExcelProperty("主表备注")
+    private String orderRemark;
+
+    @Schema(description = "审核人id", example = "17447")
+    @ExcelProperty("审核人id")
+    private String auditId;
+
+    @Schema(description = "审核时间")
+    @ExcelProperty("审核时间")
+    private LocalDateTime auditTime;
+
+    @Schema(description = "附件信息")
+    @ExcelProperty("附件信息")
+    private String attFile;
+
+    @Schema(description = "生产状态(0 正常 1 部分转生产 2 全部转生产)", example = "1")
+    @ExcelProperty("生产状态")
+    private String proStatus;
+
+    @Schema(description = "发货状态(1 未发货  2 部分发货 3 全部发货)", example = "2")
+    @ExcelProperty("发货状态")
+    private String deliveryStatus;
+
+    @Schema(description = "主表创建时间")
+    @ExcelProperty("主表创建时间")
+    private LocalDateTime orderCreateTime;
+
+}

mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue

@@ -39,25 +39,32 @@
     >
       <el-table-column type="radio" width="50px" />
       <el-table-column label="序号" type="index" width="60px" />
-      <el-table-column label="订单号" align="center" prop="saleOrdNo" width="150px" />
+      <el-table-column label="订单号" align="center" prop="saleOrdNo" width="130px" />
       <el-table-column label="发货状态" align="center" prop="deliveryStatus" width="100px">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SHIPPING_STATUS" :value="scope.row.deliveryStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="订单日期" align="center" prop="ordDate" width="120px" />
+      <el-table-column label="订单日期" align="center" prop="ordDate" width="100px" />
-      <el-table-column label="客户名称" align="center" prop="custName" width="120px" />
+      <el-table-column label="客户名称" align="center" prop="custName" width="200px" />
       <el-table-column label="订单状态" align="center" prop="ordStatus" width="100px">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.ordStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="要求交货日期" align="center" prop="reqDeliveryDate" width="120px" />
+      <el-table-column label="交货日期" align="center" prop="reqDeliveryDate" width="100px" />
-      <el-table-column label="产品名称" align="center" prop="materialName" />
+      <el-table-column label="产品名称" align="center" prop="materialName" width="180px" />
-      <el-table-column label="规格型号" align="center" prop="spec" width="100px" />
+      <el-table-column label="规格型号" align="center" prop="spec" width="110px" />
       <el-table-column label="订单数量" align="center" prop="ordQty" width="100px" />
       <el-table-column label="剩余数量" align="center" prop="remaimQty" width="100px" />
-      <el-table-column label="单位" align="center" prop="unit" width="80px" />
+      <!-- 单位转换 -->
+
+      <el-table-column label="单位" align="center" prop="unit" width="80px" >
+         <template #default="scope">
+          <dict-tag :type="DICT_TYPE.UNIT" :value="scope.row.unit" />
+        </template>
+        </el-table-column>  
+      
     </el-table>
 
     <!-- 分页 -->