wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "bip采购收货bug修改"

Browse Source 
This reverts commit 64b6c3fed3.
This commit is contained in:
陈文凯
2024-11-08 15:55:02 +08:00
parent 64b6c3fed3
commit fb9083d367
5 changed files with 8 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs
View File

@@ -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
{
/// <summary>
/// 质检记录载具信息
/// </summary>
[SugarTable("qc_check_exec_carry")]
public partial class QcCheckExecCarry : BaseEntity<string>
{
public QcCheckExecCarry()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 组织
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 质检任务主表id
/// </summary>
public string qc_check_exec_id { get; set; }
/// <summary>
/// 载具id
/// </summary>
public string carry_id { get; set; }
/// <summary>
/// 载具编码
/// </summary>
public string carry_code { get; set; }
/// <summary>
/// 仓库id
/// </summary>
public string warehouse_id { get; set; }
/// <summary>
/// 条码数量
/// </summary>
public string qty { get; set; }
/// <summary>
/// 检验状态
/// </summary>
public string status { get; set; }
/// <summary>
/// 库位id
/// </summary>
public string location_id { get; set; }
/// <summary>
/// 库位编码
/// </summary>
public string location_code { get;set; }
/// <summary>
/// 物料id
/// </summary>
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; }
/// <summary>
/// 暂控处理单id
/// </summary>
public string temp_control_order_id { get; set; }
/// <summary>
/// 提报人
/// </summary>
public string reporter_id { get; set; }
/// <summary>
/// 处理人
/// </summary>
public string processer_id { get; set; }
}
}

16
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
View File

@@ -140,21 +140,6 @@ namespace Tnb.WarehouseMgr
}
wmsMaterialSignH.biz_type = wmsDistaskH.biz_type;
//已记录的物料签收记录表
var wmsMaterialSignDs_ed = await _db.Queryable<WmsMaterialSignD>().Where(r => r.source_id == wmsDistaskH.source_id).ToListAsync();
if (wmsMaterialSignDs_ed != null && wmsMaterialSignDs_ed.Count > 0)
{
//已下发数量
var wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().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;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
View File

@@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().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<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
List<string> carryIds = instock_mains.Select(x => x.carry_id).ToList();

6
apihost/Tnb.API.Entry/Configurations/Cache.json
View File

@@ -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"
}

8
apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
View File

@@ -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