修改入库问题

chengsc

2025-03-10 d7fe0f4c66b134fca43bca44b1161c0e4aa28bcb

修改入库问题

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -302,7 +302,7 @@
                                        <i class="layui-icon layui-icon-delete"></i>删除</a>`; 
                                    
                                }
                                if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "8") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){  
                                if((d.AsnType =="1" || d.AsnType == "4") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){  
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel"> 
                                        <i class="layui-icon layui-icon-edit"></i>生成标签</a>`; 
                                } 

 HTML/views/ASNSetting/PalletBind.html

@@ -331,24 +331,7 @@
                    {{ GetBtn11(d) }}
                </script>

                <script type="text/html" id="RoadwayButton">
                    {{# 
                        switch (d.RoadwayNo) {
                            case "R01": return '01巷道';
                            case "R02": return '02巷道';
                            case "R03": return '03巷道';
                            case "R04": return '04巷道';
                            case "R05": return '05巷道';
                            case "R06": return '06巷道';
                            case "R07": return '07巷道';
                            case "R08": return '08巷道';
                            case "R09": return '09巷道';
                            case "R10": return '10巷道';
                            default: return "";
                        }
						
                    }}
                </script>
				
                <!-- #endregion -->
            </div>

@@ -417,9 +400,12 @@

            // 查询事件
            form.on('select(getWareHouseNo)', function (data) {
                if ($("#WareHouseNo").val() == "W01") {
                $("#RoadwayNo").html('');
                $("#RoadwayNo").append('<option value=""></option>');
                form.render('select');
                if ($("#WareHouseNo").val() != "") {
                    //获取巷道下拉框信息
                    synData(IP + "/Sys/GetRoadwayList", {}, 'get', function (res) {
                    synData(IP + "/Sys/GetStorageRoadwayByHouseNo", {wareHouseNo:$("#WareHouseNo").val()}, 'get', function (res) {
                        if (res.code == 0) { //成功
                            for (var i = 0; i < res.data.length; i++) {

@@ -436,12 +422,7 @@
                        }
                    });
                }
                else {
                    $("#RoadwayNo").html('');
                    $("#RoadwayNo").append('<option value=""></option>');
                    form.render('select');
                }

				
            });

            // 渲染总表
@@ -454,7 +435,7 @@
                { field: 'PalletNo2', title: '托盘号LV2', align: 'center' },
                { field: 'PalletNo3', title: '托盘号LV3', align: 'center' },
                { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
                { field: 'RoadwayNo', title: '所属巷道', align: 'center', width: 90, templet: '#RoadwayButton' },
                { field: 'RoadwayName', title: '所属巷道', align: 'center', width: 90 },
                { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90 },
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 110 },
                { field: 'SkuName', title: '物料名称', align: 'center' },

 Pda/View/AsnSetting/requestRuku.html

@@ -270,10 +270,10 @@
                }
                var param = {
                    PalletNo: $("#PalletNo").val(),
                    HouseNo:"W01"
                    HouseNo:"W02"
                }
                sendData(IP + "/DownApi/RequestLocation", param, 'post', function (res) {
                    if (res.code == 0) { //成功 
                    if (res.Success == 0) { //成功 
                        layer.msg(res.msg, {
                            icon: 1,
                            time: 2500 //2秒关闭（如果不配置，默认是3秒）
@@ -297,7 +297,7 @@
                            $("#LocatNo").val(res.data.LocatNo);
                        });
                    } else { //不成功
                        layer.msg(res.msg, {
                        layer.msg(res.Message, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {

 Pda/web.config

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <system.webServer>
        <httpRedirect enabled="false" destination="login.html" exactDestination="true" childOnly="true" />
        <httpRedirect enabled="true" destination="test.html" exactDestination="false" childOnly="false" />
        <defaultDocument>
            <files>
                <remove value="default.aspx" />
@@ -10,6 +10,7 @@
                <remove value="index.htm" />
                <remove value="Default.asp" />
                <remove value="Default.htm" />
                <add value="test.html" />
                <add value="login.html" />
            </files>
        </defaultDocument>

 Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs

@@ -34,6 +34,12 @@
        public string RoadwayNo { get; set; }

        /// <summary>
        /// Desc:所属巷道名称
        /// Default:
        /// Nullable:True
        /// </summary>     
        public string RoadwayName { get; set; }
        /// <summary>
        /// Desc:所属仓库
        /// Default:
        /// Nullable:True

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -646,10 +646,10 @@
                    .LeftJoin<BllArrivalNoticeDetail>((a, b) => a.ASNDetailNo == b.Id)
                    .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                    .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
                    .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => a.WareHouseNo == f.WareHouseNo)
                    //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
                    .Select((a, b, c, d,e,f) => new PalletBindDto()
                    //.LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
                    .LeftJoin<SysWareHouse>((a, b, c, d,f) => a.WareHouseNo == f.WareHouseNo)
                    .LeftJoin<SysStorageRoadway>((a, b, c, d, f,g) => a.RoadwayNo == g.RoadwayNo)
                    .Select((a, b, c, d,f,g) => new PalletBindDto()
                    {
                        Id = a.Id,
                        ASNNo = a.ASNNo,
@@ -660,6 +660,7 @@
                        PalletNo3 = a.PalletNo3,
                        LocatNo = a.LocatNo,
                        RoadwayNo = a.RoadwayNo,
                        RoadwayName = g.RoadwayName,
                        WareHouseNo = a.WareHouseNo,
                        WareHouseName = a.WareHouseNo+"-"+f.WareHouseName,
                        Qty = a.Qty,

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -377,21 +377,25 @@
                            locate = GetLocateByRoadway(l.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                            if (locate != null)
                            {
                                list.Add(locate.LocatNo);
                                var isOk = LocateIsOk(locate);
                                if (!isOk)
                                {
                                    locate = null;
                                }
                                if (isOk)
                                {
                                    break;
                                }
                                break;
                                //list.Add(locate.LocatNo);
                                //var isOk = LocateIsOk(locate);
                                //if (!isOk)
                                //{
                                //    locate = null;
                                //}
                                //if (isOk)
                                //{
                                //    break;
                                //}
                            }


                        } while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时，再次循环巷道、区域查找储位
                        
                        if (locate!=null)
                        {
                            break;
                        }
                    }
                    //如果跳巷道并且未找到合适空储位,则跳到最后一次使用的巷道查询
                    if (!isRoadway)
@@ -407,12 +411,13 @@
                                    locate = GetLocateByRoadway(log.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                                    if (locate != null)
                                    {
                                        list.Add(locate.LocatNo);
                                        var isOk = LocateIsOk(locate);
                                        if (!isOk)
                                        {
                                            locate = null;
                                        }
                                        break;
                                        //list.Add(locate.LocatNo);
                                        //var isOk = LocateIsOk(locate);
                                        //if (!isOk)
                                        //{
                                        //    locate = null;
                                        //}
                                    }
                                    
                                    
@@ -434,21 +439,25 @@
                            locate = GetLocateByRoadway(item.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                            if (locate != null)
                            {
                                list.Add(locate.LocatNo);
                                var isOk = LocateIsOk(locate);
                                if (!isOk)
                                {
                                    locate = null;
                                }
                                if (isOk)
                                {
                                    break;
                                }
                                break;
                                //list.Add(locate.LocatNo);
                                //var isOk = LocateIsOk(locate);
                                //if (!isOk)
                                //{
                                //    locate = null;
                                //}
                                //if (isOk)
                                //{
                                //    break;
                                //}
                            }


                        } while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时，再次循环巷道、区域查找储位
                        
                        if (locate != null)
                        {
                            break;
                        }
                    }
                }

@@ -515,7 +524,7 @@
        }

        /// <summary>
        /// 验证储位是否可入库
        /// 验证储位是否可入库 双深位验证
        /// </summary>
        /// <param name="locate"></param>
        /// <returns></returns>

 Wms/Wms/Controllers/DownApiController.cs

@@ -304,12 +304,12 @@
            var claimsIdentity = this.User.Identity as ClaimsIdentity;
            if (claimsIdentity == null)
            {
                return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                return Ok(new HttpReturnModel { Success = "1", Message = "未获取到当前操作人信息" });
            }
            var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
            if (string.IsNullOrWhiteSpace(userId))
            {
                return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                return Ok(new HttpReturnModel { Success = "1", Message = "未获取到当前操作人信息" });
            }


@@ -326,7 +326,7 @@
            {
                new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo, "申请储位", $"申请储位托盘号：{model.PalletNo}的失败信息", int.Parse(userId));

                return Ok(new ErpModel { Success = -1, Message = e.Message });
                return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
            }
        }