diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
index 6450b12..1a010da 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
@@ -357,73 +357,15 @@
}
- //最小包装量值改变事件(原输入本次+最小)
- function minPackQty_Change() {
+ //本次生成数量改变事件
+ function thisCreate_Change() {
var thisCreateQty = $("#thisCreateQty").val() * 1;//本次生成数量
thisCreateQty = thisCreateQty.toFixed(6);
- var minPackQty = $("#minPackQty").val() * 1;//最小包装量
- minPackQty = minPackQty.toFixed(6);
- var createPageCount = $("#cretePageCount").val() * 1;//本次生成张数
- var Quantity = $("#Quantity").val() * 1;//数量
- var YAmount = $("#YAmount").val() * 1;//辅计量数量
-
- createPageCount = createPageCount.toFixed(0);
- if (minPackQty <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
- //不可以整除，生成张数+1；
- //if (thisCreateQty % minPackQty != 0) {
- if (parseInt(Math.ceil(thisCreateQty * 10000)) % parseInt(Math.ceil(minPackQty * 10000)) != 0) {
- createPageCount = parseInt(thisCreateQty / minPackQty) + 1;
- $("#cretePageCount").val(createPageCount);
- }
- else {
- createPageCount = parseInt(thisCreateQty / minPackQty);
- $("#cretePageCount").val(createPageCount);
- }
- var Ratio = YAmount / Quantity * minPackQty;
-
- $("#Amount").val(Ratio);//自动计算出的条码辅计量数量
-
- }
- //本次生成数量值改变事件(原输入本次+最小)
- function thisCreateQty_Change() {
-
- var Quantity_str = $("#Quantity").val() * 1;//采购订单总数
-
-
- var CreatedQty_str = $("#CreatedQty").val() * 1;//已生成数量
-
- var thisCreateQty_str = $("#thisCreateQty").val() * 1;//本次生成数量
-
-
- var Quantity = Number(Quantity_str);
- var CreatedQty = Number(CreatedQty_str);
- var thisCreateQty = Number(thisCreateQty_str);
-
if (thisCreateQty <= 0) {
$.modalAlertNew("WMS00102");
return false;
}
- if (thisCreateQty <= 0 || thisCreateQty > (Quantity - CreatedQty)) {
- var maxQty = Quantity - CreatedQty;
- $.modalAlertNew("WMS00103", maxQty);
- //$.modalAlert("请输入0到" + maxQty + "范围内的数！");
- $("#thisCreateQty").val("");
- return false;
- } else {
- minPackQty_Change();
- return true;
- }
- var minPackQty = $("#minPackQty").val() * 1;//最小包装量
- minPackQty_Change();
- }
-
-
- //本次生成数量改变事件
- function thisCreate_Change() {
//本+辅
if (thisCreateQtyEnable == true && AmountEnable == true) {
thisCreateAndAmount();
@@ -441,6 +383,12 @@
//最小包装量改变事件
function minPack_Change() {
+ var minPackQty = $("#minPackQty").val() * 1;//最小包装量
+ minPackQty = minPackQty.toFixed(6);
+ if (minPackQty <= 0) {
+ $.modalAlertNew("WMS00102");
+ return false;
+ }
//最小+张数
if (minPackQtyEnable == true && cretePageCountEnable == true) {
minPackAndcretePageCount();
@@ -454,6 +402,12 @@
//辅计量数量改变事件
function Amount_Change() {
+ var Amount = $("#Amount").val() * 1;//辅计量数量
+ Amount = Amount.toFixed(6);
+ if (Amount <= 0) {
+ $.modalAlertNew("WMS00102");
+ return false;
+ }
//辅+张数
if (AmountEnable == true && cretePageCountEnable == true) {
AmountAndcretePageCount();
@@ -466,6 +420,13 @@
//生成张数改变事件
function cretePageCount_Change() {
+ var cretePageCount = $("#cretePageCount").val() * 1;//张数
+ cretePageCount = cretePageCount.toFixed(6);
+ if (cretePageCount <= 0) {
+ $.modalAlertNew("WMS00102");
+ return false;
+ }
+
//张数+本
if (thisCreateQtyEnable == true && cretePageCountEnable == true) {
thisCreateAndcretePageCount();
@@ -500,14 +461,14 @@
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
var InvProportion= $("#InvProportion").val();//转换率
- if (Amount <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
- if (cretePageCount <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
+ //if (Amount <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
+ //if (cretePageCount <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
//仅测试使用
//InvProportion = 2;
var thisCreateQty = Amount * InvProportion;
@@ -533,14 +494,14 @@
cretePageCount = cretePageCount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
- if (cretePageCount <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
- if (minPackQty <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
+ //if (cretePageCount <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
+ //if (minPackQty <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
var thisCreateQty = minPackQty * cretePageCount;
$("#thisCreateQty").val(thisCreateQty);
var Ratio = 0;
@@ -563,10 +524,10 @@
Amount = Amount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
- if (Amount <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
+ //if (Amount <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
var minPackQty = Amount / (YAmount / Quantity);
if (parseInt(Math.ceil(thisCreateQty * 10000)) % parseInt(Math.ceil(minPackQty * 10000)) != 0) {
createPageCount = parseInt(thisCreateQty / minPackQty) + 1;
@@ -594,10 +555,10 @@
cretePageCount = cretePageCount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
- if (cretePageCount <= 0) {
- $.modalAlertNew("WMS00102");
- return false;
- }
+ //if (cretePageCount <= 0) {
+ // $.modalAlertNew("WMS00102");
+ // return false;
+ //}
var minPackQty = thisCreateQty / cretePageCount;//最小包装量
minPackQty = minPackQty.toFixed(6);
$("#minPackQty").val(minPackQty);
diff --git a/WMS-BS/NFine.Web/Configs/database.config b/WMS-BS/NFine.Web/Configs/database.config
index efe0a79..064185f 100644
--- a/WMS-BS/NFine.Web/Configs/database.config
+++ b/WMS-BS/NFine.Web/Configs/database.config
@@ -3,12 +3,11 @@
+
+
-
-
+
+