出库流程修改

Administrator

2024-03-02 c90d69ef8c115f0fff54edb3a1e06945215e14e9

出库流程修改

 HTML/views/SOSetting/ExportNoticeAddFrom.html

@@ -32,7 +32,7 @@
                    <label class="layui-form-label">单据类型</label>
                    <div class="layui-input-inline">
                        <select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
                            <option value=""></option>
                            <!-- <option value=""></option> -->
                            <!-- 24 -->
                            <option value="0">成品出库</option>
                            <option value="1">领料出库</option>
@@ -56,7 +56,7 @@
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label">客户名称</label>
                    <label class="layui-form-label" id="CustomerNamep">客户名称</label>
                    <div class="layui-input-inline">
                        <select name="CustomerNo" id="CustomerNo" lay-search>
                            <option value=""></option>
@@ -125,6 +125,7 @@
                };

                var arr = []; 
                var TypeValue=$("#Type").val();
                function refreshTable(data) {
                    //table.clear();
                    
@@ -334,6 +335,19 @@
                        isrun = 0;
                        return;
                    }
                    var type= $("#Type").val();
                    if(type=='6'){
                        var CustomerNo=$("#CustomerNo").val();
                        if(CustomerNo==''){
                            layer.msg("代储单据请选择货主！", {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {

                            });
                            return;
                        }
                    }
                    var DataList = [];
                    console.log(infoOptions.data);
                    for (var i in infoOptions.data) {
@@ -429,19 +443,16 @@
                 
                
                //下拉单据类型选中后事件
                // form.on('select(Type)', function(data) {
                //     // console.log(data.value);
                //     if (data.value == "0" || data.value == "1") { //销售出库
                //         $("#chengyunshang").removeClass("isNoShow"); 
                //         $("#chengyunshang").addClass("isShow"); 
                //         form.render('select'); 
                //     }else if(data.value == "2" ||data.value == "3"){//不合格出库
						
                //         $("#chengyunshang").removeClass("isShow"); 
                //         $("#chengyunshang").addClass("isNoShow"); 
                //         form.render('select'); 
                //     } 
                // });
                form.on('select(Type)', function(data) {
                    var value = data.value;
                    if(value!=TypeValue){
                        getCustomerList();
                        arr = [];
                        // 渲染Table
                        refreshTable(null);
                        TypeValue=value;
                    }
                });
                //获取仓库下拉框信息
                // function getWareHouseList(){
                //     sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
@@ -470,9 +481,54 @@
                            $("#CustomerNo").empty();
                            $("#CustomerNo").append('<option value =""></option>');
                            for (var i = 0; i < res.data.length; i++) {
                                $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' + 
                                    res.data[i].CustomerName + '</option>');
                            } 
                                var TypeNum = 0;
								
                                switch($("#Type").val())
                                {									
                                    case "0": //成品出库
                                        TypeNum = 0;
                                        console.log(TypeNum)
                                        break;
                                    case "1": //领料出库
                                    case "2": //抽检出库
                                    case "3": //物料取样出库
                                    case "4": //不合格品出库
                                    case "5": //中间品出库
                                    case "6": //代储出库
                                    case "7": //其他出库
                                        TypeNum = 2;
                                        console.log(TypeNum)
                                        break;
                                }
                                //判断单据类型
                                if (TypeNum == 0)
                                {
                                    if (res.data[i].Type == 0)
                                    {
                                        $("#CustomerNamep").html("客户");
                                        $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                                        res.data[i].CustomerName + '</option>');
                                    }
                                }
                                else if (TypeNum == 1)
                                {
                                    if (res.data[i].Type == 1)
                                    {
                                        $("#CustomerNamep").html("供应商");
                                        $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                                        res.data[i].CustomerName + '</option>');
                                    }
                                }
                                else if (TypeNum == 2)
                                {
                                    if (res.data[i].Type == 2)
                                    {
                                        $("#CustomerNamep").html("货主");
                                        $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                                        res.data[i].CustomerName + '</option>');
                                    }
                                }
                            }
                            form.render('select');
                        } else { //不成功
                            layer.msg(res.msg, {

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -325,38 +325,38 @@
                var plnList = new List<string>() { "100099" };
                var skuList = new List<string>();
                var sku = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0" && !plnList.Contains(m.SkuNo)); //排除空托盘的物料集合
                var inspectStatus = "1";//库存内物料的质检状态
                var skuTypeC = new List<string>() { "0" };//标准
                var skuTypeY = new List<string>() { "1" };//非标
                if (type == "0" || type == "2") //标准
                string skuType = string.Empty;
                switch (type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
                {
                    inspectStatus = "0";
                    //if (type == "0") //成品
                    //{
                    skuList = sku.Where(m => inspectStatus==m.IsControlled).Select(m => m.SkuNo).ToList();
                    //}

                    //if (type == "1") //原料
                    //{
                    //    skuList = sku.Where(m => skuTypeY.Contains(m.Type)).Select(m => m.SkuNo).ToList();
                    //}
                    case "0"://成品入库
                        skuType = "(2)";
                        break;
                    case "1"://领料出库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://抽检出库
                        skuType = "(2)";
                        break;
                    case "3"://物料取样出库
                        skuType = "(0)";
                        break;
                    case "4"://不合格品出库
                        skuType = "(2)";
                        break;
                    case "5"://中间品出库
                        skuType = "(4)";
                        break;
                    case "6"://代储出库
                        skuType = "(2)";
                        break;
                    default: //其它出库
                        skuType = "(0,1,2,3,4)";
                        break;
                }
                else if (type == "1" || type == "3") //非标
                skuList = sku.Where(m => skuType.Contains(m.Type)).Select(m => m.SkuNo).ToList();
                if (skuList == null)
                {
                    inspectStatus = "1";
                    //if (type == "2") //成品
                    //{
                    skuList = sku.Where(m => inspectStatus==m.IsControlled).Select(m => m.SkuNo).ToList();
                    //}

                    //if (type == "3") //原料
                    //{
                    //    skuList = sku.Where(m => skuTypeY.Contains(m.Type)).Select(m => m.SkuNo).ToList();
                    //}
                }
                else
                {
                    throw new Exception("单据状态有误");
                    throw new Exception("未查到对应出库类型的物料");
                }
                //skuList = sku.Select(m => m.SkuNo).ToList();
                var stockRst = new StockServer();