Merge remote-tracking branch 'origin/dev' into dev

ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs

@@ -2492,7 +2492,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
 
                 DateTime now = DateTime.Now;
                 List<WmsSterilizationInstockH> wmsSterilizationInstockHs = db_Floor4DMC2CPK.Queryable<WmsSterilizationInstockH>()
-                    .Where(r => (DateTime.Now - r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToList();
+                    .Where(r => (DateTime.Now - r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ADD_ID).ToList();
 
                 foreach (WmsSterilizationInstockH wmsSterilizationInstockH in wmsSterilizationInstockHs)
                 {
@@ -2512,6 +2512,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                     InStockStrategyQuery inStockStrategyInput = new()
                     {
                         warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID,
+                        Region_id = WmsWareHouseConst.REGION_CPOutstock_ID,
                         Size = 1
                     };
                     List<BasLocation> items = await _wareHouseService.InStockStrategy(inStockStrategyInput);

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs

@@ -138,4 +138,14 @@ public partial class WmsMaterialTransfer : BaseEntity<string>
     /// 主表主键
     /// </summary>
     public string erp_pk { get; set; }
+
+    /// <summary>
+    /// erp出库仓库
+    /// </summary>
+    public string? erp_warehouse_outstock { get; set; }
+
+    /// <summary>
+    /// erp入库仓库
+    /// </summary>
+    public string? erp_warehouse_instock { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockD.cs

@@ -59,4 +59,8 @@ public partial class WmsPrdInstockD : BaseEntity<string>
     /// </summary>
     public string? scwarehouse_id { get; set; }
 
+    /// <summary>
+    /// 入库仓库
+    /// </summary>
+    public string? rkwarehouse_id { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs

@@ -1093,6 +1093,8 @@ namespace Tnb.WarehouseMgr
                         wmsMaterialTransfer.erp_bill_code = input.bill_code;
                         wmsMaterialTransfer.type = transfer_type;
                         wmsMaterialTransfer.erp_pk = input.erp_pk;
+                        wmsMaterialTransfer.erp_warehouse_instock = input.warehouse_instock;
+                        wmsMaterialTransfer.erp_warehouse_outstock = input.warehouse_outstock;
 
                         await db.Insertable(wmsMaterialTransfer).ExecuteCommandAsync();
 

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -3163,7 +3163,7 @@ namespace Tnb.WarehouseMgr
             ids.AddRange(unitDatas.Select(x => x.Id).ToList());
 
             List<ErpExtendField> erpExtendFields = await db.Queryable<ErpExtendField>().Where(x => ids.Contains(x.table_id)).ToListAsync();
-            string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? WmsWareHouseConst.AdministratorUserId;
+            string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? "";
             ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
             string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x => x.id != null).ToListAsync();
@@ -3180,7 +3180,7 @@ namespace Tnb.WarehouseMgr
             erpRequestData.Add("creator", erpCreateId);
             erpRequestData.Add("ctrantypeid", "0001H11000000000D30Z");
             // erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
-            erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "");
+            erpRequestData.Add("cwarehouseid", wmsMaterialTransfer.erp_warehouse_instock);
             erpRequestData.Add("cwhsmanagerid", "");
             erpRequestData.Add("dbilldate", nowStr);
             erpRequestData.Add("dmakedate", nowStr);
@@ -3196,7 +3196,7 @@ namespace Tnb.WarehouseMgr
                 erpRequestDataDetails.Add(new Dictionary<string, object>()
                 {
                     ["cbodytranstypecode"] = "4A-01",
-                    ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "",
+                    ["cbodywarehouseid"] = wmsMaterialTransfer.erp_warehouse_instock,
                     ["cgeneralbid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "",
                     ["cgeneralbid"] = null,
                     ["cgeneralhid"] = null,
@@ -3526,6 +3526,19 @@ namespace Tnb.WarehouseMgr
                 points.Add(wmsPointHs.Where(r => r.point_code == $"DT-R-02-0{elevatorSno}").First());
                 points.Add(wmsPointHs.Where(r => r.id == pEndId).First());
             }
+            // 4-3
+            if (startlocation.wh_id == WmsWareHouseConst.WAREHOUSE_MJC_ID && endlocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID)
+            {
+                WmsElevatorH wmsElevatorH = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == "2" && it.enabled == 1).OrderBy(r => r.task_nums).FirstAsync();
+                string elevatorSno = wmsElevatorH.elevator_code.Replace("Elevator", "");
+
+                points.Add(wmsPointHs.Where(r => r.id == pStartId).First());
+                points.Add(wmsPointHs.Where(r => r.point_code == $"DT-C-04-0{elevatorSno}").First());
+                points.Add(wmsPointHs.Where(r => r.point_code == $"DT-4-{elevatorSno}").First());
+                points.Add(wmsPointHs.Where(r => r.point_code == $"DT-3-{elevatorSno}").First());
+                points.Add(wmsPointHs.Where(r => r.point_code == $"DT-R-03-0{elevatorSno}").First());
+                points.Add(wmsPointHs.Where(r => r.id == pEndId).First());
+            }
             else
             {
                 List<WmsRoad> roads = await _db.Queryable<WmsRoad>().Where(it => it.status == 1).ToListAsync();
@@ -4045,6 +4058,7 @@ namespace Tnb.WarehouseMgr
                     List<WmsPointH> points = new List<WmsPointH>();
                     if (sPoint.area_code != ePoint.area_code)
                     {
+                        Logger.LogInformation($"【createPretask】 起点 {sPoint.point_code} 终点 {ePoint.point_code}");
                         points = await PathAlgorithms(sPoint.id, ePoint.id);
                         if (points.Count <= 2)
                         {

WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs

@@ -118,21 +118,26 @@ namespace Tnb.WarehouseMgr
                 List<WmsPrdInstockD> WmsPrdInstockDs = new List<WmsPrdInstockD>();
                 #region 生产入库对应的bip仓库
                 string scwarehouse_id = "";
+                string rkwarehouse_id = "";
                 if (type == DictConst.PrdMoTypeZS)
                 {
                     scwarehouse_id = WmsWareHouseConst.bipwarehouseid_zs;
+                    rkwarehouse_id = WmsWareHouseConst.bipwarehouseid_zs;
                 }
                 else if (type == DictConst.PrdMoTypeJC)
                 {
                     scwarehouse_id = WmsWareHouseConst.bipwarehouseid_jc;
+                    rkwarehouse_id = WmsWareHouseConst.bipwarehouseid_jc;
                 }
                 else if (type == DictConst.PrdMoTypeZZ)
                 {
                     scwarehouse_id = WmsWareHouseConst.bipwarehouseid_bz;
+                    rkwarehouse_id = WmsWareHouseConst.bipwarehouseid_bz;
                 }
                 else if (type == DictConst.PrdMoTypeBZ)
                 {
                     scwarehouse_id = WmsWareHouseConst.bipwarehouseid_bz;
+                    rkwarehouse_id = WmsWareHouseConst.bipwarehouseid_bz;
                 }
                 #endregion
                 List<WmsPrdInstockCode> WmsPrdInstockCodes = new List<WmsPrdInstockCode>();
@@ -147,7 +152,8 @@ namespace Tnb.WarehouseMgr
                     create_time = DateTime.Now,
                     prd_instock_id = prd_instock_code_id,
                     status = WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID,
-                    scwarehouse_id = scwarehouse_id
+                    scwarehouse_id = scwarehouse_id,
+                    rkwarehouse_id = rkwarehouse_id
                 };
                 WmsPrdInstockDs.Add(wmsPrdInstockD);
 
@@ -392,12 +398,12 @@ namespace Tnb.WarehouseMgr
                 erpRequestData.Add("creator", erpCreateId);
                 erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死
                 // erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.scwarehouse_id);
-                erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.warehouse_id);
+                erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.scwarehouse_id);  // 出库仓库
-                erpRequestData.Add("cwarehouseid",  wmsPrdInstockD.warehouse_id);//todo 现在是我们的仓库id 要改 
+                erpRequestData.Add("cwarehouseid", wmsPrdInstockD.rkwarehouse_id);//todo 现在是我们的仓库id 要改   // 库存仓库
                 erpRequestData.Add("cwhsmanagerid", null);
                 erpRequestData.Add("dbilldate", nowStr);
                 erpRequestData.Add("dmakedate", nowStr);
-                erpRequestData.Add("fbillflag", 1);
+                erpRequestData.Add("fbillflag", 2);
                 erpRequestData.Add("ntotalnum", allInstockDetails!=null ? allInstockDetails.Sum(x=>x.pqty) : 0);
                 erpRequestData.Add("pk_org", erpOrg.pk_org);
                 erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
@@ -413,7 +419,7 @@ namespace Tnb.WarehouseMgr
                     erpRequestDataDetails.Add(new Dictionary<string, object>()
                     {
                         ["cbodytranstypecode"] = "46-01",
-                        ["cbodywarehouseid"] = wmsPrdInstockD.warehouse_id,
+                        ["cbodywarehouseid"] = wmsPrdInstockD.rkwarehouse_id, // 库存仓库
                         ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == instock.material_id)?.cmaterialoid ?? "",
                         ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == instock.material_id)?.cmaterialvid ?? "",
                         ["corpoid"] = erpOrg.corpoid,

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs

@@ -141,7 +141,10 @@ namespace Tnb.WarehouseMgr
                     tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
 
                     List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
-                    string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsPurchaseH.create_id)?.user_id ?? "";
+                    // 暂时传 1001A110000000003NBJ 陈书会
+                    //string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
+                    string erpCreateId = "1001A110000000003NBJ";
+                    //string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsPurchaseH.create_id)?.user_id ?? "";
                     ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
                     string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
@@ -158,7 +161,8 @@ namespace Tnb.WarehouseMgr
                     erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "");
                     erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "");
                     // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取
-                    erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "");//类型视图里取
+                    // erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? ""
+                    erpRequestData.Add("cwarehouseid", "1001A11000000002OOGU");//类型视图里取
                     erpRequestData.Add("dbilldate", nowStr);
                     erpRequestData.Add("dmakedate", nowStr);
                     erpRequestData.Add("fbillflag", 2);