分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-05-23 29691ff2defb09cf90f6c155002f7b678316cca5
优化工单信息界面
已修改2个文件
38 ■■■■ 文件已修改
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue
@@ -33,33 +33,33 @@
            const editFormOptions = ref([]);
            const searchFormFields = ref({"workOrder":"","jobID":"","drawingNo":"","productName":"","heatID":"","billetID":"","SN":"","processCode":"","CreateTime":"","FinishTime":"","operatetype":"","productDesc":""});
            const searchFormOptions = ref([[{"title":"图号","field":"drawingNo","type":"like"},{"title":"工作令号","field":"workOrder","type":"like"},{"title":"工单编号","field":"jobID","type":"like"}],[{"title":"产品名称","field":"productName","type":"like"},{"title":"炉代号","field":"heatID","type":"like"},{"title":"钢坯号","field":"billetID","type":"like"}],[{"title":"车轮SN号","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"工单类型","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"操作类型","field":"operatetype","type":"select"}],[{"title":"创建时间","field":"CreateTime","type":"date"},{"title":"完成时间","field":"FinishTime","type":"date"},{"title":"产品描述","field":"productDesc","type":"like"}]]);
            const columns = ref([{field:'mes_id',title:'工单头表ID',type:'guid',width:110,require:true,align:'left',sort:true},
                       {field:'workOrder',title:'工作令号',type:'string',width:110,align:'left'},
                       {field:'jobID',title:'工单编号',type:'string',width:110,align:'left'},
                       {field:'materialCode',title:'物料编码',type:'string',width:110,align:'left'},
                       {field:'drawingNo',title:'图号',type:'string',width:110,align:'left'},
            const columns = ref([{field:'mes_id',title:'工单头表ID',hidden:true,type:'guid',width:110,require:true,align:'left',sort:true},
                       {field:'workOrder',title:'工作令号',type:'string',sort:true,width:110,align:'left'},
                       {field:'jobID',title:'工单编号',type:'string',sort:true,width:110,align:'left'},
                       {field:'materialCode',title:'物料编码',hidden:true,type:'string',width:110,align:'left'},
                       {field:'drawingNo',title:'图号',type:'string',sort:true,width:110,align:'left'},
                       {field:'productName',title:'产品名称',type:'string',width:110,align:'left'},
                       {field:'heatID',title:'炉代号',type:'string',width:110,align:'left'},
                       {field:'billetID',title:'钢坯号',type:'int',width:110,align:'left'},
                       {field:'SN',title:'车轮SN号',type:'string',width:110,align:'left'},
                       {field:'heatID',title:'炉代号',type:'string',sort:true,width:110,align:'left'},
                       {field:'billetID',title:'钢坯号',type:'int',sort:true,width:110,align:'left'},
                       {field:'SN',title:'车轮SN号',type:'string',sort:true,width:110,align:'left'},
                       {field:'processCode',title:'工单类型',type:'string',bind:{ key:'WorkTypes',data:[]},width:110,align:'left'},
                       {field:'area',title:'指定库区',type:'string',width:110,align:'left'},
                       {field:'drawingNoVer',title:'技术状态',type:'string',width:110,align:'left'},
                       {field:'quantity',title:'计划数量',type:'int',width:110,require:true,align:'left'},
                       {field:'typeID',title:'轮型代码',type:'string',width:110,align:'left'},
                       {field:'stackNoRange',title:'打包数量',type:'int',width:110,align:'left'},
                       {field:'drawingNoVer',title:'技术状态',type:'string',sort:true,width:110,align:'left'},
                       {field:'quantity',title:'计划数量',hidden:true,type:'int',width:110,require:true,align:'left'},
                       {field:'typeID',title:'轮型代码',hidden:true,type:'string',width:110,align:'left'},
                       {field:'stackNoRange',title:'打包数量',type:'int',sort:true,width:110,align:'left'},
                       {field:'skip_op_1',title:'视觉检测1',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
                       {field:'skip_op_2',title:'视觉检测2',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
                       {field:'skip_op_3',title:'喷防锈液',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,align:'left'},
                       {field:'maxDiameterDiff',title:'轮径偏差',type:'decimal',width:110,align:'left'},
                       {field:'maxDiameterDiff',title:'轮径偏差',hidden:true,type:'decimal',width:110,align:'left'},
                       {field:'expectedStartTime',title:'计划开始时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'expectedFinishTime',title:'计划完成时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'CreateTime',title:'创建时间',type:'datetime',sort:true,width:150,align:'left',sort:true},
                       {field:'CreateTime',title:'创建时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'creator',title:'创建者',type:'string',width:100,align:'left'},
                       {field:'finishNum',title:'完成数量',type:'int',width:110,align:'left'},
                       {field:'heatBatchID',title:'热处理批次',type:'string',width:110,align:'left'},
                       {field:'finishNum',title:'完成数量',hidden:true,type:'int',width:110,align:'left'},
                       {field:'heatBatchID',title:'热处理批次',hidden:true,type:'string',width:110,align:'left'},
                       {field:'Status',title:'工单状态',type:'string',width:110,align:'left'},
                       {field:'FinishTime',title:'完成时间',type:'datetime',sort:true,width:150,align:'left',sort:true},
                       {field:'FinishTime',title:'完成时间',type:'datetime',width:150,align:'left',sort:true},
                       {field:'operatetype',title:'操作类型',type:'string',bind:{ key:'WorkOperateTypes',data:[]},width:110,align:'left'},
                       {field:'compeletor',title:'操作者',type:'string',width:110,align:'left'},
                       {field:'productDesc',title:'产品描述',type:'string',width:180,align:'left'}]);
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json
@@ -16,8 +16,8 @@
  "Connection": {
    "DBType": "MsSql", //MySql/MsSql/PgSql  //数据库类型,如果使用的是sqlserver此处应设置为MsSql
    //sqlserver连接字符串P@ssw0rd
    //"DbConnectionString": "Data Source=192.168.12.101;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
    "DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=P@ssw0rd;Connect Timeout=500;",
    "DbConnectionString": "Data Source=192.168.12.101;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
    //"DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=P@ssw0rd;Connect Timeout=500;",
    //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
    // "DbConnectionString": " Data Source=127.0.0.1;Database=netcoredev;AllowLoadLocalInfile=true;User ID=root;Password=123456;allowPublicKeyRetrieval=true;pooling=true;CharSet=utf8;port=3306;sslmode=none;",