liuying
2024-11-30 1bbddc04976e03f1c7f852234f98c6d43b47cf2a
细节
已修改2个文件
73 ■■■■ 文件已修改
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -35,47 +35,35 @@
                    <el-table :data="drawerList" border striped :max-height="480">
                        <el-table-column fixed="left" type="index" label="序号" width="55" align="center" />
                        <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                        <!-- <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                        <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                        <el-table-column prop="info5" label="生产单号" show-overflow-tooltip="" />
                        <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" />
                        <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                        <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                        <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" /> -->
                        <!-- <el-table-column prop="placeCode" label="库位编码" show-overflow-tooltip="" />
                        <el-table-column prop="inTime" label="进入时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                        <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                        <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                        <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                        <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" />
                        <el-table-column prop="length" label="长" show-overflow-tooltip="" />
                        <el-table-column prop="width" label="宽" show-overflow-tooltip="" />
                        <el-table-column prop="thk" label="厚" show-overflow-tooltip="" />
                        <el-table-column prop="stockStatus" label="库存状态" show-overflow-tooltip="">
                            <template #default="scope">
                                <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
                            </template>
                        </el-table-column>
                        <el-table-column prop="stockStatusName" label="库存状态名称" show-overflow-tooltip="" />
                        <el-table-column prop="operReason" label="操作原因" show-overflow-tooltip="" />
                        <el-table-column prop="operUser" label="操作人" show-overflow-tooltip="" />
                        <el-table-column prop="operTime" label="操作时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="lockStatus" label="锁定状态" show-overflow-tooltip="">
                            <template #default="scope">
                                <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
                            </template>
                        </el-table-column>
                        <el-table-column prop="lockReason" label="锁定原因" show-overflow-tooltip="" />
                        <el-table-column prop="lockUser" label="锁定人" show-overflow-tooltip="" />
                        <el-table-column prop="lockTime" label="锁定时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                        <el-table-column prop="remarks" label="备注" show-overflow-tooltip="" />
                        <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
                        <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
                        <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip="" />
                        <el-table-column prop="updateUserName" label="修改人" show-overflow-tooltip="" /> -->
<el-table-column fixed="left" prop="info5" label="生产单号" min-width="150" show-overflow-tooltip="" />
    <el-table-column prop="planNo" label="批次" show-overflow-tooltip />
    <el-table-column prop="orderId" label="订单号" show-overflow-tooltip />
    <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip />
    <el-table-column prop="upi" label="部件条码" show-overflow-tooltip />
    <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip />
    <el-table-column prop="length" label="长度" show-overflow-tooltip />
    <el-table-column prop="width" label="宽度" show-overflow-tooltip />
    <el-table-column prop="thk" label="厚度" show-overflow-tooltip />
    <el-table-column prop="info4" label="销售合同单号" min-width="150" show-overflow-tooltip />
    <el-table-column prop="info10" label="客户名称" show-overflow-tooltip />
    <el-table-column prop="info11" label="自提or发货" show-overflow-tooltip />
    <el-table-column prop="info12" label="包装部件总数量"  min-width="150"  show-overflow-tooltip />
    <el-table-column prop="info13" label="包装面积" show-overflow-tooltip />
    <el-table-column prop="info14" label="部件名称" show-overflow-tooltip />
    <el-table-column prop="info15" label="部件数量" show-overflow-tooltip />
    <el-table-column prop="info16" label="部件尺寸" show-overflow-tooltip />
                    </el-table>
                    <Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -233,9 +233,14 @@
    /// </summary>
    public string DetailName { get; set; }
    /// <summary>
    /// 长
    /// </summary>
    public float Length { get; set; }
    /// <summary>
    /// 宽
    /// </summary>
    public float Width { get; set; }
    /// <summary>
@@ -246,7 +251,9 @@
    /// 销售合同单号
    /// </summary>
    public string? Info4 { get; set; }
    /// <summary>
    /// 生产单号
    /// </summary>
    public string? Info5 { get; set; }
    /// <summary>
    /// 客户名称
@@ -276,6 +283,10 @@
    /// 部件数量
    /// </summary>
    public int? Info15 { get; set; }
    /// <summary>
    /// 部件尺寸
    /// </summary>
    public string? Info16 { get; set; }
}