Merge branch 'master' into Liudl

bklLiudl

2024-08-27 fccd9966ddc9d3e1e0f02cc117f634bf3136067e

Merge branch 'master' into Liudl

 HTML/views/ASNSetting/PalletBind.html

@@ -331,17 +331,6 @@
                    {{ GetBtn11(d) }}
                </script>

                <script type="text/html" id="WareHouseButton">
                    {{# 
                        switch (d.WareHouseNo) {
                            case "W01": return '力诺立体库';
                            case "W02": return '力诺平库';
                            default: return "";
                        }
						
                    }}
                </script>

                <script type="text/html" id="RoadwayButton">
                    {{# 
                        switch (d.RoadwayNo) {
@@ -466,7 +455,7 @@
                { field: 'PalletNo3', title: '托盘号LV3', align: 'center' },
                { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
                { field: 'RoadwayNo', title: '所属巷道', align: 'center', width: 90, templet: '#RoadwayButton' },
                { field: 'WareHouseNo', title: '所属仓库', align: 'center', width: 90, templet: '#WareHouseButton' },
                { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90},
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 110 },
                { field: 'SkuName', title: '物料名称', align: 'center' },
                { field: 'LotNo', title: '批次号', align: 'center', width: 120 },

 Pda/View/SoSetting/pingKuOut.html

@@ -277,12 +277,10 @@

            //检查托盘状态
            function checkPalletState() {

                var param = {
                    "PalletNo": $("#PalletNo").val()
                }
                synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
                    console.log("AAA");
                    console.log(res);

                    if (res.code == 0) { //成功 
@@ -304,11 +302,21 @@

            //当托盘条码输入框失去焦点时,检查一下托盘状态
            $("#PalletNo").blur(function () {
                checkPalletState()
                if ($("#PalletNo").val().length == 8) {
                    checkPalletState()
                }
				
            })

            $("#PalletNo").keydown(function (e) {
                if (e.keyCode === 13) {
                    if ($("#PalletNo").val().length != 8) {
                        layer.msg('请输入正确的托盘条码', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    checkPalletState();
                }
            });

 Pda/View/login.html

@@ -205,7 +205,7 @@
                                location.href="/View/index.html";
                            });
                        }else{//不成功
                            layer.msg(res.ErrorMsg, {
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {

 Wms/Model/ModelDto/BllAsnDto/PalletBindDto.cs

@@ -39,6 +39,12 @@
        /// Nullable:True
        /// </summary>     
        public string WareHouseNo { get; set; }
        /// <summary>
        /// Desc:所属仓库名称
        /// Default:
        /// Nullable:True
        /// </summary>     
        public string WareHouseName { get; set; }

        /// <summary>
        /// Desc:物料编码

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -636,9 +636,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<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
                    .LeftJoin<SysStorageArea>((a, b, c, d, e,f) => e.AreaNo == f.AreaNo)
                    //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
                    .Select((a, b, c, d) => new PalletBindDto()
                    .Select((a, b, c, d,e,f) => new PalletBindDto()
                    {
                        Id = a.Id,
                        ASNNo = a.ASNNo,
@@ -650,6 +651,7 @@
                        LocatNo = a.LocatNo,
                        RoadwayNo = a.RoadwayNo,
                        WareHouseNo = a.WareHouseNo,
                        WareHouseName = f.AreaName,
                        Qty = a.Qty,
                        FullQty = a.FullQty,
                        SamplingQty = a.SamplingQty,