schangxiang@126.com
2025-09-19 9be9c3784b2881a3fa25e93ae2033dc2803c0ed0
优化查询
已修改4个文件
已删除1个文件
52 ■■■■■ 文件已修改
SiemensWarehouse/siemens2-site/src/views/stat/inventory/deviceGeneralInfo.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
siemenswmssditcode/sql/DBScript/01_DDL/01_DDL_TABLE.sql 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
siemenswmssditcode/wmsService/wcftest/Model/Input/DeviceGeneralInfoInput.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文本文档.txt 补丁 | 查看 | 原始文档 | blame | 历史
SiemensWarehouse/siemens2-site/src/views/stat/inventory/deviceGeneralInfo.vue
@@ -14,6 +14,7 @@
            end-placeholder="缁撴潫鏃ユ湡"
          >
          </el-date-picker>
            <el-input v-model="searchParam.ext1" placeholder="杞﹀彿" class="search"></el-input>
            <el-button type="success" plain @click="find(1)" >鏌ヨ</el-button>
             <el-button type="info" plain @click="reset" >閲嶇疆</el-button>
      </el-row>
@@ -28,6 +29,7 @@
      type="index"
      width="50">
    </el-table-column>
        <el-table-column label="杞﹀彿" prop="ext1" width="80"></el-table-column>
        <el-table-column label="杩愯鏃堕棿(鍒嗛挓)" prop="deviceRunTime" width="220"></el-table-column>
        <el-table-column label="鎶ヨ鏃堕棿(鍒嗛挓)" prop="deviceAlarmTime" width="220"></el-table-column>
        <el-table-column label="绛夊緟鏃堕棿(鍒嗛挓)" prop="deviceWaitTime" width="220"></el-table-column>
@@ -226,8 +228,8 @@
      // import("@/vendor/Export2Excel")
      this.downloadLoading = true
      import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['杩愯鏃堕棿(鍒嗛挓)', '鎶ヨ鏃堕棿(鍒嗛挓)', '绛夊緟鏃堕棿(鍒嗛挓)','鏃堕棿']
        const filterVal = ['deviceRunTime', 'deviceAlarmTime', 'deviceWaitTime', 'createTime']
        const tHeader = ['杞﹀彿','杩愯鏃堕棿(鍒嗛挓)', '鎶ヨ鏃堕棿(鍒嗛挓)', '绛夊緟鏃堕棿(鍒嗛挓)','鏃堕棿']
        const filterVal = ['ext1','deviceRunTime', 'deviceAlarmTime', 'deviceWaitTime', 'createTime']
        const data = this.formatJson(filterVal, this.TakeStocklistAll)
        excel.export_json_to_excel({
          header: tHeader,
@@ -257,7 +259,7 @@
    reset() {
      this.searchParam.materialName = null
      this.searchParam.materialCode = null
      this.searchParam.SalesOrder = null
      this.searchParam.ext1 = null
      this.selectTypeValue = ''
      this.datatime = ''
      this.initTimeData();//閲嶇疆鏃堕棿
siemenswmssditcode/sql/DBScript/01_DDL/01_DDL_TABLE.sql
@@ -287,3 +287,27 @@
-- YrtWMS_Siemens2.dbo.deviceGeneralInfoForDetail definition
-- Drop table
-- DROP TABLE YrtWMS_Siemens2.deviceGeneralInfoForDetail;
CREATE TABLE YrtWMS_Siemens2.dbo.deviceGeneralInfoForDetail (
    id int IDENTITY(1,1) NOT NULL,
    taskEnterCount int NULL,
    taskOutCount int NULL,
    stockProportion int NULL,
    outDate int NULL,
    deviceRunTime decimal(18,0) NULL,
    deviceWaitTime decimal(18,0) NULL,
    deviceAlarmTime decimal(18,0) NULL,
    createTime datetime NULL,
    ext1 nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
    ext2 nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
    ext3 nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
    ext4 nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
    CONSTRAINT PK_deviceGeneralInfoForDetail PRIMARY KEY (id)
);
siemenswmssditcode/wmsService/wcftest/Model/Input/DeviceGeneralInfoInput.cs
@@ -29,5 +29,21 @@
        /// </summary>
        public DateTime[] datatime { get; set; }
        /// <summary>鎼滅储鍙傛暟
        ///
        /// </summary>
        public searchparamForDeviceGeneralInfoInput search { get; set; }
    }
    public class searchparamForDeviceGeneralInfoInput
    {
        /// <summary>
        /// 杞﹀彿
        /// </summary>
        public string ext1 { get; set; }
    }
}
siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
@@ -3336,6 +3336,10 @@
                            //閲嶆柊璁$畻绛夊緟鏃堕棿
                            item.deviceWaitTime = 1440 - ((item.deviceRunTime ?? 0M) + (item.deviceAlarmTime ?? 0M));
                        }
                        if (!string.IsNullOrEmpty(page.search.ext1))
                        {
                            fiveDayDeviceInfo = fiveDayDeviceInfo.Where(x => x.ext1 == page.search.ext1).ToList();
                        }
                    }
                    List<deviceGeneralInfoForDetail> fenyeRerult = new List<deviceGeneralInfoForDetail>();
新建文本文档.txt