liuying
2024-11-30 3706fb22a858169204aa05a01b38ec1a4e04b5c7
大屏
已修改5个文件
684 ■■■■■ 文件已修改
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
LuLiScreen/css/style_new20241126.css 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LuLiScreen/index3.html 561 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -58,10 +58,7 @@
                        <div class="storage-grid">
                            <div class="row rowMy0">
                                <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
                                    <span class="textK"
                  :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }"
                  >
                                    <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
                                        <!-- {{ cell.laneNo }} -->
                                        {{ cell.layerNo }}{{ cell.columnNo }}
                                    </span>
@@ -448,7 +445,9 @@
    }
}
.t1 {
    margin: 10px 0 2px 0;font-size: 16px !important;
    margin: 10px 0 2px 0;
    font-size: 16px !important;
    padding-bottom:10px
}
.textK {
    display: flex; /* 使用 Flexbox 布局 */
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -93,7 +93,7 @@
        <el-card class="full-table" shadow="hover" style="margin-top: 5px">
            <div class="table-container">
                <!-- 左侧表格 -->
                <div class="left-table">
                <!-- <div class="left-table">
                    <p class="text-xtiny">齐套列表</p>
                    <el-table
@@ -116,17 +116,30 @@
                            </template>
                        </el-table-column>
                        <el-table-column prop="count" 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="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>
                </div>
                </div> -->
                <!-- ///
                <summary>/// 生产单号 ///</summary>
                public string Info5 { get; set; } ///
                <summary>/// 批次号 ///</summary>
                public string PlanNo { get; set; } ///
                <summary>/// 订单号 ///</summary>
                public string OrderId { get; set; } ///
                <summary>/// 是否齐套 ///</summary>
                public bool? IsKitting { get; set; } ///
                <summary>/// 包数 ///</summary>
                public int PackageNum { get; set; } ///
                <summary>/// 已下线包数 ///</summary>
                public int UnLinePackageNum { get; set; } ///
                <summary>/// 未下线包数 ///</summary>
                public int NoUnLinePackageNum { get; set; } ///
                <summary>/// 总包装面积 ///</summary>
                public decimal AllPackageArea { get; set; } ///
                <summary>/// 已扫描包装面积 ///</summary>
                public decimal ScanPackageArea { get; set; } ///
                <summary>/// 未扫描包装面积 ///</summary>
                public decimal NoScanPackageArea { get; set; } -->
                <!-- 右侧表格 -->
                <div class="right-table">
@@ -144,24 +157,33 @@
                    >
                        <el-table-column type="index" label="序号" width="55" align="center" />
                        <!-- <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" /> -->
                        <el-table-column label="订单号" prop="packageCode" width="150" align="left" show-overflow-tooltip>
                        <el-table-column label="生产单号" prop="info5" width="150" align="left" show-overflow-tooltip>
                            <template #default="scope">
                                <span class="under_line" @click="openDrawer(1, scope.row)">
                                    {{ scope.row.orderId }}
                                    {{ scope.row.info5 }}
                                </span>
                            </template>
                        </el-table-column>
                        <el-table-column prop="count" label="数量" show-overflow-tooltip="" />
                        <!-- <el-table-column prop="count" 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="planNo" label="批次号"  show-overflow-tooltip="" />
                        <el-table-column prop="orderId" 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="isKitting" label="是否齐套"  show-overflow-tooltip="">
          <template #default="scope">
            <el-tag v-if="scope.row.isKitting"> 是 </el-tag>
            <el-tag type="danger" v-else> 否 </el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="packageNum" label="包数"  show-overflow-tooltip="" />
        <el-table-column prop="unLinePackageNum" label="已下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="noUnLinePackageNum" label="未下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="allPackageArea" label="总包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="scanPackageArea" label="已扫描包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="noScanPackageArea" 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>
                </div>
            </div>
@@ -204,6 +226,7 @@
import { exportPageExcel } from '/@/utils/exportPageExcel'; //引入导出方法
import OpenAllprop from './component/openAllprop.vue';
import { ExcellTableDataExport } from '/@/hooks/exportTableDataExcell';
import { pageMes_Order_Gather } from '/@/api/main/WmsOrder/mes_Order_Gather';
const { proxy }: any = getCurrentInstance(); // 访问实例上下文 proxy同时支持开发 线上环境
const moveType = 10; //移动类型 入库
// ------------封装导出功能--前端导出+表格标题---------------
@@ -285,19 +308,20 @@
// 8888888888888查询操作 IsKitting
const handleQuery = async () => {
    loading.value = true;
    var res = await KittingList(Object.assign(queryParams.value, {
    // var res = await KittingList(Object.assign(queryParams.value, {
    //     ...tableParams.value,
    //     IsKitting:true
    // }));
    // tableData.value = res.data.result ?? [];
    var res2 = await pageMes_Order_Gather(
        Object.assign(queryParams.value, {
        ...tableParams.value,
        IsKitting:true
    }));
    tableData.value = res.data.result ?? [];
            IsKitting: false,
        })
    );
    var res2 = await KittingList(Object.assign(queryParams.value, {
        ...tableParams.value,
        IsKitting:false
    }));
    newTableData.value = res2.data.result ?? [];
    newTableData.value = res2.data.result.items ?? [];
    // tableParams.value.total = res.data.result?.total;
    loading.value = false;
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -138,7 +138,7 @@
    public async Task<Mes_Order_Gather> QueryCurrentOrder()
    {
        //获取上班时间。
        var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
        var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
        if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "无")
        {
            return null;
LuLiScreen/css/style_new20241126.css
@@ -279,7 +279,7 @@
}
.text01_div p:nth-child(2) {
    font-size: 35px;
    font-size: 29px;
    color: #ffff43;
    font-weight: 600;
@@ -296,6 +296,7 @@
    margin-bottom: 25px;
    display: flex;
    justify-content: space-between;
    overflow: hidden;
}
.div_any_child {
@@ -357,8 +358,12 @@
    padding-top: 5px;
    padding-bottom: 5px;
    flex-shrink: 0;
    width:14.28%;
    width:12.6%;
    text-align: center;
}
.table_p span:first-child{
    width: 22%;
}
.table_p .dowebok{
@@ -403,7 +408,8 @@
    display: block;
    color: #ffffff;
    flex-shrink: 0;
    width:14.28%;
    /* width:14.28%; */
    word-wrap: break-word;
}
@@ -443,3 +449,11 @@
.title_rt{
    right: 10px;
}
.table_p span.no_data{
    color: white !important;
    font-size: 20px !important;
    text-align: center !important;
    display: block !important;
    width: 100%;
    padding-top: 4%;
}
LuLiScreen/index3.html
@@ -15,18 +15,18 @@
    <link rel="stylesheet" href="./css//font/icomoon/style.css">
    <link rel="stylesheet" href="./css/liMarquee.css">
    <link rel="stylesheet" href="./css/style_new20241126.css">
    <title>鲁丽木业包装线</title>
    <title>鲁丽家居包装线</title>
</head>
<body>
    <div class="container-flex" tabindex="0" hidefocus="true">
        <div class="box-center">
            <p class="titleHt title_lt">当前登陆人: 
                <span>刘工 </span>
                <span id="idLoginName"> </span>
                
            </p>
            <p class="titleHt title_rt">登录时间: 
                <span> 2024-01-05 </span>
                <span id="idLoginTime"> </span>
              
            
            </p>
@@ -43,29 +43,29 @@
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>总订单数</p>
                            <p>55</p>
                            <p>总生产订单数</p>
                            <p id="idTotalOrder">0</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>总面积数</p>
                            <p>55</p>
                            <p id="idTotalArea">0</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>总包数</p>
                            <p>66</p>
                            <p id="idTotalPackage">0</p>
                        </div>
                    </div>
                    <div class="con_div_text">
                        <img src="./images/img/info_2.png" class=" text01_img">
                        <div class=" text01_div">
                            <p>工作时长(h)</p>
                            <p>44</p>
                            <p id="idTotalWorkTime">0</p>
                        </div>
                    </div>
                </div>
@@ -74,28 +74,22 @@
            <div class="box_up_right">
                <div class=" div_table_box">
                    <div class="div_any_child div_any_child2">
                        <div class="div_any_title"><img src="./images/img/title_4.png">当前产线工件列表 </div>
                        <div class="div_any_title"><img src="./images/img/title_4.png">当前订单工件列表 </div>
                        <div class="table_p table_p_my3">
                            <div class="tt">
                                <span>订单号</span>
                                <span>工件数</span>
                                <span>还差数</span>
                                <span>下线数</span>
                                <span>总面积</span>
                                <span>当前面积</span>
                                <span>下线面积</span>
                                <span>生产单号</span>
                                <span>包数</span>
                                <span>已下线包数</span>
                                <span>未下线包数</span>
                                <span>总包装面积</span>
                                <span>已扫包装面积</span>
                                <span>未扫包装面积</span>
                            </div>
                            <div class="dowebok">
                                <ul>
                                    <li>
                                        <span>订单号11</span>
                                        <span>工件数22</span>
                                        <span>还差数33</span>
                                        <span>下线数44</span>
                                        <span>总面积55</span>
                                        <span>当前面积66</span>
                                <ul id="idList1">
                                    <!-- <li>
                                        <span>下线面积77</span>
                                    </li>
                                    </li> -->
                                </ul>
                            </div>
                        </div>
@@ -111,332 +105,49 @@
            <div class=" div_table_box">
                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">历史产线工件列表 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">历史订单工件列表 </div>
                    <div class="table_p">
                        <div class="tt">
                            <span>订单号</span>
                            <span>工件数</span>
                            <span>还差数</span>
                            <span>下线数</span>
                            <span>总面积</span>
                            <span>当前面积</span>
                            <span>下线面积</span>
                            <span>生成单号</span>
                            <span>总包数</span>
                            <span>已下线包数</span>
                            <span>未下线包数</span>
                            <span>总包装面积</span>
                            <span>已扫包装面积</span>
                            <span>未扫包装面积</span>
                        </div>
                        <div class="dowebok dowebok1">
                            <ul>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                            <ul id="idList2">
                                <!-- <li>
                                    <span>生成单号11</span>
                                </li> -->
                            </ul>
                        </div>
                    </div>
                </div>
                <div class="div_any_child">
                    <div class="div_any_title"><img src="./images/img/title_4.png">计划产线件号列表 </div>
                    <div class="div_any_title"><img src="./images/img/title_4.png">计划订单工件列表 </div>
                    <div class="table_p">
                        <div class="tt">
                            <span>订单号</span>
                            <span>工件数</span>
                            <span>还差数</span>
                            <span>下线数</span>
                            <span>总面积</span>
                            <span>当前面积</span>
                            <span>下线面积</span>
                            <span>生成单号</span>
                            <span>总包数</span>
                            <span>已下线包数</span>
                            <span>未下线包数</span>
                            <span>总包装面积</span>
                            <span>已扫包装面积</span>
                            <span>未扫包装面积</span>
                        </div>
                        <div class="dowebok dowebok2">
                            <ul>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                            <ul id="idList3">
                                <!-- <li>
                                    <span>生成单号11</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                <li>
                                    <span>订单号11</span>
                                    <span>工件数22</span>
                                    <span>还差数33</span>
                                    <span>下线数44</span>
                                    <span>总面积55</span>
                                    <span>当前面积66</span>
                                    <span>下线面积77</span>
                                </li>
                                 -->
                            </ul>
                        </div>
                    </div>
@@ -450,18 +161,186 @@
    <script src="./js/jquery-1.8.3.min.js"></script>
    <script src="./js/jquery.liMarquee.js"></script>
    <script>
        $(function () {
            $('.dowebok1').liMarquee({
                direction: 'up',
                scrollamount:20,
                runshort: false
        $('document').ready(function () {
            function fetchAllData() {
                // 11111111111111111 当前生产订单记录
                fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryCurrentOrder`, 'GET', {}, (res) => {
                    $('#idList1').html('');
                    var dataList1 = res.result;
                    if (!dataList1) {
                        $('#idList1').html(' <span class="no_data">暂无数据</span>');
                    } else {
                        var item = dataList1;
                        var listItems1 = '';
                        listItems1 += `<li>
                        <span>${item.info5}</span>    <!-- 生产单号 -->
                        <span>${item.packageNum}</span>  <!-- 包数 -->
                        <span>${item.unLinePackageNum}</span> <!-- 已下线包数 -->
                        <span>${item.noUnLinePackageNum}</span> <!-- 未下线包数 -->
                        <span>${item.allPackageArea}</span>  <!-- 总包装面积 -->
                        <span>${item.scanPackageArea}</span>  <!-- 已扫描包装面积 -->
                        <span>${item.noScanPackageArea}</span> <!-- 未扫描包装面积 -->
                        </li>`;
                        $('#idList1').append(listItems1);
                    }
            });
            $('.dowebok2').liMarquee({
                direction: 'up',
                scrollamount:20,
                runshort: false
                // <span>${item.Info5}</span>    <!-- 生产单号 -->
                //         <span>${item.planNo}</span>   <!-- 批次号 -->
                //         <span>${item.orderId}</span>  <!-- 订单号 -->
                //         <span>${item.isKitting}</span> <!-- 是否齐套 -->
                //         <span>${item.isUnline}</span>  <!-- 是否下线 -->
                //         <span>${item.unlineTime}</span> <!-- 下线时间 -->
                //         <span>${item.unlinePerson}</span> <!-- 下线人 -->
                //         <span>${item.packageNum}</span>  <!-- 包数 -->
                //         <span>${item.unLinePackageNum}</span> <!-- 已下线包数 -->
                //         <span>${item.noUnLinePackageNum}</span> <!-- 未下线包数 -->
                //         <span>${item.allPackageArea}</span>  <!-- 总包装面积 -->
                //         <span>${item.scanPackageArea}</span>  <!-- 已扫描包装面积 -->
                //         <span>${item.noScanPackageArea}</span> <!-- 未扫描包装面积 -->
                // 22222222222222222 历史
                fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryHistoryOrderList`, 'GET', {}, (res) => {
                    $('#idList2').html('');
                    var dataList1 = res.result;
                    if (dataList1 == null || dataList1.length == 0) {
                        $('#idList2').html(' <span class="no_data">暂无数据</span>');
                    } else {
                        var listItems1 = '';
                        dataList1.forEach(item => {
                            listItems1 += `<li>
                        <span>${item.info5}</span>
                        <span>${item.packageNum}</span>
                        <span>${item.unLinePackageNum}</span>
                        <span>${item.noUnLinePackageNum}</span>
                        <span>${item.allPackageArea}</span>
                        <span>${item.scanPackageArea}</span>
                        <span>${item.noScanPackageArea}</span>
                    </li>`;
            });
                        $('#idList2').append(listItems1);
                    }
                });
                // 字段名: info5, 中文描述: 生产单号
                // 字段名: packageNum, 中文描述: 包数
                // 字段名: unLinePackageNum, 中文描述: 已下线包数
                // 字段名: noUnLinePackageNum, 中文描述: 未下线包数
                // 字段名: allPackageArea, 中文描述: 总包装面积
                // 字段名: scanPackageArea, 中文描述: 已扫描包装面积
                // 字段名: noScanPackageArea, 中文描述: 未扫描包装面积
                // 字段名: planNo, 中文描述: 批次号
                // 字段名: orderId, 中文描述: 订单号
                // 字段名: isKitting, 中文描述: 是否齐套
                // 字段名: isUnline, 中文描述: 是否下线
                // 字段名: unlineTime, 中文描述: 下线时间
                // 字段名: unlinePerson, 中文描述: 下线人
                // 33333333333333333333 计划
                fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryPlanOrderList`, 'GET', {}, (res) => {
                    $('#idList3').html('');
                    var dataList1 = res.result;
                    if (dataList1 == null || dataList1.length == 0) {
                        $('#idList3').html(' <span class="no_data">暂无数据</span>');
                    } else {
                        var listItems1 = '';
                        dataList1.forEach(item => {
                            listItems1 += `<li>
                        <span>${item.info5}</span>
                        <span>${item.packageNum}</span>
                        <span>${item.unLinePackageNum}</span>
                        <span>${item.noUnLinePackageNum}</span>
                        <span>${item.allPackageArea}</span>
                        <span>${item.scanPackageArea}</span>
                        <span>${item.noScanPackageArea}</span>
                    </li>`;
                        });
                        $('#idList3').append(listItems1);
                    }
                });
                //4444444444444444
                // 登录人 汇总
                // [SugarColumn(ColumnName = "Info12", ColumnDescription = "包装部件总数量", Length = 60)]
                // [SugarColumn(ColumnName = "Info13", ColumnDescription = "包装面积", Length = 60)]
                fetchData(`${baseUrl}/api/WmsCommonnQuery/ScreenLogin`, 'GET', {}, (res) => {
                    $('#idTotalOrder').html('');
                    $('#idTotalArea').html('');
                    $('#idTotalPackage').html('');
                    $('#idTotalWorkTime').html('');
                    $('#idLoginName').html('');
                    $('#idLoginTime').html('');
                    var dataList1 = res.result;
                    if (dataList1 == null || dataList1.length == 0) {
                        $('#idList2').html(' <span class="no_data">暂无数据</span>');
                    } else {
                        // var LoginName = res.result?.items[0].value;
                        $('#idTotalOrder').html(res.result.allOrderNum);
                        $('#idTotalArea').html(res.result?.allPackageArea);
                        $('#idTotalPackage').html(res.result?.packageNum);
                        const formattedWorkTime = res.result?.workTime.toFixed(2);
                        $('#idTotalWorkTime').html(formattedWorkTime);
                        $('#idLoginName').append(res.result?.loginUser);
                        $('#idLoginTime').append(res.result?.timeLogin);
                    }
                });
                // $(function () {
                //     $('.dowebok1').liMarquee({
                //         direction: 'up',
                //         scrollamount:20,
                //         runshort: false
                //     });
                //     $('.dowebok2').liMarquee({
                //         direction: 'up',
                //         scrollamount:20,
                //         runshort: false
                //     });
                // });
            }
            function fetchData(url, method = 'GET', data = {}, callback) {
                $.ajax({
                    url: url,
                    data: data,
                    type: method,
                    dataType: 'json',
                    timeout: 5000,
                    success: (res) => {
                        // 调用回调函数并将结果传递给它
                        callback(res);
                    },
                    error: (jqXHR, textStatus, errorThrown) => {
                        console.error("AJAX Error: " + textStatus, errorThrown);
                        // 可以在这里处理错误,如果需要
                    }
                });
            }
            // 每两秒调用一次
            setInterval(fetchAllData, 2000);
        });
    </script>
</body>