*

lsh

9 小时以前 33884a1e6e3126983ae944fff749fe6f9271c404

*

 src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java

@@ -148,7 +148,7 @@
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
//        wrapper.eq("status", 1);
        Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }

 src/main/java/com/zy/asrs/controller/OrderPakoutController.java

@@ -9,6 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -310,15 +311,43 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);

        try{
            String itemName = null;
            String cstmrName = null;
            Integer settle = null;
            Integer status = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
                if (Cools.isEmpty(val)) {
                    continue;
                }
                if (val.contains(RANGE_TIME_LINK)) {
                    String[] dates = val.split(RANGE_TIME_LINK);
                    modiTimeStart = DateUtils.convert(dates[0]);
                    modiTimeEnd = DateUtils.convert(dates[1]);
                } else if (entry.getKey().equals("settle")) {
                    settle = Integer.parseInt(val);
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                }
//                else if (entry.getKey().equals("order_no")) {
//                    orderNo = val;
//                }
                else if (entry.getKey().equals("item_name")) {
                    itemName = val;
                } else if (entry.getKey().equals("cstmr_name")) {
                    cstmrName = val;
                }
            }
            List<OrderPakoutMainVo> orderPakoutMainVos = orderService.selectOrderPakoutMainVoList(itemName, cstmrName, settle, status, modiTimeStart, modiTimeEnd, curr, limit);
            Page<OrderPakoutMainVo> page = new Page<OrderPakoutMainVo>(curr, limit).setRecords(orderPakoutMainVos);
            page.setTotal(orderService.selectOrderPakoutMainVoListTotal(itemName, cstmrName, settle, status, modiTimeStart, modiTimeEnd));
            return R.ok(page);
        } catch (Exception e){

        }
        wrapper.eq("status", 1);
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
        return R.error();
    }


}

 src/main/java/com/zy/asrs/entity/result/OrderPakoutDetailVo.java

New file
@@ -0,0 +1,57 @@
package com.zy.asrs.entity.result;

import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
public class OrderPakoutDetailVo {
    private Long id;
    private String itemName;
    private String matnr;
    private String batch;
    private String model;
    private String origin;
    private Integer danger;
    private Integer status;
    private String specs;
    private String brand;
    private BigDecimal price;
    private BigDecimal weight;
    private BigDecimal roughWeight;
    private BigDecimal volume;
    private BigDecimal anfme;
    private BigDecimal qty;
    private BigDecimal units;
    private BigDecimal safeQty;
    private BigDecimal workQty;
    private Long orderId;
    private String orderNo;
    private String maktx;
    private String color;
    private String unit;
    private String sku;
    private String barcode;
    private String manu;
    private String manuDate;
    private String itemNum;
    private BigDecimal length;
    private String threeCode;
    private String supp;
    private String suppCode;
    private Integer beBatch;
    private String deadTime;
    private Integer deadWarn;
    private Integer source;
    private Integer inspect;
    private Integer tkType;
    private Long rollUp;
    private Long createBy;
    private Date createTime;
    private Long updateBy;
    private Date updateTime;
    private String memo;

    // getter和setter方法
}

 src/main/java/com/zy/asrs/entity/result/OrderPakoutMainVo.java

New file
@@ -0,0 +1,47 @@
package com.zy.asrs.entity.result;

import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
public class OrderPakoutMainVo {
    private Long id;
    private String itemName;
    private Integer orderCount;
    private String uuid;
    private String orderNo;
    private String orderTime;
    private Long docType;
    private Long itemId;
    private Long allotItemId;
    private String defNumber;
    private String number;
    private Long cstmr;
    private String cstmrName;
    private String tel;
    private String operMemb;
    private BigDecimal totalFee;
    private BigDecimal discount;
    private BigDecimal discountFee;
    private BigDecimal otherFee;
    private BigDecimal actFee;
    private Integer payType;
    private String salesman;
    private Integer accountDay;
    private Integer postFeeType;
    private BigDecimal postFee;
    private Date payTime;
    private Date sendTime;
    private String shipName;
    private String shipCode;
    private Long settle;
    private Integer status;
    private Long createBy;
    private Date createTime;
    private Long updateBy;
    private Date updateTime;
    private String memo;

}

 src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java

@@ -2,10 +2,12 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;

@Mapper
@@ -23,4 +25,20 @@

    List<OrderPakout> selectorderNoL(@Param("orderNo")String orderNo);
    List<OrderPakout> selectorderNoLT(@Param("orderNo")String orderNo);

    List<OrderPakoutMainVo> selectOrderPakoutMainVoList(@Param("itemName") String itemName,
                                              @Param("cstmrName") String cstmrName,
                                              @Param("settle") Integer settle,
                                              @Param("status") Integer status,
                                              @Param("modiTimeStart") Date modiTimeStart,
                                              @Param("modiTimeEnd") Date modiTimeEnd,
                                              @Param("pageNumber") Integer curr,
                                              @Param("pageSize") Integer limit);

    Long selectOrderPakoutMainVoListTotal(@Param("itemName") String itemName,
                                                        @Param("cstmrName") String cstmrName,
                                                        @Param("settle") Integer settle,
                                                        @Param("status") Integer status,
                                                        @Param("modiTimeStart") Date modiTimeStart,
                                                        @Param("modiTimeEnd") Date modiTimeEnd);
}

 src/main/java/com/zy/asrs/service/OrderPakoutService.java

@@ -5,7 +5,9 @@
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.result.OrderPakoutMainVo;

import java.util.Date;
import java.util.List;

public interface OrderPakoutService extends IService<OrderPakout> {
@@ -27,4 +29,8 @@

    List<OrderPakout> selectorderNoL(String orderNo);

    List<OrderPakoutMainVo> selectOrderPakoutMainVoList(String itemName, String cstmrName, Integer settle, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);

    Long selectOrderPakoutMainVoListTotal(String itemName, String cstmrName, Integer settle, Integer status, Date modiTimeStart,Date modiTimeEnd);

}

 src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java

@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.mapper.OrderDetlPakoutMapper;
import com.zy.asrs.mapper.OrderPakoutMapper;
import com.zy.asrs.service.OrderDetlPakoutService;
@@ -14,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

@Slf4j
@@ -80,4 +82,14 @@
        return this.baseMapper.selectorderNoL(orderNo);
    }

    @Override
    public List<OrderPakoutMainVo> selectOrderPakoutMainVoList(String itemName, String cstmrName, Integer settle, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectOrderPakoutMainVoList(itemName,cstmrName,settle, status,modiTimeStart,modiTimeEnd,curr,limit);
    }

    @Override
    public Long selectOrderPakoutMainVoListTotal(String itemName, String cstmrName, Integer settle, Integer status, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectOrderPakoutMainVoListTotal(itemName,cstmrName,settle, status,modiTimeStart,modiTimeEnd);
    }

}

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

@@ -50,6 +50,59 @@

    </resultMap>

    <!-- 明细视图B的通用查询映射结果 -->
    <resultMap id="PakoutDetailResultMap" type="com.zy.asrs.entity.result.OrderPakoutDetailVo">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="item_name" property="itemName" jdbcType="VARCHAR"/>
        <result column="matnr" property="matnr" jdbcType="VARCHAR"/>
        <result column="batch" property="batch" jdbcType="VARCHAR"/>
        <result column="model" property="model" jdbcType="VARCHAR"/>
        <result column="origin" property="origin" jdbcType="VARCHAR"/>
        <result column="danger" property="danger" jdbcType="INTEGER"/>
        <result column="status" property="status" jdbcType="INTEGER"/>
        <result column="specs" property="specs" jdbcType="VARCHAR"/>
        <result column="brand" property="brand" jdbcType="VARCHAR"/>
        <result column="price" property="price" jdbcType="DECIMAL"/>
        <result column="weight" property="weight" jdbcType="DECIMAL"/>
        <result column="roughWeight" property="roughWeight" jdbcType="DECIMAL"/>
        <result column="volume" property="volume" jdbcType="DECIMAL"/>

        <!-- 数量字段 -->
        <result column="anfme" property="anfme" jdbcType="DECIMAL"/>
        <result column="qty" property="qty" jdbcType="DECIMAL"/>
        <result column="units" property="units" jdbcType="DECIMAL"/>
        <result column="safe_qty" property="safeQty" jdbcType="DECIMAL"/>
        <result column="work_qty" property="workQty" jdbcType="DECIMAL"/>

        <!-- 其他字段 -->
        <result column="order_id" property="orderId" jdbcType="BIGINT"/>
        <result column="order_no" property="orderNo" jdbcType="VARCHAR"/>
        <result column="maktx" property="maktx" jdbcType="VARCHAR"/>
        <result column="color" property="color" jdbcType="VARCHAR"/>
        <result column="unit" property="unit" jdbcType="VARCHAR"/>
        <result column="sku" property="sku" jdbcType="VARCHAR"/>
        <result column="barcode" property="barcode" jdbcType="VARCHAR"/>
        <result column="manu" property="manu" jdbcType="VARCHAR"/>
        <result column="manu_date" property="manuDate" jdbcType="VARCHAR"/>
        <result column="item_num" property="itemNum" jdbcType="VARCHAR"/>
        <result column="length" property="length" jdbcType="DECIMAL"/>
        <result column="three_code" property="threeCode" jdbcType="VARCHAR"/>
        <result column="supp" property="supp" jdbcType="VARCHAR"/>
        <result column="supp_code" property="suppCode" jdbcType="VARCHAR"/>
        <result column="be_batch" property="beBatch" jdbcType="INTEGER"/>
        <result column="dead_time" property="deadTime" jdbcType="VARCHAR"/>
        <result column="dead_warn" property="deadWarn" jdbcType="INTEGER"/>
        <result column="source" property="source" jdbcType="INTEGER"/>
        <result column="inspect" property="inspect" jdbcType="INTEGER"/>
        <result column="tk_type" property="tkType" jdbcType="INTEGER"/>
        <result column="roll_up" property="rollUp" jdbcType="BIGINT"/>
        <result column="create_by" property="createBy" jdbcType="BIGINT"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_by" property="updateBy" jdbcType="BIGINT"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="memo" property="memo" jdbcType="VARCHAR"/>
    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
        select * from man_order_detl_pakout
        where 1=1

 src/main/resources/mapper/OrderPakoutMapper.xml

@@ -42,6 +42,46 @@

    </resultMap>

    <!-- 主视图A的通用查询映射结果 -->
    <resultMap id="PakoutMainResultMap" type="com.zy.asrs.entity.result.OrderPakoutMainVo">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="item_name" property="itemName" jdbcType="VARCHAR"/>
        <result column="order_count" property="orderCount" jdbcType="INTEGER"/>
        <result column="uuid" property="uuid" jdbcType="VARCHAR"/>
        <result column="order_no" property="orderNo" jdbcType="VARCHAR"/>
        <result column="order_time" property="orderTime" jdbcType="VARCHAR"/>
        <result column="doc_type" property="docType" jdbcType="BIGINT"/>
        <result column="item_id" property="itemId" jdbcType="BIGINT"/>
        <result column="allot_item_id" property="allotItemId" jdbcType="BIGINT"/>
        <result column="def_number" property="defNumber" jdbcType="VARCHAR"/>
        <result column="number" property="number" jdbcType="VARCHAR"/>
        <result column="cstmr" property="cstmr" jdbcType="BIGINT"/>
        <result column="cstmr_name" property="cstmrName" jdbcType="VARCHAR"/>
        <result column="tel" property="tel" jdbcType="VARCHAR"/>
        <result column="oper_memb" property="operMemb" jdbcType="VARCHAR"/>
        <result column="total_fee" property="totalFee" jdbcType="DECIMAL"/>
        <result column="discount" property="discount" jdbcType="DECIMAL"/>
        <result column="discount_fee" property="discountFee" jdbcType="DECIMAL"/>
        <result column="other_fee" property="otherFee" jdbcType="DECIMAL"/>
        <result column="act_fee" property="actFee" jdbcType="DECIMAL"/>
        <result column="pay_type" property="payType" jdbcType="INTEGER"/>
        <result column="salesman" property="salesman" jdbcType="VARCHAR"/>
        <result column="account_day" property="accountDay" jdbcType="INTEGER"/>
        <result column="post_fee_type" property="postFeeType" jdbcType="INTEGER"/>
        <result column="post_fee" property="postFee" jdbcType="DECIMAL"/>
        <result column="pay_time" property="payTime" jdbcType="TIMESTAMP"/>
        <result column="send_time" property="sendTime" jdbcType="TIMESTAMP"/>
        <result column="ship_name" property="shipName" jdbcType="VARCHAR"/>
        <result column="ship_code" property="shipCode" jdbcType="VARCHAR"/>
        <result column="settle" property="settle" jdbcType="BIGINT"/>
        <result column="status" property="status" jdbcType="INTEGER"/>
        <result column="create_by" property="createBy" jdbcType="BIGINT"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_by" property="updateBy" jdbcType="BIGINT"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="memo" property="memo" jdbcType="VARCHAR"/>
    </resultMap>

    <update id="updateSettle">
        update man_order_pakout
        set settle = #{settle}
@@ -103,4 +143,39 @@
        and (settle = 10 or settle = 98)
    </update>

    <select id="selectOrderPakoutMainVoList" resultMap="PakoutMainResultMap">
        SELECT * FROM v_pakout_main
        WHERE status = 1
        <if test="itemName != null and itemName != ''">
            AND item_name LIKE CONCAT('%', #{itemName}, '%')
        </if>
        <if test="cstmrName != null and cstmrName != ''">
            AND cstmr_name LIKE CONCAT('%', #{cstmrName}, '%')
        </if>
        <if test="settle != null and settle != ''">
            AND settle = #{settle}
        </if>
        <if test="status != null and status != ''">
            AND status = #{status}
        </if>
        ORDER BY create_time DESC
    </select>

    <select id="selectOrderPakoutMainVoListTotal" resultType="Long">
        SELECT count(1) FROM v_pakout_main
        WHERE status = 1
        <if test="itemName != null and itemName != ''">
            AND item_name LIKE CONCAT('%', #{itemName}, '%')
        </if>
        <if test="cstmrName != null and cstmrName != ''">
            AND cstmr_name LIKE CONCAT('%', #{cstmrName}, '%')
        </if>
        <if test="settle != null and settle != ''">
            AND settle = #{settle}
        </if>
        <if test="status != null and status != ''">
            AND status = #{status}
        </if>
    </select>

</mapper>

 src/main/webapp/static/layuiadmin/json/console/top-card.js

@@ -1,76 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"count": "100"
  ,"data": [{
    "id": 111
    ,"title": "社区开始接受 “赞助商广告” 投放"
    ,"username": "贤心"
    ,"channel": "公告"
    ,"href": "http://fly.layui.com/jie/15697/"
    ,"crt": 61632
  },{
    "id": 222
    ,"title": "layui 一周年"
    ,"username": "猫吃"
    ,"channel": "讨论"
    ,"href": "http://fly.layui.com/jie/16622/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "四个月的前端"
    ,"username": "fd"
    ,"channel": "分享"
    ,"href": "http://fly.layui.com/jie/16651/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  },{
    "id": 333
    ,"title": "如何评价LayUI和他的作者闲心"
    ,"username": "纸飞机"
    ,"channel": "提问"
    ,"href": "http://fly.layui.com/jie/9352/"
    ,"crt": 61632
  }]
}
{"code":0,"msg":"","count":"100","data":[{"id":111,"title":"社区开始接受 “赞助商广告” 投放","username":"贤心","channel":"公告","href":"http://fly.layui.com/jie/15697/","crt":61632},{"id":222,"title":"layui 一周年","username":"猫吃","channel":"讨论","href":"http://fly.layui.com/jie/16622/","crt":61632},{"id":333,"title":"四个月的前端","username":"fd","channel":"分享","href":"http://fly.layui.com/jie/16651/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"如何评价LayUI和他的作者闲心","username":"纸飞机","channel":"提问","href":"http://fly.layui.com/jie/9352/","crt":61632}]}

 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -104,7 +104,7 @@
            <div class="search-item">
                <span class="search-label">组货单号:</span>
                <el-input
                        v-model="searchForm.uuid"
                        v-model="searchForm.itemName"
                        placeholder="请输入组货单号"
                        clearable
                        style="width: 150px;"
@@ -140,19 +140,15 @@
                        style="width: 150px;"
                >
                    <el-option label="全部" value=""></el-option>
                    <el-option label="待处理" value="1"></el-option>
                    <el-option label="作业中" value="2"></el-option>
                    <el-option label="已取消" value="3"></el-option>
                    <el-option label="已完成" value="4"></el-option>
                    <el-option label="准备取消" value="5"></el-option>
                    <el-option label="已完成" value="6"></el-option>
                    <el-option label="上报完成" value="7"></el-option>
                    <el-option label="待判查询中" value="9"></el-option>
                    <el-option label="就绪" value="10"></el-option>
                    <el-option label="生成实际组货单中。请等待..." value="11"></el-option>
                    <el-option label="生成实际组货单成功" value="12"></el-option>
                    <el-option label="生成实际组货单失败" value="13"></el-option>
                    <el-option label="异常" value="99"></el-option>
                    <el-option label="待处理" value="10"></el-option>
                    <el-option label="检验中" value="11"></el-option>
                    <el-option label="出库中" value="12"></el-option>
                    <el-option label="存在不合格" value="13"></el-option>
                    <el-option label="待上报" value="15"></el-option>
                    <el-option label="上报完成" value="16"></el-option>
                    <el-option label="上报失败" value="17"></el-option>
                    <el-option label="异常" value="98"></el-option>
                    <el-option label="废弃" value="99"></el-option>
                </el-select>
            </div>
            <div class="search-actions">
@@ -172,8 +168,9 @@
                style="width: 100%"
                v-loading="loading"
                @sort-change="handleSortChange">
            <el-table-column prop="uuid" label="组货单号" width="120" align="center" sortable="custom"></el-table-column>
            <el-table-column prop="orderNo" label="订单编号" min-width="140" align="center"></el-table-column>
            <el-table-column prop="itemName" label="组货单号" width="120" align="center" sortable="custom"></el-table-column>
<!--            <el-table-column prop="orderNo" label="订单编号" min-width="140" align="center"></el-table-column>-->
<!--            <el-table-column prop="memo" label="备注" min-width="120" align="center"></el-table-column>-->
            <el-table-column prop="cstmrName" label="客户名称" min-width="120" align="center"></el-table-column>
            <el-table-column prop="settle" label="状态" min-width="100" align="center" :formatter="formatStatus"></el-table-column>
<!--            <el-table-column prop="totalFee" label="合计金额" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>-->
@@ -214,12 +211,11 @@
            class="detail-dialog"
            @close="closeDetailDialog">
        <div v-if="currentRow">
            <h3>组货单主表 (组货单号: {{ currentRow.uuid }})</h3>
            <h3>组货单主表 (组货单号: {{ currentRow.itemName }})</h3>
            <el-descriptions :column="2" border>
                <el-descriptions-item label="订单编号">{{ currentRow.orderNo }}</el-descriptions-item>
<!--                <el-descriptions-item label="订单编号">{{ currentRow.orderNo }}</el-descriptions-item>-->
                <el-descriptions-item label="客户名称">{{ currentRow.cstmrName }}</el-descriptions-item>
                <el-descriptions-item label="状态">{{ currentRow.settle$ }}</el-descriptions-item>
                <el-descriptions-item label="合计金额">{{ formatCurrency(currentRow) }}</el-descriptions-item>
                <el-descriptions-item label="状态">{{ formatStatus(currentRow)}}</el-descriptions-item>
                <el-descriptions-item label="创建时间">{{ formatDate(currentRow.createTime) }}</el-descriptions-item>
                <el-descriptions-item label="备注">{{ currentRow.memo || '无' }}</el-descriptions-item>
            </el-descriptions>
@@ -233,10 +229,10 @@
                <el-table-column prop="matnr" label="规格" min-width="120" align="center"></el-table-column>
                <el-table-column prop="batch" label="箱号" min-width="80" align="center"></el-table-column>
                <el-table-column prop="model" label="卷号" min-width="100" align="center" ></el-table-column>
<!--                <el-table-column prop="totalPrice" label="金额" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>-->
                <el-table-column prop="origin" label="位置" min-width="100" align="center"></el-table-column>
                <el-table-column prop="danger" label="待判" min-width="100" align="center"></el-table-column>
                <el-table-column prop="memo" label="备注" min-width="100" align="center"></el-table-column>
                <el-table-column prop="status" label="状态" min-width="100" align="center" :formatter="formatStatusB"></el-table-column>
                <!-- 可根据实际需求添加更多子表列 -->
            </el-table>

@@ -272,7 +268,7 @@
        data: {
            // 搜索表单
            searchForm: {
                uuid: '',
                item_name: '',
                cstmr_name: '',
                settle: '',
                order_no: ''
@@ -335,10 +331,10 @@
                    if (that.searchForm[key] !== '') {
                        if (key === 'orderNo'){
                            params['order_no'] = that.searchForm[key];
                        } else if (key === 'itemName'){
                            params['item_name'] = that.searchForm[key];
                        } else if (key === 'cstmrName'){
                            params['cstmr_name'] = that.searchForm[key];
                        } else if (key === 'settle$'){
                            params['settle'] = that.searchForm[key];
                        } else {
                            params[key] = that.searchForm[key];
                        }
@@ -346,8 +342,8 @@
                });

                $.ajax({
                    // url: baseUrl + "/order/pakout/order/cargo/grouping/auth/v1",
                    url: baseUrl + "/order/head/page/auth",
                    url: baseUrl + "/order/pakout/order/cargo/grouping/auth/v1",
                    // url: baseUrl + "/order/head/page/auth",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -389,8 +385,8 @@

                // 模拟API调用 - 根据实际业务调整API地址
                $.ajax({
                    // url: baseUrl + "/order/pakout/orderDetl/cargo/grouping/auth",
                    url: baseUrl + "/orderDetl/list/auth",
                    url: baseUrl + "/order/pakout/orderDetl/cargo/grouping/auth",
                    // url: baseUrl + "/orderDetl/list/auth",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -412,7 +408,7 @@
                    error: function() {
                        that.detailLoading = false;
                        // 实际项目中应使用真实API，这里使用模拟数据
                        that.mockTableBData(uuid);
                        that.mockTableBData(itemName);
                    }
                });
            },
@@ -437,7 +433,7 @@
                    return;
                }

                const groupOrderNo = this.currentRow.uuid;
                const groupOrderNo = this.currentRow.itemName;

                this.$confirm(
                        `是否确认开始上报组货单号 <strong style="color: #F56C6C; font-size: 16px;">${groupOrderNo}</strong>?<br/><br/>将生成实际组货单，单一组货单号只能操作一次!!!`,
@@ -479,7 +475,7 @@
                        'token': localStorage.getItem('token')
                    },
                    data: JSON.stringify({
                        uuid: groupOrderNo // 传递组货单号
                        item_name: groupOrderNo // 传递组货单号
                    }),
                    dataType: 'json',
                    contentType: 'application/json;charset=UTF-8',
@@ -527,7 +523,7 @@
            // 重置搜索条件
            handleReset() {
                this.searchForm = {
                    uuid: '',
                    item_name: '',
                    cstmr_name: '',
                    settle: '',
                    order_no: ''
@@ -586,18 +582,41 @@

            // 格式化状态显示
            formatStatus(row) {
                if (row.settle === 1) {
                    return '正常';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                } else if (row.settle === 0) {
                    return '禁用';
                if (row.settle === 10) {
                    return '待处理';
                } else if (row.settle === 11) {
                    return '检验中';
                } else if (row.settle === 12) {
                    return '出库中';
                } else if (row.settle === 13) {
                    return '存在不合格';
                } else if (row.settle === 15) {
                    return '待上报';
                } else if (row.settle === 16) {
                    return '上报完成';
                } else if (row.settle === 17) {
                    return '上报失败';
                } else if (row.settle === 98) {
                    return '异常';
                } else if (row.settle === 99) {
                    return '废弃';
                } else {
                    return row.settle || '未知';
                }
            },

            // 格式化状态显示
            formatStatusB(row) {
                if (row.status === 0) {
                    return '异常';
                } else if (row.status === 1) {
                    return '正常';
                } else if (row.status === 2) {
                    return '待上报';
                } else if (row.status === 3) {
                    return '已上报';
                } else {
                    return row.status || '未知';
                }
            },

@@ -620,7 +639,7 @@
            mockTableAData() {
                this.tableDataA = [
                    {
                        uuid: 'ZH1001',
                        itemName: 'ZH1001',
                        orderNo: 'ORDER2024001',
                        cstmrName: '示例客户A',
                        settle: 1,
@@ -629,7 +648,7 @@
                        memo: '测试数据'
                    },
                    {
                        uuid: 'ZH1002',
                        itemName: 'ZH1002',
                        orderNo: 'ORDER2024002',
                        cstmrName: '示例客户B',
                        settle: 1,
@@ -643,10 +662,10 @@
            },

            // 模拟子表数据 - 实际项目中应删除
            mockTableBData(uuid) {
            mockTableBData(itemName) {
                this.tableDataB = [
                    { productName: `产品A-${uuid}`, quantity: 2, price: 500.00, totalPrice: 1000.00 },
                    { productName: `产品B-${uuid}`, quantity: 1, price: 300.50, totalPrice: 300.50 }
                    { productName: `产品A-${itemName}`, quantity: 2, price: 500.00, totalPrice: 1000.00 },
                    { productName: `产品B-${itemName}`, quantity: 1, price: 300.50, totalPrice: 300.50 }
                ];
                this.detailTotal = 2;
                this.detailLoading = false;