zhaowc
2024-08-24 3a89a0b435821e074e781e5eb9eaebae16de01d6
PDA组托页面和平库入库托盘上架
5个文件已修改
70 ■■■■ 已修改文件
HTML/views/WareHouseSetting/Locate.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/AsnSetting/pingKuEnter.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/AsnSetting/productEnterQuantity.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/SysServer/StorageLocatServer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/WareHouseSetting/Locate.html
@@ -208,7 +208,7 @@
                            //监听提交
                            iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                                var field = data.field; //获取提交的字段
                                console.log(field);
                                console.log("修改的字段:"+field);
                                var msg = [];
                                for (var i = 0; i < checkData.length; i++) {
                                    // msg.push(checkData[i].Id);
Pda/View/AsnSetting/pingKuEnter.html
@@ -424,16 +424,17 @@
                //         //回调
                //     });
                // }
                let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
                if (!bval && IsHuiKu == 0) {
                    layer.msg('请选择入库单', {
                if (!$("#PalletNo").val()) {
                    layer.msg('请扫描托盘条码', {
                        icon: 2,
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    });
                    return;
                }
                if (!$("#PalletNo").val()) {
                    layer.msg('请扫描托盘条码', {
                let bval = $('select[id="bar"]').next().find('.layui-select-title input').val()
                if (!bval && IsHuiKu == 0) {
                    layer.msg('请选择入库单', {
                        icon: 2,
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    });
Pda/View/AsnSetting/productEnterQuantity.html
@@ -854,6 +854,9 @@
                    $("#ImportQuantity").val("");
                    $("#Standard").val("");
                    $("#ImportFactQuantity").val("");
                    $("#BoxQty").val("");
                    $("#STOCKCODE").val("");
                    $("#BOXCODE").val("");
                    var param = {
                        Id: parseInt($("#goodSelect").val())
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -5153,7 +5153,7 @@
                        SendDate = serverTime,  //发送时间
                        BackDate = serverTime,  //返回时间
                        StartLocat = "",//起始位置
                        EndLocat = "力诺平库",//目标位置
                        EndLocat = "平库",//目标位置
                        PalletNo = bindInfo.PalletNo,//托盘码
                        IsSend = 0,//是否可再次下发
                        IsCancel = 0,//是否可取消
@@ -5161,7 +5161,7 @@
                        Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        Status = "2",//任务状态0:等待执行1正在执行2执行完成
                        OrderType = "0",//0 入库单 1 出库单  2 盘点单  3 移库单
                        Msg = "力诺平库的入库任务",
                        Msg = "平库的入库任务",
                    };
                    Db.Insertable(exTask).ExecuteCommand();
@@ -5175,6 +5175,27 @@
                    bindInfo.TaskNo = taskNo; //任务号
                    Db.Updateable(bindInfo).ExecuteCommand();
                    #endregion
                   /* #region 添加托盘上架记录
                    var upShelf = new BllPalletUpShelf()
                    {
                        TaskNo = exTask.TaskNo,
                        TraceNo = bindInfo.ASNNo,
                        PalletNo = bindInfo.PalletNo,
                        SkuNo = stockModel.SkuNo,
                        SkuName = stockModel.SkuName,
                        LotNo = stockModel.LotNo,
                        Status = "1",
                        WareHouseNo = bindInfo.WareHouseNo,
                        RoadwayNo = bindInfo.RoadwayNo,
                        AreaNo = "",
                        LocatNo = "",
                        CreateUser = 0,
                    };
                    Db.Insertable(upShelf).ExecuteCommand();
                    #endregion*/
                    #region 库存箱支明细表
                    // 插入新组的箱支信息
@@ -5271,7 +5292,7 @@
                        SendDate = DateTime.Now,  //发送时间
                        BackDate = DateTime.Now,  //返回时间
                        StartLocat = "",//起始位置
                        EndLocat = "牧原平库",//目标位置
                        EndLocat = "平库",//目标位置
                        PalletNo = model.PalletNo,//托盘码
                        IsSend = 0,//是否可再次下发
                        IsCancel = 0,//是否可取消
@@ -5279,7 +5300,7 @@
                        Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        Status = "2",//任务状态0:等待执行1正在执行2执行完成
                        OrderType = "3",//0 入库单 1 出库单  2 盘点单  3 移库单
                        Msg = "牧原平库的入库任务",
                        Msg = "平库的入库任务",
                    };
                    Db.Insertable(exTask).ExecuteCommand();
                    //托盘绑定信息
@@ -5295,6 +5316,27 @@
                        Db.Updateable(bindInfo).ExecuteCommand();
                    }
                    #endregion
                    #region 添加托盘上架记录
                    var palletupinfo = stockDetail.First();
                    var upShelf = new BllPalletUpShelf()
                    {
                        TaskNo = exTask.TaskNo,
                        TraceNo = bindInfo.ASNNo,
                        PalletNo = bindInfo.PalletNo,
                        SkuNo = palletupinfo.SkuNo,
                        SkuName = palletupinfo.SkuName,
                        LotNo = palletupinfo.LotNo,
                        Status = "2",
                        LocatNo = model.LocatNo,
                        WareHouseNo = bindInfo.WareHouseNo,
                        RoadwayNo = bindInfo.RoadwayNo,
                        AreaNo = storageLocat.AreaNo,
                        CreateUser = 0,
                    };
                    Db.Insertable(upShelf).ExecuteCommand();
                    #endregion
                }
                storageLocat.Status = "1";//状态已使用
                storageLocat.UpdateTime = serverTime; //修改时间
Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -879,8 +879,8 @@
                //    "B14",
                //    "B15",
                //};
                string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
                string row3 = "'B11','B12','B13','B14','B15'";
                string row1 = "'A06'";
                string row3 = "'A08'";
                string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
                if (row == "1")
                {