From 95584843043327d4fa12481f0cf3e6c0785fcc26 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 15 九月 2025 09:54:27 +0800
Subject: [PATCH] 其他出库增加库存

---
 service/Wom/WwGdManager.cs |  351 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 249 insertions(+), 102 deletions(-)

diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 9aeb560..0abca21 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -1,11 +1,13 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
 using NewPdaSqlServer.DB;
 using NewPdaSqlServer.Dto.service;
 using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
 using NewPdaSqlServer.util;
 using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Threading.Tasks.Dataflow;
 
 namespace NewPdaSqlServer.service.Wom;
 
@@ -137,86 +139,110 @@
         }
     }
 
-    public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+
+    /// <summary>
+    /// 鑾峰彇搴撲綅淇℃伅
+    /// </summary>
+    /// <param name="unity"></param>
+    /// <returns></returns>
+    /// <exception cref="Exception"></exception>
+    public dynamic GetBarKwByItem(dynamic unity)
     {
-        return getDaa001(query);
+        if (unity == null)
+            throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+        if (string.IsNullOrEmpty(unity.itemId?.ToString()))
+            throw new ArgumentException("鐗╂枡ID涓嶈兘涓虹┖", nameof(unity.itemId));
+
+        try
+        {
+            var parameters = new List<SugarParameter>
+            {
+                new SugarParameter("@itemId",unity.itemId)
+            };
+
+            return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"鑾峰彇鏉$爜淇℃伅澶辫触锛歿ex.Message}");
+        }
+
     }
 
-    private ProductionPickDto getDaa001(WarehouseQuery query)
+    /// <summary>
+    /// 閫夊彇鍒楄〃
+    /// </summary>
+    /// <param name="unity"></param>
+    /// <param name="RequestInfo"></param>
+    /// <returns></returns>
+    public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
     {
-        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
-
-        var wwgd = Db.Queryable<WwGd, MesItems>((a, i) =>
-                new JoinQueryInfos(JoinType.Left,
-                    a.Daa003 == i.ItemId))
-            .Where((a, i) => a.Daa001 == query.daa001 && (a.PcSh ?? 0) == 1)
-            .Select((a, i) => new
-            {
-                a.Daa001, a.RwdGuid
-            }).First();
-
-        if (wwgd?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
-
-        var womdabs = Db
-            .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>(
-                (a, b, c, d) =>
-                    new JoinQueryInfos(
-                        JoinType.Left,
-                        a.Id == b.Pid,
-                        JoinType.Inner,
-                        c.Id == b.Dab003,
-                        JoinType.Inner, b.Erpid.ToString() == d.ErpId
-                    ))
-            .Where((a, b, c, d) =>
-                a.Daa001 == query.daa001 && d.IssuingMethod == "1")
-            .Select((a, b, c, d) => new WwGdDetail
-            {
-                Pid = b.Pid,
-                Dab003 = b.Dab003,
-                Dab006 = b.Dab006,
-                Dab007 = b.Dab007,
-                wNum = b.Dab006 - b.Dab007, // 璁$畻瀛楁 W_NUM
-                ItemName = c.ItemName, // 鍔ㄦ�佸瓧娈� ITEM_NAME
-                ItemNo = c.ItemNo // 鍔ㄦ�佸瓧娈� ITEM_NO
-            })
-            .ToList();
-
-        var list = womdabs.Where(s => s.wNum > 0).ToList();
-
-        var mesInvItemOutCDetailsList = Db
-            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
-            ((a, b, c) =>
-                new JoinQueryInfos(
-                    JoinType.Inner, a.ItemId == b.Id,
-                    JoinType.Inner, c.DepotId == a.DepotId
-                ))
-            .Where((a, b, c) => a.WorkNo == query.daa001)
-            .Select((a, b, c) => new MesInvItemOutCDetails
-            {
-                ItemName = b.ItemName,
-                ItemNo = b.ItemNo,
-                ItemId = a.ItemId,
-                DepotId = a.DepotId,
-                WorkNo = a.WorkNo,
-                DepotName = c.DepotName,
-                Quantity = a.Quantity
-            })
-            .ToList();
-
-        var womcaa = Db.Queryable<ProductionOrder>()
-            .Where(s => s.Guid == wwgd.RwdGuid)
-            .First();
-
-        var dto = new ProductionPickDto
+        var orgId = RequestInfo.OrgId;
+        var parameters = new List<SugarParameter>
         {
-            daa001 = wwgd.Daa001,
-            PlanNo = womcaa.ErpProductionOrderNo,
-            totals1 = womdabs,
-            daisao1 = list,
-            yisao = mesInvItemOutCDetailsList
+            new SugarParameter("@selectKey", unity.selectKey),
+            new SugarParameter("@inP1", orgId), // 鍙�夊弬鏁�
+            new SugarParameter("@inP2", unity.selDaaType), // 鍙�夊弬鏁�
+            new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+            new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
+            // ...鍏朵粬鍙�夊弬鏁�
         };
+        var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwll_list @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);
+        return result;
+    }
 
-        return dto;
+    /// <summary>
+    /// 鍒楄〃鏄庣粏
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="RequestInfo"></param>
+    /// <returns></returns>
+    public dynamic GetItemsByDaa001(WarehouseQuery query, dynamic RequestInfo)
+    {
+        return getDaa001(query, RequestInfo);
+    }
+
+    private dynamic getDaa001(WarehouseQuery query, dynamic RequestInfo)
+    {
+        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("璇烽�夊伐鍗曞彿锛�");
+        if (query == null)
+            throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+        if (string.IsNullOrEmpty(query.daa001?.ToString()))
+            throw new ArgumentException("宸ュ崟鍙蜂笉瀛樺湪", nameof(query.daa001));
+
+        var orgId = RequestInfo.OrgId;
+        if (orgId == null)
+            throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+        var parameters = new[]
+        {
+            new SugarParameter("@daa001", query.daa001),
+            new SugarParameter("@pi_orgId", orgId),
+            new SugarParameter("@inP1", null),
+            new SugarParameter("@inP2", null),
+            new SugarParameter("@inP3", null),
+            new SugarParameter("@inP4", null)
+        };
+        try
+        {
+            List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+                "EXEC prc_pda_wwll_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+            var items = blDetails.Where(x => x.DSQty > 0).ToList();    // 寰呮壂鐗╂枡
+            var ysitems = blDetails.Where(x => x.SQty > 0).ToList();   // 宸叉壂鐗╂枡
+            var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 鑾峰彇宸ュ崟璁″垝鍙�
+            return new 
+            {
+                daa001 = query.daa001,
+                PlanNo = planNo,
+                items = items,
+                ysitems = ysitems
+            };
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"{ex.Message}");
+        }
     }
 
     #region 濮斿閫�鏂�
@@ -284,6 +310,8 @@
         if (c_mes_inv_item_barcodes == null)
             throw new Exception("姝ゆ潯鐮佷笉灞炰簬璇ラ��鏂欏崟锛岃鏍稿锛�");
 
+       
+
         // if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
         //     throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
 
@@ -296,14 +324,59 @@
 
         if (C_MES_ITEM_TBL.Tbl020 == 1) throw new Exception("鎵爜瀹屾垚,鐢宠鍗曞凡瀹岀粨!");
 
+        // 妫�鏌ュ伐鍗曚俊鎭�
+        var wwgd = Db.Queryable<WwGd>()
+            .Where(a => a.Id.ToString() == C_MES_ITEM_TBL.Tbl002)
+            .First();
+
+        if (wwgd == null) throw new Exception("鐢宠鍗曞搴旂殑宸ュ崟涓嶅瓨鍦ㄦ垨宸插垹闄�,鏃犳硶鎵爜!");
+
+        // 妫�鏌ュ伐鍗曚俊鎭�
+        var WWRWD = Db.Queryable<ProductionOrder>()
+            .Where(a => a.OrderNo == wwgd.Daa014)
+            .First();
+
         // 鑾峰彇閫�鏂欏崟鏄庣粏
         var C_MES_ITEM_TBL_DETAIL = Db.Queryable<MesItemTblDetail>()
-            .Where(a => a.Tlmid == C_MES_ITEM_TBL.Id
-                        && a.Tld010 == c_mes_inv_item_barcodes.WorkLine)
+            .Where(a => a.Tlid == c_mes_inv_item_barcodes.AboutGuid)
             .First();
 
         if (C_MES_ITEM_TBL_DETAIL == null)
             throw new Exception("鏉$爜涓嶅睘浜庤鐢宠鍗曟槑缁�,鏃犳硶鎵爜!");
+
+        //鍒ゆ柇璐т富淇℃伅
+        var CABerpid = Db.Queryable<WwGdDetail>().Where(womdab => womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013).Select(womdab => womdab.Erpid).First();
+
+        var WWCAB = Db.Queryable<ProductionOrderSub>().Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
+
+
+        if ( String.IsNullOrEmpty(WWCAB.Owner)) throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠$悊鍛�!");
+
+        //var owner_type = "";
+        //if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
+        //{
+        //    owner_type = "BD_OwnerOrg";
+        //}
+        //else
+        //{
+        //    // 绗簩灞傚垽鏂細妫�鏌� MES_CUSTOMER
+        //    if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+        //    {
+        //        owner_type = "BD_Customer";
+        //    }
+        //    else
+        //    {
+        //        // 绗笁灞傚垽鏂細妫�鏌� MES_SUPPLIER
+        //        if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+        //        {
+        //            owner_type = "BD_Supplier";
+        //        }
+        //        else
+        //        {
+        //            throw new Exception("鍏ュ簱澶辫触,鐢ㄦ枡娓呭崟璐т富淇℃伅瀛樺湪闂锛岃鑱旂郴绠$悊鍛樿В鍐筹紒");
+        //        }
+        //    }
+        //}
 
         var c_quantity = c_mes_inv_item_barcodes.Quantity;
 
@@ -318,7 +391,7 @@
                 .Where(d =>
                     d.Status == 0 && d.TransctionNo ==
                                   p_transction_no.ToString()
-                                  && d.CbillNo == c_mes_inv_item_barcodes.BillNo
+                                  && d.TaskNo == c_mes_inv_item_barcodes.BillNo
                                   && d.DepotsId == c_depot_code
                                   && d.InsDate.Value.ToString("yyyyMMdd") ==
                                   DateTime.Now.ToString("yyyyMMdd")).First();
@@ -328,7 +401,7 @@
             // 濡傛灉鍏ュ簱鍗曚笉瀛樺湪鍒欏垱寤烘柊鐨勫叆搴撳崟
             if (mesInvItemIns == null)
             {
-                c_bill_no = BillNo.GetBillNo("IN(鍏ュ簱鍗�)");
+                c_bill_no = BillNo.GetBillNo("WWTL(濮斿閫�鏂�)");
 
                 c_id = Guid.NewGuid();
 
@@ -337,19 +410,26 @@
                     Guid = c_id,
                     BillNo = c_bill_no,
                     BillTypeId = p_bill_type_id,
+                    InsDate = DateTime.Now,
+                    DepotsId = c_depot_code,
                     UserNoBack = c_user,
                     Reason = C_MES_ITEM_TBL.Tbl005,
                     Remark = C_MES_ITEM_TBL.Tbl006,
-                    InsDate = DateTime.Now,
-                    // DepotsCode = c_depot_code,
-                    DepotsId = c_depot_code,
+                    //InsDate = DateTime.Now,
+                    DepotsCode = c_mes_depots.DepotCode,
+                    TaskNo = c_mes_inv_item_barcodes.BillNo,
+                    //DepotsId = c_depot_code,
                     TransctionNo = p_transction_no.ToString(),
                     CreateBy = c_user,
                     CreateDate = DateTime.Now,
                     LastupdateBy = c_user,
                     LastupdateDate = DateTime.Now,
-                    CbillNo = C_MES_ITEM_TBL.BillNo,
-                    RbillNo = C_MES_ITEM_TBL.Tbl002
+                    CbillNo = wwgd.Daa001,
+                    InType = "濮斿閫�鏂�",
+                    ReceiveOrgId = c_mes_depots.FSubsidiary,
+                    Fstatus = 0,
+                    Status = 0,
+                    WorkNo = WWRWD.ErpProductionOrderNo
                 }).IgnoreColumns(true).ExecuteCommand();
             }
             else
@@ -361,6 +441,57 @@
             // 妫�鏌ユ槸鍚︿负鍚堝苟鎵撳嵃鏉$爜
             var hbdy = c_mes_inv_item_barcodes.Hbdy ?? 0;
             if (hbdy == 1) throw new Exception("涓嶆敮鎸佸悎骞舵墦鍗扮殑鏉$爜:" + p_item_barcode);
+
+
+            // 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 MES_INV_ITEM_IN_C_ITEMS 琛�
+            var existingCount = db.Queryable<MesInvItemInCItems>()
+            .Where(it =>
+                it.ItemInId == c_id &&
+                                it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+                                it.DepotId == c_depot_code.ToString())
+                .Count();
+
+            if (existingCount == 0)
+                // 涓嶅瓨鍦ㄦ椂鎻掑叆鏂拌褰�
+                db.Insertable(new MesInvItemInCItems
+                {
+                    ItemInId = c_id,
+                    Quantity = c_mes_inv_item_barcodes.Quantity,
+                    CreateBy = c_user,
+                    CreateDate = DateTime.Now,
+                    ItemNo = c_mes_inv_item_barcodes.ItemNo,
+                    //DepotCode = mesDepost.DepotCode,
+                    ItemSname = c_mes_inv_item_barcodes.ItemSname,
+                    Unit = c_mes_inv_item_barcodes.Unit,
+                    Ebeln = c_mes_inv_item_barcodes.WorkNo,
+                    BillNo = c_bill_no,
+                    WorkNo = c_mes_inv_item_barcodes.WorkNo,
+                    EbelnLineNo = c_mes_inv_item_barcodes.WorkLine,
+                    CbillNo = c_mes_inv_item_barcodes.BillNo,
+                    WorkLine = c_mes_inv_item_barcodes.WorkLine,
+                    SuppId = c_mes_inv_item_barcodes.SuppId,
+                    SuppNo = c_mes_inv_item_barcodes.SuppNo,
+                    Remark = c_mes_inv_item_barcodes.Memo,
+                    EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
+                    LineK3id = c_mes_inv_item_barcodes.LineK3id,
+                    ItemId = c_mes_inv_item_barcodes.ItemId,
+                    DepotCode = c_mes_depots.DepotCode,
+                    DepotId = c_depot_code.ToString(),
+                    itemDabid = c_mes_inv_item_barcodes.AboutGuid.ToString()
+                }).IgnoreColumns(true).ExecuteCommand();
+            else
+                // 瀛樺湪鏃舵洿鏂版暟閲�
+                db.Updateable<MesInvItemInCItems>()
+                    .SetColumns(it => new MesInvItemInCItems
+                    {
+                        Quantity = SqlFunc.IsNull(it.Quantity, 0) + c_mes_inv_item_barcodes.Quantity // 纭繚 Quantity 涓嶄负 null
+                    })
+                .Where(it =>
+                       it.ItemInId == c_id &&
+                                it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+                                it.DepotId == c_depot_code.ToString())
+                    //.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
+                    .ExecuteCommand();
 
             // 鎻掑叆鍏ュ簱鍗曟槑缁�
             totalResult += db.Insertable(new MesInvItemInCDetails
@@ -396,7 +527,11 @@
                 UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag,
                 BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
                 TaskNo = c_mes_inv_item_barcodes.TaskNo,
-                RbillNo = C_MES_ITEM_TBL.Tbl002
+                RbillNo = C_MES_ITEM_TBL.Tbl002,
+                ReceiveOrgId = c_mes_depots.FSubsidiary,
+                EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
+                LineK3id = c_mes_inv_item_barcodes.LineK3id,
+                Ischeck = true,
             }).IgnoreColumns(true).ExecuteCommand();
 
             // 鎻掑叆涓氬姟璁板綍
@@ -438,9 +573,9 @@
                 ItemNo = c_mes_inv_item_barcodes.ItemNo,
                 LotNo = c_mes_inv_item_barcodes.LotNo,
                 Quantity = c_mes_inv_item_barcodes.Quantity,
-                EpFlag = c_mes_inv_item_barcodes.EpFlag.Value
-                    ? (byte)1
-                    : (byte)0,
+                //EpFlag = c_mes_inv_item_barcodes.EpFlag.Value
+                //    ? (byte)1
+                //    : (byte)0,
                 DepotId = c_mes_depots.DepotId,
                 DepotsCode = c_mes_depots.DepotCode,
                 DepotSectionsCode = p_section_code,
@@ -450,7 +585,13 @@
                 WorkNo = c_mes_inv_item_barcodes.WorkNo,
                 WorkLine = c_mes_inv_item_barcodes.WorkLine,
                 SuppNo = c_mes_inv_item_barcodes.SuppNo,
-                ItemId = c_mes_inv_item_barcodes.ItemId
+                ItemId = c_mes_inv_item_barcodes.ItemId,
+                BillNo = c_mes_inv_item_barcodes.BillNo,
+                //DepotId = Convert.ToInt32(c_depot_code),
+                OwnerId = WWCAB.Owner,
+                OwnerType = WWCAB.OwnerType,
+                StockOrgId = c_mes_depots.FSubsidiary,
+                IndepUserCode = c_user
             }).IgnoreColumns(true).ExecuteCommand();
 
             // 鏍规嵁閫�鏂欑被鍨�(鑹搧閫�鏂欍�佹潵鏂欎笉鑹��鏂欍�佷綔涓氫笉鑹��鏂�)鏇存柊鐩稿叧鏁版嵁
@@ -507,9 +648,9 @@
                                  (int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
                     })
                     .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
-                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId
-                                 && it.Tld010 ==
-                                 c_mes_inv_item_barcodes.WorkLine)
+                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
+                                 //&& it.Tld010 ==
+                                 //c_mes_inv_item_barcodes.WorkLine)
                     .ExecuteCommand();
             }
             // 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -541,9 +682,9 @@
                                  (int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
                     })
                     .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
-                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId
-                                 && it.Tld010 ==
-                                 c_mes_inv_item_barcodes.WorkLine)
+                                 && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
+                                 //&& it.Tld010 ==
+                                 //c_mes_inv_item_barcodes.WorkLine)
                     .ExecuteCommand();
             }
 
@@ -578,6 +719,11 @@
             if (totalResult < minimumExpectedOperations)
                 throw new Exception(
                     $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
+
+            // 鍒涘缓 鎻掑叆鏃ュ織
+            var logService = new LogService();
+            var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
+            logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);
 
             return totalResult;
         });
@@ -653,7 +799,7 @@
         // 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍¢獙
         var blDetail = Db.Queryable<MesItemBlDetail>()
             .Where(b =>
-                b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
+                b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
             .First();
 
         if (blDetail == null)
@@ -818,8 +964,9 @@
                     ErpAutoid = womdab.Erpid,
                     PbillNo = query.billNo,
                     ItemId = blDetail.Bld012,
-                    DepotId = stockBarcode.DepotsId.ToString(),
-                    ItemDabid = womdab.Id,
+                    DepotId = stockBarcode.DepotId.ToString(),
+                    ItemDabid = blDetail.Id,
+                    //AboutGuid = womdab.Id
                     // Unit = blDetail.Bld009,
                     // DepotId = (int)stockBarcode.DepotsId
                 }).IgnoreColumns(true).ExecuteCommand();
@@ -852,7 +999,7 @@
                 PbillNo = query.billNo,
                 ItemId = blDetail.Bld012,
                 Unit = blDetail.Bld009,
-                DepotId = (int)stockBarcode.DepotsId,
+                DepotId = (int)stockBarcode.DepotId,
                 EbelnK3id = womdab.Eid,
                 LineK3id = womdab.Erpid
             }).IgnoreColumns(true).ExecuteCommand();
@@ -949,7 +1096,7 @@
 
             // 鍒涘缓 鎻掑叆鏃ュ織
             var logService = new LogService();
-            var LogMsg = query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 琛ユ枡鍗曞彿銆�"+ outNo +"銆�";
+            var LogMsg = "[PDA]"+query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 鏁伴噺銆�"+ stockBarcode.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�"+ outNo +"銆�";
             logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);
 
             return 1;
@@ -1038,7 +1185,7 @@
                     .Where(s => s.Id == stockBarcode.ItemId).First();
 
                 // 鐢熸垚鏂版潯鐮佸彿
-                newBarcode = BillNo.GetBillNo("TMBH(鏉$爜缂栧彿)", mesItems.ItemNo);
+                newBarcode = BillNo.GetBillNo("TM(鏉$爜)", mesItems.ItemNo);
 
                 // 鍐欏叆鏂版潯鐮�
                 executeCommand += db.Insertable(new MesInvItemBarcodes

--
Gitblit v1.9.3