SRM-LAYUI.git - Gitblit

parent: 89a083bd | 补丁 | 提交 | ignore whitespace

王垚

2021-12-03 d042a6fd02f8256dea3298b5c3c7482bcb0b8ae7

条码生成调整

4个文件已修改

	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -569,8 +569,8 @@
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HMinQty', title: '内箱包装数', width: 100, edit: 'text' }
                    , { field: 'HBQty', title: '内箱数', width: 100 }
                    , { field: 'HWXQty', title: '外箱包装数', width: 100, edit: 'text' }
                    , { field: 'HWBQty', title: '外箱数', width: 100 }
                    , { field: 'HWXQty', title: '外箱包装数', width: 100 }
                    , { field: 'HWBQty', title: '外箱数', width: 100, edit: 'text' }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true }
                    , { field: 'HMoney', title: '金额', width: 100, hide: true }
                    , { field: 'HMTONO', title: '计划跟踪单号', width: 100 }
@@ -789,6 +789,8 @@
                var HMinQty = 0;
                var HWXQty = 0;
                var HKFPeriod = 0;
                var HWBQty = 0;
                var HBQty = 0;
                if (obj.data.HMinQty != undefined) {
                    HMinQty = parseFloat(obj.data.HMinQty);
                }
@@ -798,56 +800,71 @@
                if (obj.data.HKFPeriod != undefined) {
                    HKFPeriod = parseFloat(obj.data.HKFPeriod);
                }
                HKFPeriod
                if (obj.data.HWBQty != undefined) {
                    HWBQty = parseFloat(obj.data.HWBQty);
                }
                if (obj.data.HBQty != undefined) {
                    HBQty = parseFloat(obj.data.HBQty);
                }
                switch (field) {
                    case "HMinQty":
                        if (HMinQty > 0) {
                            if (HWXQty >= 0) {
                                if (isPositiveIntegerTimes(parseFloat(obj.value), HWXQty)) //外箱包装数能被内箱包装数整除
                                {
                                    obj.update({
                                        HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                                    });
                                }
                                else {
                                    //obj.update({
                                    //    HMinQty: 0,
                                    //});
                                    f_alert("外箱包装数必须是内箱包装数的整数倍!");
                                }
                            }
                        }
                        else {
                            //obj.update({
                            //    HMinQty: 0,
                            //});
                        if (HMinQty < 0) {
                            f_alert("内箱包装数不能为负数!");
                        }
                        else if (HWBQty > HBQty) {
                            f_alert("外箱数量不能超出内箱数量")
                            return;
                        }
                        else (HWXQty >= 0)
                        {
                            obj.update({
                                //外箱包装总数 =  内箱数量/外箱数量 * 内箱包装数量
                                HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                                HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
                            });
                        }
                        break;
                    case "HWXQty":
                        if (HWXQty > 0) {
                            if (HMinQty >= 0) {
                                if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //外箱包装数能被内箱包装数整除
                                {
                                    obj.update({
                                        HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                                    });
                                }
                                else {
                                    //obj.update({
                                    //    HWXQty: 0,
                                    //});
                                    f_alert("外箱包装数必须是内箱包装数的整数倍!");
                                }
                            }
                    case "HWBQty": //外箱个数发生变化
                        if (HWBQty < 0) {
                            f_alert("外箱数量不能为负数")
                            return;
                        }
                        else if (HWBQty > HBQty) {
                            f_alert("外箱数量不能超出内箱数量")
                            return;
                        }
                        else {
                            //obj.update({
                            //    HWXQty: 0,
                            //});
                            f_alert("外箱包装数不能为负数!");
                            obj.update({
                                //外箱包装总数 =  内箱数量/外箱数量 * 内箱包装数量
                                HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
                                //HWXQty: 12
                            });
                        }
                        break;
                    //case "HWXQty":
                    //    if (HWXQty > 0) {
                    //        if (HMinQty >= 0) {
                    //            if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //外箱包装数能被内箱包装数整除
                    //            {
                    //                obj.update({
                    //                    HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                    //                });
                    //            }
                    //            else {
                    //                //obj.update({
                    //                //    HWXQty: 0,
                    //                //});
                    //                f_alert("外箱包装数必须是内箱包装数的整数倍!");
                    //            }
                    //        }
                    //    }
                    //    else {
                    //        //obj.update({
                    //        //    HWXQty: 0,
                    //        //});
                    //        f_alert("外箱包装数不能为负数!");
                    //    }
                    //    break;
                    case "HKFPeriod":
                        if (HKFPeriod >= 0) {
                            var sKFDQDate = addDate(obj.data.HKFDate, HKFPeriod);

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html

@@ -112,13 +112,13 @@
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> 送货单号：</label>
                                                    <div class="layui-input-block">
                                                        <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                                        <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" readonly autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> 物流单号：</label>
                                                    <div class="layui-input-block">
                                                        <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
                                                        <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs6">
@@ -222,6 +222,7 @@
            success: function (d) {
                //console.log(d.data);
                $("#HBillNo").val(d.data[0].HBillNo);
                $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
                $("#HDate").val(d.data[0].HDate);
            }
        });
@@ -658,6 +659,10 @@
                    layer.msg("预计到货日期不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HDeliveryNo").val() == '' || $("#HDeliveryNo").val() == null) {
                    layer.msg("物流单号不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                return Result;
            }


 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -398,6 +398,10 @@
                        var rows = '';
                        var HEntry = '';
                        for (var i = 0; i < data.length; i++) {
                            if (data[i]["未关联数量"] == 0) {
                                layer.msg("单据号:" + data[i]["单据号"] + "已全部生成送货单！", { icon: 5 });
                                return;
                            }
                            if (data[i]["状态"] == "已确认") {
                                rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
                            }

 WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html

@@ -121,8 +121,8 @@
                                    <a lay-href="SRM/SRM_POInStockBackBillList.html?type=UnConfirm">待确认退货列表</a>
                                </dd>
                                <!--<dd data-name="console">
                                    <a lay-href="SRM/SRM_EmpMessageBillList.html">消息列表</a>
                                </dd>-->
                <a lay-href="SRM/SRM_EmpMessageBillList.html">消息列表</a>
            </dd>-->
                            </dl>
                        </li>
                        <li data-name="home" class="layui-nav-item">
@@ -152,6 +152,23 @@
                            </dl>
                        </li>
                        <li data-name="home" class="layui-nav-item">
                            <a href="javascript:;" lay-tips="条码" lay-direction="2">
                                <i class="layui-icon layui-icon-auz"></i>
                                <cite>条码管理</cite>
                            </a>
                            <dl class="layui-nav-child">
                                <dd>
                                    <a>条码档案</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_POInStockBillList_UnBarCode"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnBarCode">未生成条码单据</a> </dd>
                                        <dd data-name="SRM_BarCodeBillList_UnPrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=UnPrint">未打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList_RePrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=RePrint">已打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        <li data-name="home" class="layui-nav-item">
                            <a href="javascript:;" lay-tips="送货" lay-direction="2">
                                <i class="layui-icon layui-icon-senior"></i>
                                <cite>送货管理</cite>
@@ -174,23 +191,6 @@
                                        <dd data-name="SRM_POInStockBillList_UnArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnArrival">未到货送货单</a></dd>
                                        <dd data-name="SRM_POInStockBillList_ReArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=ReArrival">已到货送货单</a> </dd>
                                        <dd data-name="SRM_POInStockBillList"><a lay-href="SRM/SRM_POInStockBillList.html">全部送货单</a></dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        <li data-name="home" class="layui-nav-item">
                            <a href="javascript:;" lay-tips="条码" lay-direction="2">
                                <i class="layui-icon layui-icon-auz"></i>
                                <cite>条码管理</cite>
                            </a>
                            <dl class="layui-nav-child">
                                <dd>
                                    <a>条码档案</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_POInStockBillList_UnBarCode"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnBarCode">未生成条码单据</a> </dd>
                                        <dd data-name="SRM_BarCodeBillList_UnPrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=UnPrint">未打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList_RePrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=RePrint">已打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
                                    </dl>
                                </dd>
                            </dl>

			@@ -569,8 +569,8 @@
			, { field: 'HQty', title: '数量', width: 100 }
			, { field: 'HMinQty', title: '内箱包装数', width: 100, edit: 'text' }
			, { field: 'HBQty', title: '内箱数', width: 100 }
			, { field: 'HWXQty', title: '外箱包装数', width: 100, edit: 'text' }
			, { field: 'HWBQty', title: '外箱数', width: 100 }
			, { field: 'HWXQty', title: '外箱包装数', width: 100 }
			, { field: 'HWBQty', title: '外箱数', width: 100, edit: 'text' }
			, { field: 'HPrice', title: '单价', width: 100, hide: true }
			, { field: 'HMoney', title: '金额', width: 100, hide: true }
			, { field: 'HMTONO', title: '计划跟踪单号', width: 100 }
			@@ -789,6 +789,8 @@
			var HMinQty = 0;
			var HWXQty = 0;
			var HKFPeriod = 0;
			var HWBQty = 0;
			var HBQty = 0;
			if (obj.data.HMinQty != undefined) {
			HMinQty = parseFloat(obj.data.HMinQty);
			}
			@@ -798,56 +800,71 @@
			if (obj.data.HKFPeriod != undefined) {
			HKFPeriod = parseFloat(obj.data.HKFPeriod);
			}
			HKFPeriod
			if (obj.data.HWBQty != undefined) {
			HWBQty = parseFloat(obj.data.HWBQty);
			}
			if (obj.data.HBQty != undefined) {
			HBQty = parseFloat(obj.data.HBQty);
			}
			switch (field) {
			case "HMinQty":
			if (HMinQty > 0) {
			if (HWXQty >= 0) {
			if (isPositiveIntegerTimes(parseFloat(obj.value), HWXQty)) //外箱包装数能被内箱包装数整除
			{
			obj.update({
			HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
			});
			}
			else {
			//obj.update({
			// HMinQty: 0,
			//});
			f_alert("外箱包装数必须是内箱包装数的整数倍!");
			}
			}
			}
			else {
			//obj.update({
			// HMinQty: 0,
			//});
			if (HMinQty < 0) {
			f_alert("内箱包装数不能为负数!");
			}
			else if (HWBQty > HBQty) {
			f_alert("外箱数量不能超出内箱数量")
			return;
			}
			else (HWXQty >= 0)
			{
			obj.update({
			//外箱包装总数 = 内箱数量/外箱数量 * 内箱包装数量
			HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
			HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
			});
			}
			break;
			case "HWXQty":
			if (HWXQty > 0) {
			if (HMinQty >= 0) {
			if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //外箱包装数能被内箱包装数整除
			{
			obj.update({
			HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
			});
			}
			else {
			//obj.update({
			// HWXQty: 0,
			//});
			f_alert("外箱包装数必须是内箱包装数的整数倍!");
			}
			}
			case "HWBQty": //外箱个数发生变化
			if (HWBQty < 0) {
			f_alert("外箱数量不能为负数")
			return;
			}
			else if (HWBQty > HBQty) {
			f_alert("外箱数量不能超出内箱数量")
			return;
			}
			else {
			//obj.update({
			// HWXQty: 0,
			//});
			f_alert("外箱包装数不能为负数!");
			obj.update({
			//外箱包装总数 = 内箱数量/外箱数量 * 内箱包装数量
			HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
			//HWXQty: 12
			});
			}
			break;
			//case "HWXQty":
			// if (HWXQty > 0) {
			// if (HMinQty >= 0) {
			// if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //外箱包装数能被内箱包装数整除
			// {
			// obj.update({
			// HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
			// });
			// }
			// else {
			// //obj.update({
			// // HWXQty: 0,
			// //});
			// f_alert("外箱包装数必须是内箱包装数的整数倍!");
			// }
			// }
			// }
			// else {
			// //obj.update({
			// // HWXQty: 0,
			// //});
			// f_alert("外箱包装数不能为负数!");
			// }
			// break;
			case "HKFPeriod":
			if (HKFPeriod >= 0) {
			var sKFDQDate = addDate(obj.data.HKFDate, HKFPeriod);

			@@ -112,13 +112,13 @@
			<div class="layui-col-xs3">
			<label class="layui-form-label"> 送货单号：</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" readonly autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label"> 物流单号：</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
			<input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs6">
			@@ -222,6 +222,7 @@
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInnerBillNo").val(d.data[0].HInnerBillNo);
			$("#HDate").val(d.data[0].HDate);
			}
			});
			@@ -658,6 +659,10 @@
			layer.msg("预计到货日期不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
			return Result = false;
			}
			if ($("#HDeliveryNo").val() == '' \|\| $("#HDeliveryNo").val() == null) {
			layer.msg("物流单号不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
			return Result = false;
			}
			return Result;
			}

			@@ -398,6 +398,10 @@
			var rows = '';
			var HEntry = '';
			for (var i = 0; i < data.length; i++) {
			if (data[i]["未关联数量"] == 0) {
			layer.msg("单据号:" + data[i]["单据号"] + "已全部生成送货单！", { icon: 5 });
			return;
			}
			if (data[i]["状态"] == "已确认") {
			rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
			}

			@@ -121,8 +121,8 @@
			<a lay-href="SRM/SRM_POInStockBackBillList.html?type=UnConfirm">待确认退货列表</a>
			</dd>
			<!--<dd data-name="console">
			<a lay-href="SRM/SRM_EmpMessageBillList.html">消息列表</a>
			</dd>-->
			<a lay-href="SRM/SRM_EmpMessageBillList.html">消息列表</a>
			</dd>-->
			</dl>
			</li>
			<li data-name="home" class="layui-nav-item">
			@@ -152,6 +152,23 @@
			</dl>
			</li>
			<li data-name="home" class="layui-nav-item">
			<a href="javascript:;" lay-tips="条码" lay-direction="2">
			<i class="layui-icon layui-icon-auz"></i>
			<cite>条码管理</cite>
			</a>
			<dl class="layui-nav-child">
			<dd>
			<a>条码档案</a>
			<dl class="layui-nav-child">
			<dd data-name="SRM_POInStockBillList_UnBarCode"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnBarCode">未生成条码单据</a> </dd>
			<dd data-name="SRM_BarCodeBillList_UnPrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=UnPrint">未打印条码档案</a></dd>
			<dd data-name="SRM_BarCodeBillList_RePrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=RePrint">已打印条码档案</a></dd>
			<dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
			</dl>
			</dd>
			</dl>
			</li>
			<li data-name="home" class="layui-nav-item">
			<a href="javascript:;" lay-tips="送货" lay-direction="2">
			<i class="layui-icon layui-icon-senior"></i>
			<cite>送货管理</cite>
			@@ -174,23 +191,6 @@
			<dd data-name="SRM_POInStockBillList_UnArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnArrival">未到货送货单</a></dd>
			<dd data-name="SRM_POInStockBillList_ReArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=ReArrival">已到货送货单</a> </dd>
			<dd data-name="SRM_POInStockBillList"><a lay-href="SRM/SRM_POInStockBillList.html">全部送货单</a></dd>
			</dl>
			</dd>
			</dl>
			</li>
			<li data-name="home" class="layui-nav-item">
			<a href="javascript:;" lay-tips="条码" lay-direction="2">
			<i class="layui-icon layui-icon-auz"></i>
			<cite>条码管理</cite>
			</a>
			<dl class="layui-nav-child">
			<dd>
			<a>条码档案</a>
			<dl class="layui-nav-child">
			<dd data-name="SRM_POInStockBillList_UnBarCode"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnBarCode">未生成条码单据</a> </dd>
			<dd data-name="SRM_BarCodeBillList_UnPrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=UnPrint">未打印条码档案</a></dd>
			<dd data-name="SRM_BarCodeBillList_RePrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=RePrint">已打印条码档案</a></dd>
			<dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
			</dl>
			</dd>
			</dl>