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

This reverts commit 8d4f3ef3b1.

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -2025,15 +2025,6 @@ namespace Tnb.ProductionMgr
                 
                 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;
                 int changeCountNumByDay = 0;
                 int changeCountNumByQty = 0;

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs

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

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

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_cwk",
-    "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