Administrator
2024-03-06 ba9f3df626153f9081b75d23204f988d141fbfbb
修改出库单页面
2个文件已修改
96 ■■■■■ 已修改文件
HTML/views/SOSetting/ExportNotice.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ExportNotice.html
@@ -1227,9 +1227,13 @@
                            maxmin: true,
                            area: ['1200px', '90%'],
                        });
                    }else if(obj.event === 'outKu'){
                        $("#UnstackWay option[value='0']").attr("selected","selected");
                        $("#UnstackWay").attr("disabled",false);
                    }else if(obj.event === 'outKu'){
                        $("#UnstackWay").val(0)
                        $("#UnstackWay").attr("disabled",false);
                        $("#LoadingArea").val('')
                        $("#PickingArea").val('')
                        $('.DivLoadingArea').show()
                        form.render('select');
                        var param = {
                            soNo: SoNo
                        };
@@ -1247,8 +1251,7 @@
                                    if($('#UnstackWay').val()=='1'){
                                        $('.DivPickingArea2').show()
                                    }                                        
                                    form.render('select');
                                    outFunction()
                                } else { //不成功
                                    layer.msg(res.msg, {
@@ -1260,7 +1263,7 @@
                                }
                            });
                        }else{
                            $("#UnstackWay option[value='1']").attr("selected","selected");
                            $("#UnstackWay").val(1)
                            $("#UnstackWay").attr("disabled",true);
                            form.render('select');     
                            
@@ -1549,15 +1552,15 @@
                form.on('select(UnstackWay)',function(data){
                    var value = data.value;
                    if(value==0){
                        $('.DivLoadingArea').show()//.attr("style", "display:block")
                        $('.DivLoadingArea').show()
                        if(isNeedUnpack=='0'){
                            $('.DivPickingArea2').hide()//.attr("style", "display:none")
                            $('.DivPickingArea2').hide()
                        }else{
                            $('.DivPickingArea2').show()//.attr("style", "display:block")
                            $('.DivPickingArea2').show()
                        }                        
                    }else{                        
                        $('.DivLoadingArea').hide()//.attr("style", "display:none")
                        $('.DivPickingArea2').show()//.attr("style", "display:block")
                        $('.DivLoadingArea').hide()
                        $('.DivPickingArea2').show()
                    }                
                });
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1426,43 +1426,52 @@
                        string toLocation = string.Empty;//目标位置
                        string unstackingMode2 = unstackingMode;//拆垛方式,0:机器人拆垛 1:PDA拆垛
                        #region 判断是否需要拆箱
                        string isChai = "0";//是否需要拆箱,0:否 1:是
                        var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
                        if (skuInfo == null)
                        if (notice.Type == "0")//成品出库
                        {
                            throw new Exception("物料信息不存在!");
                        }
                        var packagInfo = packagList.First(w => w.PackagNo == skuInfo.PackagNo);
                        if (packagInfo == null)
                        {
                            throw new Exception("包装信息不存在!");
                        }
                        if (packagInfo.L2Name == "箱")
                        {
                            if (item.Qty % (decimal)packagInfo.L2Num != 0)//能整除说明不用拆箱,不能整除说明需要拆箱
                            string isChai = "0";//是否需要拆箱,0:否 1:是
                            var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
                            if (skuInfo == null)
                            {
                                isChai = "1";
                                unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                                throw new Exception("物料信息不存在!");
                            }
                            var packagInfo = packagList.First(w => w.PackagNo == skuInfo.PackagNo);
                            if (packagInfo == null)
                            {
                                throw new Exception("包装信息不存在!");
                            }
                            if (packagInfo.L2Name == "箱")
                            {
                                if (item.Qty % (decimal)packagInfo.L2Num != 0)//能整除说明不用拆箱,不能整除说明需要拆箱
                                {
                                    isChai = "1";
                                    unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                                }
                            }
                            if (isChai == "0")
                            {
                                var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                                if (boxInfo != null)//托盘上有零箱需要拆箱
                                {
                                    isChai = "1";
                                    unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                                }
                            }
                            if (unstackingMode2 == "0")//机器人拆垛
                            {
                                toLocation = loadingAddre;//装车口
                            }
                            else //PDA拆垛
                            {
                                toLocation = outMode;//出库口
                            }
                        }
                        if (isChai == "0")
                        else
                        {
                            var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                            if (boxInfo != null)//托盘上有零箱需要拆箱
                            {
                                isChai = "1";
                                unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                            }
                        }
                        #endregion
                        if (unstackingMode2 == "0")//机器人拆垛
                        {
                            toLocation = loadingAddre;//装车口
                        }
                        else //PDA拆垛
                        {
                            unstackingMode2 = "1";//非成品出库走PDA拆垛
                            toLocation = outMode;//出库口
                        }
                        }
                        #endregion
                        // 储位号
                        var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo;