JC24WMS.git - Gitblit

parent: 369add64 | 补丁 | 提交 | show whitespace

bklLiudl

2024-02-18 e3ef3289ab63c62dfa4f04e08addcdf8fca7dcba

平库入库，地码文本框增加回车验证功能

4个文件已修改

	Pda/View/AsnSetting/pingKuEnter.html	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/Controllers/PdaAsnController.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Pda/View/AsnSetting/pingKuEnter.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>

    <head>
        <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
        <meta charset="UTF-8" />
@@ -17,6 +18,7 @@
                height: auto;
                /* background-color: #009E94; */
            }

            .btn-ok-blue {
                border: none; 
                color: #FFFFFF; 
@@ -25,6 +27,7 @@
                height: 36px;
                border-radius: 5px;
            }

            .btn-ok-red {
                border: none; 
                color: #FFFFFF; 
@@ -33,12 +36,15 @@
                height: 36px;
                border-radius: 5px;
            }

            .btn-ok-blue:active {
                opacity: 0.8;
            }

            .btn-ok-red:active {
                opacity: 0.8;
            }

            .foot-container {
                text-align: center;
                /* background-color: #007DDB; */
@@ -46,6 +52,7 @@
        </style>
        <link rel="stylesheet" href="/css/adapter.css" />
    </head>

    <body>
        <div id="" class="main-content">
            <div id="" class="layout-title">
@@ -127,7 +134,11 @@
                        </table>
                    </div>
                    <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr><th lang>箱码</th><th lang>名称</th><th lang>数量</th></tr>
                    <tr>
                        <th lang>箱码</th>
                        <th lang>名称</th>
                        <th lang>数量</th>
                    </tr>
                        <tr id="boxCell" style="display: none">
                            <td id="BoxNo" name="BoxNo">AG000001</td>
                            <td id="SkuName" name="SkuName">疫苗名称名称名称</td>
@@ -171,7 +182,7 @@
                var curPageIndex = 1
                var billList = null
                var IsHuiKu=0 //是否回库，0:否 1:是                  

            // 
                //获取入库单
                function getBar(selectedvalue) {
                    if (selectedvalue) {
@@ -314,6 +325,40 @@
                        }
                    });
                }        

            // 储位信息(地码)失去焦点后触发验证
            $("#LocatNo").blur(function () {
                CheckLocatNo()
            })
            // 储位信息(地码)点击回车后触发验证
            $("#LocatNo").keydown(function (e) {
                if (e.keyCode === 13) {
                    CheckLocatNo();
                }
            });
            // 验证储位信息(地码)是否可用
            function CheckLocatNo() {
                if ($("#LocatNo").val() == "") {
                    return
                }
                var param1 = {
                    "LocatNo": $("#LocatNo").val()
                }
                //获取托盘管理的入库单
                sendData(IP + "/PdaAsn/CheckLocatNo", param1, 'post', function (res) {
                    if (res.code != 0) { //成功
                        layer.msg(res.msg, {
                            icon: 0,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });

                        // 清空地码信息。暂定清空输入框信息
                        $("#LocatNo").val('');
                        return
                    }
                });
            }

                //渲染列表    
                function refreshTable() {
                    //先清空一下箱子列表
@@ -460,8 +505,7 @@
                    setCurPage(curPageIndex + 1)
                }
                                
                function getBoxPageNum()
                {
            function getBoxPageNum() {
                    let num = $("#tableBoxList tr").length
                    if(num <= 2 ){
                        return 0
@@ -586,4 +630,5 @@
            })
        </script>
    </body>

</html>

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1281,6 +1281,30 @@
            }
        }

        /// <summary>
        /// 验证储位地址(地码)是否可用
        /// </summary>
        /// <param name="locatNo">储位编码</param>
        /// <returns></returns>
        public string CheckLocatNo(string locatNo) 
        {
            try
            {
                string strMsg = "";
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.Status == "0" && w.WareHouseNo == "W02");
                if (storageLocat == null)
                {
                    throw new Exception("-1:地码(储位信息)不存在或非空闲状态，请核查!");
                }

                return strMsg;
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }

        //根据箱码获取物料、批次、数量等信息
        public PdaPalletNoCheckDto GetBoxInfoByBoxNo(string boxNo)
        {

 Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs

@@ -55,6 +55,13 @@
        //根据托盘号获取入库单号
        string GetASNNoByPalletNo(string palletNo);

        /// <summary>
        /// 验证储位地址(地码)是否可用。
        /// </summary>
        /// <param name="LocatNo"></param>
        /// <returns></returns>
        string CheckLocatNo(string LocatNo);

        //根据箱码获取物料、批次、数量等信息
        PdaPalletNoCheckDto GetBoxInfoByBoxNo(string boxNo);


 Wms/Wms/Controllers/PdaAsnController.cs

@@ -383,6 +383,26 @@
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 验证储位(地码)是否可用
        /// </summary>
        /// <param name="model">LocatNo储位地址</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult CheckLocatNo(PalletBindVm model) 
        {
            try
            {
                var result = _PdaAsnSvc.CheckLocatNo(model.LocatNo);

                return Ok(new { code = 0, msg = "验证成功!", data = result });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        #endregion

        #region 零箱入库

			@@ -1,5 +1,6 @@
			<!DOCTYPE html>
			<html>

			<head>
			<meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
			<meta charset="UTF-8" />
			@@ -17,6 +18,7 @@
			height: auto;
			/* background-color: #009E94; */
			}

			.btn-ok-blue {
			border: none;
			color: #FFFFFF;
			@@ -25,6 +27,7 @@
			height: 36px;
			border-radius: 5px;
			}

			.btn-ok-red {
			border: none;
			color: #FFFFFF;
			@@ -33,12 +36,15 @@
			height: 36px;
			border-radius: 5px;
			}

			.btn-ok-blue:active {
			opacity: 0.8;
			}

			.btn-ok-red:active {
			opacity: 0.8;
			}

			.foot-container {
			text-align: center;
			/* background-color: #007DDB; */
			@@ -46,6 +52,7 @@
			</style>
			<link rel="stylesheet" href="/css/adapter.css" />
			</head>

			<body>
			<div id="" class="main-content">
			<div id="" class="layout-title">
			@@ -127,7 +134,11 @@
			</table>
			</div>
			<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
			<tr><th lang>箱码</th><th lang>名称</th><th lang>数量</th></tr>
			<tr>
			<th lang>箱码</th>
			<th lang>名称</th>
			<th lang>数量</th>
			</tr>
			<tr id="boxCell" style="display: none">
			<td id="BoxNo" name="BoxNo">AG000001</td>
			<td id="SkuName" name="SkuName">疫苗名称名称名称</td>
			@@ -171,7 +182,7 @@
			var curPageIndex = 1
			var billList = null
			var IsHuiKu=0 //是否回库，0:否 1:是

			//
			//获取入库单
			function getBar(selectedvalue) {
			if (selectedvalue) {
			@@ -314,6 +325,40 @@
			}
			});
			}

			// 储位信息(地码)失去焦点后触发验证
			$("#LocatNo").blur(function () {
			CheckLocatNo()
			})
			// 储位信息(地码)点击回车后触发验证
			$("#LocatNo").keydown(function (e) {
			if (e.keyCode === 13) {
			CheckLocatNo();
			}
			});
			// 验证储位信息(地码)是否可用
			function CheckLocatNo() {
			if ($("#LocatNo").val() == "") {
			return
			}
			var param1 = {
			"LocatNo": $("#LocatNo").val()
			}
			//获取托盘管理的入库单
			sendData(IP + "/PdaAsn/CheckLocatNo", param1, 'post', function (res) {
			if (res.code != 0) { //成功
			layer.msg(res.msg, {
			icon: 0,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});

			// 清空地码信息。暂定清空输入框信息
			$("#LocatNo").val('');
			return
			}
			});
			}

			//渲染列表
			function refreshTable() {
			//先清空一下箱子列表
			@@ -460,8 +505,7 @@
			setCurPage(curPageIndex + 1)
			}

			function getBoxPageNum()
			{
			function getBoxPageNum() {
			let num = $("#tableBoxList tr").length
			if(num <= 2 ){
			return 0
			@@ -586,4 +630,5 @@
			})
			</script>
			</body>

			</html>

			@@ -1281,6 +1281,30 @@
			}
			}

			/// <summary>
			/// 验证储位地址(地码)是否可用
			/// </summary>
			/// <param name="locatNo">储位编码</param>
			/// <returns></returns>
			public string CheckLocatNo(string locatNo)
			{
			try
			{
			string strMsg = "";
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.Status == "0" && w.WareHouseNo == "W02");
			if (storageLocat == null)
			{
			throw new Exception("-1:地码(储位信息)不存在或非空闲状态，请核查!");
			}

			return strMsg;
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}

			//根据箱码获取物料、批次、数量等信息
			public PdaPalletNoCheckDto GetBoxInfoByBoxNo(string boxNo)
			{

			@@ -55,6 +55,13 @@
			//根据托盘号获取入库单号
			string GetASNNoByPalletNo(string palletNo);

			/// <summary>
			/// 验证储位地址(地码)是否可用。
			/// </summary>
			/// <param name="LocatNo"></param>
			/// <returns></returns>
			string CheckLocatNo(string LocatNo);

			//根据箱码获取物料、批次、数量等信息
			PdaPalletNoCheckDto GetBoxInfoByBoxNo(string boxNo);

			@@ -383,6 +383,26 @@
			return Ok(new { code = 1, msg = e.Message });
			}
			}

			/// <summary>
			/// 验证储位(地码)是否可用
			/// </summary>
			/// <param name="model">LocatNo储位地址</param>
			/// <returns></returns>
			[HttpPost]
			public IActionResult CheckLocatNo(PalletBindVm model)
			{
			try
			{
			var result = _PdaAsnSvc.CheckLocatNo(model.LocatNo);

			return Ok(new { code = 0, msg = "验证成功!", data = result });
			}
			catch (Exception e)
			{
			return Ok(new { code = 1, msg = e.Message });
			}
			}
			#endregion

			#region 零箱入库