From d042a6fd02f8256dea3298b5c3c7482bcb0b8ae7 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 03 十二月 2021 14:08:34 +0800
Subject: [PATCH] 条码生成调整
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 103 ++++++++++++++++++++--------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 9 ++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 4 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html | 38 ++++++------
4 files changed, 90 insertions(+), 64 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index b7ec757..f7e885b 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/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);
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index 58337ab..677c4e6 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/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;
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index a6bafa6..686aa60 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/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() + ';';
}
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
index 728c42e..a5a238e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
+++ b/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>
--
Gitblit v1.9.1