Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

admin

6 小时以前 05679f2a536bc8ee97af46009c50c6aa93306d46

Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

 Pda/View/SoSetting/productOutCode.html

@@ -389,6 +389,8 @@
            function clear3() {
                $("#planQty").val("");  //计划数量
                $("#finishQty").val("");//完成数量
                scanQty=0;
                $('#scanQty').val(0);
            }
            function clear4() {
                $('#boxNo').val("");//箱码
@@ -736,12 +738,12 @@
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                if($("#planQty").val()!=$("#scanQty").val()){
                    layer.msg("已扫数量和计划数量不一致！", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;
                }
                // if($("#planQty").val()!=$("#scanQty").val()){
                //     layer.msg("已扫数量和计划数量不一致！", {
                //         icon: 2,
                //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
                //     }); return;
                // }
                if (isContinue == "0") {                    
                    if (boxes == null || boxes.length<=0) {
                        layer.msg("请扫描标签码", {
@@ -785,6 +787,7 @@
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            canPickBox = true//回调
                            scanQty=0;
                            $("#boxNo").val('');
                            $('#scanQty').val(0);
                            updateQtyList();

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1941,6 +1941,13 @@

                    foreach (var d in noticeDetail)
                    {
                        if (notice.Type == "0")//成品出库，计划数量和拣货数量必须一致
                        {
                            if (d.CompleteQty != d.Qty)
                            {
                                throw new Exception($"关单失败,物料:{d.SkuNo}计划数量和拣货数量不一致！");
                            }
                        }
                        #region MyRegion
                        //更改库存明细锁定数量
                        //var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id