diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs
deleted file mode 100644
index 3ed012ea..00000000
--- a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JNPF.Common.Contracts;
-using JNPF.Common.Security;
-using SqlSugar;
-
-namespace Tnb.QcMgr.Entities.Entity
-{
- ///
- /// 质检记录载具信息
- ///
- [SugarTable("qc_check_exec_carry")]
- public partial class QcCheckExecCarry : BaseEntity
- {
- public QcCheckExecCarry()
- {
- id = SnowflakeIdHelper.NextId();
- }
- ///
- /// 组织
- ///
- public string org_id { get; set; }
-
- ///
- /// 质检任务主表id
- ///
- public string qc_check_exec_id { get; set; }
- ///
- /// 载具id
- ///
- public string carry_id { get; set; }
- ///
- /// 载具编码
- ///
- public string carry_code { get; set; }
- ///
- /// 仓库id
- ///
- public string warehouse_id { get; set; }
- ///
- /// 条码数量
- ///
- public string qty { get; set; }
- ///
- /// 检验状态
- ///
- public string status { get; set; }
- ///
- /// 库位id
- ///
- public string location_id { get; set; }
- ///
- /// 库位编码
- ///
- public string location_code { get;set; }
- ///
- /// 物料id
- ///
- public string material_id { get; set; }
-
- public string create_id { get; set; }
-
- public DateTime? create_time { get; set; }
-
- public string modify_id { get; set; }
-
- public DateTime? modify_time { get; set; }
-
- ///
- /// 暂控处理单id
- ///
- public string temp_control_order_id { get; set; }
- ///
- /// 提报人
- ///
- public string reporter_id { get; set; }
- ///
- /// 处理人
- ///
- public string processer_id { get; set; }
-
- }
-}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
index ce9f179b..eacc7c05 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
@@ -140,21 +140,6 @@ namespace Tnb.WarehouseMgr
}
wmsMaterialSignH.biz_type = wmsDistaskH.biz_type;
- //已记录的物料签收记录表
- var wmsMaterialSignDs_ed = await _db.Queryable().Where(r => r.source_id == wmsDistaskH.source_id).ToListAsync();
- if (wmsMaterialSignDs_ed != null && wmsMaterialSignDs_ed.Count > 0)
- {
- //已下发数量
- var wmsRawmatOutstockD = await _db.Queryable().Where(r => r.id == wmsDistaskH.source_id).FirstAsync();
- var signed_qty = wmsMaterialSignDs_ed.Sum(r => r.sign_qty);//已签收数量
- var nowSign_qty = input.details.Sum(r => r.sign_qty);//当前需要签收数量
- //总签收数量不能大于总的下发数量
- if (signed_qty + nowSign_qty > wmsRawmatOutstockD.actual_outstock_qty)
- {
- throw new AppFriendlyException($"已签收数量{signed_qty},当前签收数量{nowSign_qty},总签收数量{signed_qty + nowSign_qty}不能大于已下发数量{wmsRawmatOutstockD.actual_outstock_qty}", 500);
- }
- }
-
// wms其它出库记录主表
OtherOutstockAddDetailInput otherOutstockAddDetailInput = new OtherOutstockAddDetailInput();
switch (wmsDistaskH.biz_type)
@@ -212,7 +197,6 @@ namespace Tnb.WarehouseMgr
wmsMaterialSignD.code_batch = wmsCarryCode.code_batch;
wmsMaterialSignD.qty = wmsCarryCode.codeqty;
wmsMaterialSignD.sign_qty = item.sign_qty;
- wmsMaterialSignD.source_id = wmsDistaskH.source_id;
wmsMaterialSignDs.Add(wmsMaterialSignD);
wmsCarryCode.codeqty = wmsCarryCode.codeqty - item.sign_qty;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
index 4a1db740..c11bd71e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
@@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr
List allInstockDetails = await _db.Queryable().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id)
&& it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch
- && (string.IsNullOrEmpty(it.source_detail_id) || (!string.IsNullOrEmpty(it.source_detail_id) && it.source_detail_id == wmsPurchaseD.id))).OrderBy(x=>x.id).ToListAsync();
+ && (!string.IsNullOrEmpty(it.source_detail_id) && it.source_detail_id == wmsPurchaseD.id)).OrderBy(x=>x.id).ToListAsync();
List> requestData = new List>();
List carryIds = instock_mains.Select(x => x.carry_id).ToList();
diff --git a/apihost/Tnb.API.Entry/Configurations/Cache.json b/apihost/Tnb.API.Entry/Configurations/Cache.json
index 52e8c235..7a6d1350 100644
--- a/apihost/Tnb.API.Entry/Configurations/Cache.json
+++ b/apihost/Tnb.API.Entry/Configurations/Cache.json
@@ -2,19 +2,19 @@
"Cache": {
"CacheType": "RedisCache", //MemoryCache
"ip": "127.0.0.1",
- "port": 6378,
+ "port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
},
"Redis": {
"ip": "127.0.0.1",
- "port": 6378,
+ "port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
},
"Redis2": {
"ip": "127.0.0.1",
- "port": 6378,
+ "port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=1"
}
diff --git a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
index 2e6e4525..01aa1fd4 100644
--- a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
+++ b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
@@ -4,13 +4,13 @@
"DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
//"Host": "192.168.11.109",
"Host": "127.0.0.1",
- "Port": "5431",
+ "Port": "5432",
//"DBName": "tianyi_db",
//"UserName": "postgres",
//"Password": "pass@word123",
- "DBName": "tianyi_cwk2",
- "UserName": "totong",
- "Password": "IPANyxGSKxIXg0dBM",
+ "DBName": "tianyi",
+ "UserName": "postgres",
+ "Password": "pass@word123",
//SqlServer
//"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true"
//Kdbndp