Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

yuyou_x

2024-03-13 cabcb499a03de83b62eb8c01a734a1f4049f1dcf

Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -401,7 +401,7 @@
                        cols:colsJson
                    };

                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
                        console.log(res)
                        if (res.code == 0) { //成功
                            var list = res.data;
@@ -527,6 +527,8 @@
                        {field: 'LotNo',title: '批次号',align: 'center'}, 
                        {field: 'OwnerNo',title: '货主编码',align: 'center'},
                        {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                        {field: 'SupplierNo',title: '供应商编码',align: 'center'},
                        {field: 'SupplierName',title: '供应商名称',align: 'center'}, 
                        {field: 'Qty',title: '库存数量',width: 110,align: 'center'}, 
                        {field: 'LockQty',title: '锁定数量',width: 110,align: 'center'},
                        {field: 'Status',templet: '#buttonTpl',title: '库存状态',width: 90,align: 'center'}, 

 Pda/View/AsnSetting/pingKuEnter.html

@@ -236,7 +236,7 @@
                form.render('select');

                var param = {
                    Type: '0,1,2,3',
                    Type: '0,1,2,3,4,5,6,7',
                };
                sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
                    if (res.code == 0) { //成功

 Wms/Model/ModelDto/DataDto/StockDetailDto.cs

@@ -179,6 +179,19 @@
        /// </summary>           
        public string OwnerName { get; set; }

        /// <summary>
        /// Desc:供应商编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SupplierNo { get; set; }

        /// <summary>
        /// Desc:供应商名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SupplierName { get; set; }

        /// <summary>
        /// Desc:备注

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1639,13 +1639,21 @@
                                IsBelt = item.IsBelt,
                                Demo = item.Demo,

                                OwnerNo = ownerNo,
                                OwnerName = ownerName,

                                IsDel = "0",
                                CreateUser = 0,
                                CreateTime = comTime
                            };
                            //维护库存明细货主/供应商信息
                            if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                            {
                                sd.OwnerNo = notice.CustomerNo;//货主编码
                                sd.OwnerName = notice.CustomerName;//货主名称
                            }
                            else if (notice.Type == "1" || notice.Type == "5")//1:采购入库,2:其它入库
                            { 
                                sd.SupplierNo= notice.CustomerNo;//供应商编码
                                sd.SupplierName = notice.CustomerName;//供应商名称
                            }

                            //if (quality.Count() > 0)
                            //{
@@ -1730,13 +1738,16 @@
                                    LockQty = 0,
                                    FrozenQty = 0,

                                    OwnerNo = ownerNo,
                                    OwnerName = ownerName,

                                    IsDel = "0",
                                    CreateUser = userId,
                                    CreateTime = comTime
                                };
                                //维护库存货主信息
                                if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                                {
                                    stock.OwnerNo = notice.CustomerNo;//货主编码
                                    stock.OwnerName = notice.CustomerName;//货主名称
                                }
                                Db.Insertable(stock).ExecuteCommand();
                            }
                            #endregion

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -2224,7 +2224,7 @@
                    #endregion

                    #region 箱码信息
                    var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo).ToList();
                    var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.PalletNo == model.PalletNo).ToList();
                    // type 0:成品入库 1:采购入库 2:中间品入库 3:退货入库 4:车间余料退回入库 5:其它入库 6:代储入库 7:寄存入库
                    if (notice.Type == "2" || notice.Type == "6" || notice.Type == "7")
                    {
@@ -2298,6 +2298,12 @@
                            CreateUser = (int)model.CreateUser,
                            CreateTime = serverTime
                        };
                        //维护库存货主信息
                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                        {
                            stockModel.OwnerNo = notice.CustomerNo;//货主编码
                            stockModel.OwnerName = notice.CustomerName;//货主名称
                        }
                        //新增库存总信息
                        Db.Insertable<DataStock>(stockModel).ExecuteCommand();
                    }
@@ -2350,9 +2356,21 @@
                            PackagNo = sku.PackagNo,
                            IsBale = bindInfo.IsBale,
                            IsBelt = bindInfo.IsBelt,

                            CreateUser = (int)model.CreateUser,
                            CreateTime = serverTime
                        };
                        //维护库存明细货主/供应商信息
                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                        {
                            detailModel.OwnerNo = notice.CustomerNo;//货主编码
                            detailModel.OwnerName = notice.CustomerName;//货主名称
                        }
                        else if (notice.Type == "1" || notice.Type == "5")//1:采购入库,2:其它入库
                        {
                            detailModel.SupplierNo = notice.CustomerNo;//供应商编码
                            detailModel.SupplierName = notice.CustomerName;//供应商名称
                        }
                        stId = Db.Insertable<DataStockDetail>(detailModel).ExecuteReturnIdentity();

                    }

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -890,6 +890,11 @@
            {
                string EndLocat = string.Empty;//目标位置                

                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
                if (log != null)
                {
                    throw new Exception("该托盘已有小车等待执行或正在执行的任务!");
                }                
                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
                if (stockDetail == null)
                {
@@ -1002,6 +1007,12 @@
            }
            try
            {
                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
                if (log != null)
                {
                    throw new Exception("该托盘已有小车等待执行或正在执行的任务!");
                }

                var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
                if (notice == null)
                {

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -32,7 +32,7 @@
        /// <param name="skuNo">物料编码</param>
        /// <param name="skuName">物料名称</param>
        /// <returns></returns>
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo)
        {
            string str = "select stock.SkuNo,stock.SkuName,stock.LotNo,stock.LotText,stock.Standard,stock.Qty," +
                "stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
@@ -59,6 +59,11 @@
            {
                str += " and stock.OwnerName like @ownerName";
            }
            //判断货主名称是否为空
            if (!string.IsNullOrEmpty(lotNo))
            {
                str += " and stock.LotNo like @lotNo";
            }
            //排序
            str += " order by stock.SkuNo";
            List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
@@ -67,7 +72,8 @@
                skuno = "%" + skuNo + "%", //物料编码
                skuname = "%" + skuName + "%", //物料名称
                ownerNo= "%" + ownerNo + "%", //货主编码
                ownerName= "%" + ownerName + "%" //货主名称
                ownerName= "%" + ownerName + "%", //货主名称
                lotNo= "%" + lotNo + "%", //批次号
            });

            //库存总量
@@ -146,6 +152,10 @@
            {
                str += " and detail.LotNo like @lotno";
            }
            if (!string.IsNullOrEmpty(skuNo) && string.IsNullOrEmpty(lotNo))
            {
                str += " and detail.LotNo = ''";
            }
            //判断储位地址是否为空
            if (!string.IsNullOrEmpty(locatNo))
            {

 Wms/WMS.Entity/DataEntity/DataStockDetail.cs

@@ -47,6 +47,20 @@
        public string OwnerName { get; set; }

        /// <summary>
        /// Desc:供应商编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SupplierNo { get; set; }

        /// <summary>
        /// Desc:供应商名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string SupplierName { get; set; }

        /// <summary>
        /// Desc:物料编码
        /// Default:
        /// Nullable:True

 Wms/WMS.IBLL/IDataServer/IStockServer.cs

@@ -16,7 +16,7 @@
        /// <param name="skuNo">物料编码</param>
        /// <param name="skuName">物料名称</param>
        /// <returns></returns>
        List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName);
        List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo);

        /// <summary>
        /// 获取库存明细

 Wms/Wms/Controllers/StatisticalController.cs

@@ -40,9 +40,9 @@
        /// <param name="skuName"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName)
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName,string lotNo)
        {
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName);
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName,lotNo);
            return Ok(new
            {
                data = StockList,