From ab2bddbb88eed0f13776453aba4bc3f9f681af66 Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Mon, 26 Aug 2024 10:44:39 +0800
Subject: [PATCH] 1

---
 .../Entity/WmsRawmatTransferoutstockD.cs      |  4 +++
 .../Tnb.WarehouseMgr/ErpToWmsService.cs       |  2 ++
 .../WmsMaterialSignHService.cs                | 25 +++++++++++++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockD.cs
index 14141502..cd142756 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockD.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferoutstockD.cs
@@ -104,4 +104,8 @@ public partial class WmsRawmatTransferoutstockD : BaseEntity<string>
     /// </summary>
     public string erp_wh_type { get; set; }
 
+    /// <summary>
+    /// 入库仓库
+    /// </summary>
+    public string? warehouse_instock_code { get; set; }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
index 11f437e1..0ffdb7db 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
@@ -790,6 +790,8 @@ namespace Tnb.WarehouseMgr
 
                         wmsMaterialTransferD.yxfqty = 0;
                         wmsMaterialTransferD.yzqty = 0;
+                        wmsMaterialTransferD.yxfqty_rk = 0;
+                        wmsMaterialTransferD.yzqty_rk = 0;
                         wmsMaterialTransferD.erp_line_pk = detail.erp_line_pk;
 
                         var material = await db.Queryable<BasMaterial>().Where(p => p.code == detail.material_code).FirstAsync();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
index 05b469a4..b512adbe 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
@@ -232,7 +232,21 @@ namespace Tnb.WarehouseMgr
                     // 原材料调拨出库
                     case WmsWareHouseConst.BIZTYPE_WmsRawmatTransferoutstock_ID:
                         {
+                            WmsRawmatTransferoutstockD wmsRawmatTransferoutstockD = await _db.Queryable<WmsRawmatTransferoutstockD>().Where(r => r.id == wmsDistaskH.source_id).FirstAsync();
+                            WmsRawmatTransferoutstockH wmsRawmatTransferoutstockH = await _db.Queryable<WmsRawmatTransferoutstockH>().Where(r => r.id == wmsRawmatTransferoutstockD.bill_id).FirstAsync();
+
+                            WmsTransferOrderH wmsTransferOrderH = await _db.Queryable<WmsTransferOrderH>().Where(r => r.id == wmsRawmatTransferoutstockH.transfer_order_id).FirstAsync();
+                            // 出库仓库 wmsRawmatTransferoutstockD.warehouse_code
+                            // 入库仓库 wmsRawmatTransferoutstockD.warehouse_instock_code
+                            // 调拨订单 wmsRawmatTransferoutstockH.erp_pk
+                            foreach(var wmsMaterialSignD in wmsMaterialSignDs)
+                            {
+                                // 出库数量wmsMaterialSignD.sign_qty
+                            }
+                            
+
                             //todo 对接调拨出库
+
                             // WmsInstockH instock = await _db.Queryable<WmsInstockH>().SingleAsync(x => x.id == input.requireId);
                             // List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
                             //             
@@ -343,14 +357,21 @@ namespace Tnb.WarehouseMgr
                             // thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                             // thirdWebapiRecord.create_time = DateTime.Now;
                             // await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
-                            
+
                             break;
                         }
                     case WmsWareHouseConst.BIZTYPE_WMSMATERIALTRANSFER_ID:
                         {
-                            // 对接其它出库 出库数量为签收数量
+                            // todo 对接其它出库单 出库数量为签收数量
 
 
+
+
+                            if (!_wareHouseService.GetFloor1WXSGWOutstockLocation().Contains(carryLoc.id))
+                            {
+                                // todo 对接其它入库单 入库数量为签收数量
+
+                            }
                             break;
                         }
                 }