From 9b9aedfa37ff3c98a026c277aa09e4431155a44d Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 14 Mar 2024 13:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/appsettings.development.json | 4 ++-- ZR.Service/mes/wms/WMentryWarehousing_productService.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZR.Admin.WebApi/appsettings.development.json b/ZR.Admin.WebApi/appsettings.development.json index 427f6649..19cf5430 100644 --- a/ZR.Admin.WebApi/appsettings.development.json +++ b/ZR.Admin.WebApi/appsettings.development.json @@ -11,9 +11,9 @@ { //外网连接服务器 - //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //内网连接服务器 - "Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + //"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4, "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index 26122623..dd9482fb 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -89,8 +89,8 @@ namespace ZR.Service.mes.wms if (r.IsMatch(production_packcode)) { - string workorder_id = production_packcode.Substring(3, 9); - string flow_id = production_packcode.Substring(13, 3).ToString("000"); + //string workorder_id = production_packcode.Substring(3, 9); + //string flow_id = production_packcode.Substring(13, 3).ToString("000"); } @@ -100,7 +100,7 @@ namespace ZR.Service.mes.wms } string workorder_id = production_packcode.Substring(3, 9); - string flow_id = production_packcode.Substring(13, 3).ToString("000"); + string flow_id = production_packcode.Substring(13, 3); bool isExist = Context.Queryable() .Where(it => it.WorkOrderNum == workorder_id) .Where(it => it.PackingCode.EndsWith(flow_id))