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

bip采购到货更改到货交易类型

Browse Source
This commit is contained in:
陈文凯
2024-10-25 17:27:09 +08:00
parent 6aae58644d
commit 8d4f3ef3b1
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2025,6 +2025,15 @@ namespace Tnb.ProductionMgr
PrdMo mo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id); PrdMo mo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id);
#region 注塑生产任务提报时，如果起始库位（ 当前设备的下料点）已经存在业务类型为配送申请，并且实际开始配送时间为空的任务执行，则不能提报，并提示
if (mo.mo_type == DictConst.PrdMoTypeZS)
{
var wmsDistaskHs = _db.Queryable<WmsDistaskH>().Where(r => r.startlocation_id == equip.downmat_location_id && r.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID && !r.act_start_date.HasValue);
if (wmsDistaskHs != null && wmsDistaskHs.Count() > 0)
throw Oops.Bah("请等待AGV配送完成后提报");
}
#endregion
bool changeBatchFlag = false; bool changeBatchFlag = false;
int changeCountNumByDay = 0; int changeCountNumByDay = 0;
int changeCountNumByQty = 0; int changeCountNumByQty = 0;

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

@@ -290,7 +290,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("dbilldate",purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss")); erpRequestData.Add("dbilldate",purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate",nowStr); erpRequestData.Add("dmakedate",nowStr);
erpRequestData.Add("ctrantypeid", erpOrg.transaction_type_id);//到货交易类型主键 erpRequestData.Add("ctrantypeid", "0001H11000000000D2ZU");//到货交易类型主键
erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty)); erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty));
erpRequestData.Add("pk_arriveorder",null); erpRequestData.Add("pk_arriveorder",null);
// erpRequestData.Add("pk_dept","1001A1100000001JFOPQ"); // erpRequestData.Add("pk_dept","1001A1100000001JFOPQ");

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

@@ -2,19 +2,19 @@
"Cache": { "Cache": {
"CacheType": "RedisCache", //MemoryCache "CacheType": "RedisCache", //MemoryCache
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6379, "port": 6378,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0" "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
}, },
"Redis": { "Redis": {
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6379, "port": 6378,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0" "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
}, },
"Redis2": { "Redis2": {
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 6379, "port": 6378,
"password": "05jWEoJa8v", "password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=1" "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; "DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
//"Host": "192.168.11.109", //"Host": "192.168.11.109",
"Host": "127.0.0.1", "Host": "127.0.0.1",
"Port": "5432", "Port": "5431",
//"DBName": "tianyi_db", //"DBName": "tianyi_db",
//"UserName": "postgres", //"UserName": "postgres",
//"Password": "pass@word123", //"Password": "pass@word123",
"DBName": "tianyi", "DBName": "tianyi_cwk",
"UserName": "postgres", "UserName": "totong",
"Password": "pass@word123", "Password": "IPANyxGSKxIXg0dBM",
//SqlServer //SqlServer
//"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true" //"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true"
//Kdbndp //Kdbndp