Merge branch 'master' into wxw

Administrator

2024-02-04 719ef250e88b8628ba5cbaeb4973b7c693e01694

Merge branch 'master' into wxw

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -62,7 +62,7 @@
                </select>
            </div>

            <label class="layui-form-label">客户名称</label>
            <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">客户名称</p></label>
            <div class="layui-input-inline">
                <select name="CustomerName" id="CustomerName" lay-verify="" lay-search>
                    <option value=""></option>
@@ -143,6 +143,10 @@
            });
            var arr = [];
            var TypeValue=$("#Type").val();

            var type0 = [3]; //客户
            var type1 = [1,5]; //供应商
            var type2 = [0,2,4,6]; //货主

            // 加载下拉信息
            getCustomerList();
@@ -463,6 +467,7 @@
                var value = data.value;
                if(value!=TypeValue){
                    console.log(value);
                    getCustomerList();
                    arr = [];
                    // 渲染Table
                    refreshTable(null);
@@ -584,13 +589,65 @@

            // 绑定下拉信息
            function getCustomerList() {
                /*
                0：客户
                    退货入库
                    3
                1：供应商
                    采购入库、其它入库
                    1、5
                2：货主
                    成品入库、中间品入库、车间余料入库、代储入库
                    0、2、4、6
                */
                sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        $("#CustomerName").empty();
                        $("#CustomerName").append('<option value =""></option>');
                        for (var i = 0; i < res.data.length; i++) {
                            $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
                                res.data[i].CustomerName + '</option>');
                            //判断单据类型
                            if (type0[0] == $("#Type").val())
                            {
                                /*
                                    0：客户
                                    退货入库
                                    3
                                */
                                if (res.data[i].Type == 0)
                                {
                                    $("#CustomerNamep").html("客户选择");
                                    $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
                                    res.data[i].CustomerName + '</option>');
                                }
                            }
                            else if (type1[0] == $("#Type").val() || type1[1] == $("#Type").val())
                            {
                                /*
                                    1：供应商
                                    采购入库、其它入库
                                    1、5
                                */
                                if (res.data[i].Type == 1)
                                {
                                    $("#CustomerNamep").html("供应商选择");
                                    $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
                                    res.data[i].CustomerName + '</option>');
                                }
                            }
                            else if (type2[0] == $("#Type").val() || type2[1] == $("#Type").val() || type2[2] == $("#Type").val() || type2[3] == $("#Type").val())
                            {
                                /*
                                    2：货主
                                    成品入库、中间品入库、车间余料入库、代储入库
                                    0、2、4、6
                                */
                                if (res.data[i].Type == 2)
                                {
                                    $("#CustomerNamep").html("货主选择");
                                    $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
                                    res.data[i].CustomerName + '</option>');
                                }
                            }
                        }
                        form.render('select');
                    } else { //不成功

 HTML/views/WareHouseSetting/Area.html

@@ -112,7 +112,7 @@
                sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
                    if (res.code == 0) { //成功
                    for (var i = 0; i < res.data.length; i++) {
                        $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' + 
                        $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                            res.data[i].WareHouseName + '</option>');
                    }
                    

 HTML/views/WareHouseSetting/Locate.html

@@ -446,7 +446,7 @@
                sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
                    if (res.code == 0) { //成功
                    for (var i = 0; i < res.data.length; i++) {
                        $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + 
                        $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                            res.data[i].WareHouseName + '</option>');
                    } 
                    form.render('select');
@@ -470,7 +470,7 @@
                        $("#RoadwayNo").append('<option value =""></option>');
                        if (res.code == 0) { //成功 
                            for (var i = 0; i < res.data.length; i++) { 
                                $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + 
                                $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
                                    res.data[i].RoadwayName + '</option>');
                            }
                            form.render('select');
@@ -490,7 +490,7 @@
                        $("#AreaNo").append('<option value =""></option>');
                        if (res.code == 0) { //成功 
                            for (var i = 0; i < res.data.length; i++) { 
                                $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + 
                                $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].WareHouseNo + '-' +
                                    res.data[i].AreaName + '</option>');
                            }
                            form.render('select');

 HTML/views/WareHouseSetting/LocateFrom.html

@@ -182,7 +182,7 @@
                        if (res.code == 0) { //成功
                            $("#RoadwayNo").empty();
                            for (var i = 0; i < res.data.length; i++) {
                                $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + 
                                $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                                    res.data[i].WareHouseName + '</option>');
                            } 
                            $("select[name='WareHouseNo']").val(val); 
@@ -202,7 +202,7 @@
                        if (res.code == 0) { //成功
                            $("#AreaNo").empty(); 
                            for (var i = 0; i < res.data.length; i++) { 
                                $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + 
                                $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
                                    res.data[i].AreaName + '</option>');
                            }
                            $("select[name='AreaNo']").val(val); 
@@ -225,7 +225,7 @@
                        if (res.code == 0) { //成功
                            $("#RoadwayNo").empty(); 
                            for (var i = 0; i < res.data.length; i++) { 
                                $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + 
                                $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
                                    res.data[i].RoadwayName + '</option>');
                            } 
                            $("select[name='RoadwayNo']").val(val); 

 HTML/views/WareHouseSetting/Roadway.html

@@ -115,7 +115,7 @@
                    for (var i = 0; i < res.data.length; i++) {
                        if (res.data[i].WareHouseNo == 'W01')
                        {
                            $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + 
                            $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
                            res.data[i].WareHouseName + '</option>');
                        }
                        

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -235,7 +235,7 @@
                            continue;
                        }

                        $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
                        $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                            res.data[i].WareHouseName + '</option>');
                    }
                    $("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
@@ -398,11 +398,11 @@
            function getRoadway() {
                $("#RoadwayNo").empty();
                synData(IP + "/Sys/GetRoadwayList", { WareHouseNo: $("#WareHouseNo").val() }, 'get', function (res) {
                    //console.log(res)
                    // console.log(res)
                    if (res.code == 0) { //成功

                        for (var i = 0; i < res.data.length; i++) {
                            $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
                            $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
                            res.data[i].RoadwayName + '</option>');
                        }
                        $("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")

 Pda/View/AsnSetting/productEnterQuantity .html

 Wms/Model/ModelDto/SysDto/CustomerDto.cs

@@ -18,7 +18,7 @@
        public string CustomerName { get; set; }

        /// <summary>
        /// 类型 0 销售客户/货主  1 供货商
        /// 类型 0 销售客户 1 供货商 2：货主
        /// </summary>           
        public int? Type { get; set; }


 Wms/Model/ModelDto/SysDto/RoadwayDto.cs

@@ -19,6 +19,14 @@
        /// Nullable:False
        /// </summary>           
        public string RoadwayName { get; set; }

        /// <summary>
        /// 所属仓库号
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string WareHouseNo { get; set; }

        /// <summary>
        /// 所属仓库名称
        /// Default:

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1800,6 +1800,10 @@
                        IsBelt = "0",
                        CreateUser = userId
                    };
                    if (model.SkuQty > pNum)
                    {
                        throw new Exception($"绑定失败，{model.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
                    }
                    // 插入托盘绑定表
                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
                }
@@ -1893,6 +1897,10 @@
                {
                    bind.BitPalletMark = "0";
                }
                if (bind.Qty > pNum)
                {
                    throw new Exception($"绑定失败，{bind.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
                }
                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();

                // 更改入库单明细已组数量
@@ -1922,7 +1930,7 @@
                //添加托盘记录表数据
                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
                Db.Ado.ExecuteCommand(sqlStr);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定1", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);

                Db.CommitTran();
            }

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -631,7 +631,7 @@
        {
            try
            {
                string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
                string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
                
                List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
                {