合并代码

Demo

2024-03-07 e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c

合并代码

 HTML/views/SOSetting/ExportNotice.html

@@ -1386,10 +1386,11 @@
                                isChongFu= false;
                                if(pa == null)
                                {
                                    layer.msg("请勿重复点击", {
                                    layer.msg("请选择出库口", {
                                        icon: 2,
                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    });
                                    isChongFu= true;
                                    return;
                                }
                                if($('#UnstackWay').val()=='0'){
@@ -1412,6 +1413,29 @@
                                    isChongFu= true;
                                    return;
                                }
                                        isChongFu= true;
                                        return;
                                    }
                                    if(isNeedUnpack=='1'){
                                        if(pa==''){
                                            layer.msg("请选择出库口", {
                                                icon: 2,
                                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                            });
                                            isChongFu= true;
                                            return;
                                        }
                                    }
                                }else{
                                    if(pa==''){
                                        layer.msg("请选择出库口", {
                                            icon: 2,
                                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                        });
                                        isChongFu= true;
                                        return;
                                    }
                                }
                                var param = {
                                    soNo: soNo, 
                                    unstackingMode:$('#UnstackWay').val(),

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -2818,6 +2818,11 @@
                        d.Status = "0";
                        d.UpdateUser = userId;
                        d.UpdateTime = DateTime.Now;

                        if (notice.Type == "1" || notice.Type == "5" || notice.Type == "6" || notice.Type == "7" || notice.Type == "8")//1：领料出库、
                        {
                            d.LotNo = "";
                        }
                    }
                    notice.Status = "0";
                    notice.UpdateUser = userId;