Merge branch 'master' into Liudl

bklLiudl

1 天以前 fcf4059b633fc84db40f7819d68c31025b637cbe

Merge branch 'master' into Liudl

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -2643,6 +2643,22 @@
                        //添加库存箱码明细
                        Db.Insertable(box2).ExecuteCommand();
                        #endregion

                        #region
                        //插入入库日志
                        var _log = new LogWorkShop
                        {
                            Type = "0",//类型，0：入库 1：出库
                            PalletNo = palletNo,
                            BoxNo=box.BoxNo,
                            LotNo=box.LotNo,
                            SkuNo=box.SkuNo,
                            SkuName=box.SkuName,
                            Qty=box.Qty
                        };
                        //添加库存箱码明细
                        Db.Insertable(_log).ExecuteCommand();
                        #endregion
                    }
                    if (boxFullQty > bNum)
                    {
@@ -2651,7 +2667,6 @@
                }
                //更改箱支关系表信息
                Db.Updateable(boxInfoList).ExecuteCommand();


                #region 库存
                var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == boxInfoOne.LotNo);
@@ -2680,6 +2695,7 @@
                    Db.Insertable(stock).ExecuteCommand();
                }
                #endregion


                // 更改托盘使用状态
                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
@@ -2751,8 +2767,6 @@
                new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);

                #endregion

                 

                #region 库存明细

@@ -2827,7 +2841,6 @@
                // 更改箱支关系表
                decimal factQty = 0.00m;//托盘总数量


                #region 库存
                var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == skuInfo.SkuNo && m.LotNo == lotNo);
                if (dataStock != null)
@@ -2856,6 +2869,21 @@
                }
                #endregion

                #region
                //插入入库日志
                var _log = new LogWorkShop
                {
                    Type = "0",//类型，0：入库 1：出库
                    PalletNo = palletNo,
                    BoxNo = "",
                    LotNo = lotNo,
                    SkuNo = sd1.SkuNo,
                    SkuName = sd1.SkuName,
                    Qty = qty
                };
                //添加库存箱码明细
                Db.Insertable(_log).ExecuteCommand();
                #endregion
                // 更改托盘使用状态
                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
                ////添加托盘记录表数据

 Wms/WMS.Entity/LogEntity/LogWorkShop.cs

New file
@@ -0,0 +1,63 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Text;

namespace WMS.Entity.LogEntity
{
    ///<summary>
    ///车间出入库记录表
    ///</summary>
    [SugarTable("LogWorkShop")]
    public class LogWorkShop:BaseEntity
    {
        /// <summary>
        /// Desc:类型
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string Type { get; set; }

        /// <summary>
        /// Desc:托盘号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string PalletNo { get; set; }

        /// <summary>
        /// Desc:箱码
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string BoxNo { get; set; }

        /// <summary>
        /// Desc:批次号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string LotNo { get; set; }

        /// <summary>
        /// Desc:物料编码
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SkuNo { get; set; }

        /// <summary>
        /// Desc:物料名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SkuName { get; set; }

        /// <summary>
        /// Desc:数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public decimal Qty { get; set; }
    }
}