Demo
2024-03-20 3a19b1c20475d7e50b15306b4700a4fedc0657cb
修改Bug问题,PDA已拣数量显示问题、PC拣货时间显示
4个文件已修改
32 ■■■■ 已修改文件
HTML/views/SOSetting/ComBoxInfo.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ExportAllot.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ComBoxInfo.html
@@ -132,7 +132,7 @@
                            field: 'CreateUserName', align: 'center', title: '创建人', width: 120,
                        },
                        {
                            field: 'CreateTime', align: 'center', title: '创建时间', width: 165,
                            field: 'CreateTime', align: 'center', title: '拣货时间', width: 165,
                            templet: function (d) {
                                return formatDate(d.CreateTime);
                            },
HTML/views/SOSetting/ExportAllot.html
@@ -217,7 +217,13 @@
                                        }}
                                        {{ GetBtn7(d) }}
                                    </script>
                                    <script type="text/html" id="templetUpdateTime">
                                        {{# function GetBtn71(d){
                                                return formatDate(d.UpdateTime);
                                            }
                                        }}
                                        {{ GetBtn71(d) }}
                                    </script>
                                    <script type="text/html" id="templetUnstackingMode">
                                        {{# function GetBtn8(d){
                                                switch (d.UnstackingMode) {
@@ -347,6 +353,7 @@
                { field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 },
                { field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 },
                { field: 'CreateTime', align: 'center', title: '创建时间', width: 160, templet: '#templetCreateTime' },
                { field: 'UpdateTime', align: 'center', title: '完成时间', width: 160, templet: '#templetUpdateTime' },
                { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true }
            ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
@@ -608,7 +615,7 @@
                { field: 'LotText', title: '批次描述', align: 'center', width: 150, },
                { field: 'SupplierLot', title: '供货批次', align: 'center', width: 110, },
                { field: 'Standard', title: '物料规格', align: 'center', width: 120, },
                //{field: 'CreateTime',align: 'center',title: '创建时间',width: 165,templet: '#templetCreateTime2'},
                {field: 'CreateTime',align: 'center',title: '拣货',width: 165,templet: '#templetCreateTime2'},
                { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
            ]];
            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -242,7 +242,19 @@
                        {
                            foreach (var demo in list)
                            {
                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
                                //if (!string.IsNullOrWhiteSpace(boxNo3))
                                //{
                                //    var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
                                //}
                                //else if (!string.IsNullOrWhiteSpace(boxNo))
                                //{
                                //    if (expr)
                                //    {
                                //    }
                                //}
                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
                                if (com != null)
                                {
                                    demo.PickedQty = com.CompleteQty;
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -46,7 +46,7 @@
                        m.SkuName,
                        m.Standard,
                        m.PalletNo,
                        m.NowPalletNo
                        m.NowPalletNo,
                    })
                    .Select(a => new CompleteDetailDto()
                    {
@@ -64,7 +64,8 @@
                        Standard = a.Standard,
                        PalletNo = a.PalletNo,
                        CompleteQty = SqlFunc.AggregateSum(a.CompleteQty),
                        NowPalletNo = a.NowPalletNo
                        NowPalletNo = a.NowPalletNo,
                        //CreateTime = a.CreateTime
                    }).ToOffsetPage(page, limit, ref total);
                count = total;
                return data;