Jjie
/
OMAY_WMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

no message

master
Juj 1 year ago
parent
6881a845c5
commit
7391b82869
2 changed files with 49 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 129
      WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
  2. 9
      WMS-BS/NFine.Web/Configs/database.config

129
WMS-BS/NFine.Web/Areas/OMAY/Views/ICSMoCreateLot/From.cshtml
View File

@ -357,73 +357,15 @@
} }
//最小包装量值改变事件(原输入本次+最小)
function minPackQty_Change() {
//本次生成数量改变事件
function thisCreate_Change() {
var thisCreateQty = $("#thisCreateQty").val() * 1;//本次生成数量 var thisCreateQty = $("#thisCreateQty").val() * 1;//本次生成数量
thisCreateQty = thisCreateQty.toFixed(6); 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) { if (thisCreateQty <= 0) {
$.modalAlertNew("WMS00102"); $.modalAlertNew("WMS00102");
return false; 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) { if (thisCreateQtyEnable == true && AmountEnable == true) {
thisCreateAndAmount(); thisCreateAndAmount();
@ -441,6 +383,12 @@
//最小包装量改变事件 //最小包装量改变事件
function minPack_Change() { function minPack_Change() {
var minPackQty = $("#minPackQty").val() * 1;//最小包装量
minPackQty = minPackQty.toFixed(6);
if (minPackQty <= 0) {
$.modalAlertNew("WMS00102");
return false;
}
//最小+张数 //最小+张数
if (minPackQtyEnable == true && cretePageCountEnable == true) { if (minPackQtyEnable == true && cretePageCountEnable == true) {
minPackAndcretePageCount(); minPackAndcretePageCount();
@ -454,6 +402,12 @@
//辅计量数量改变事件 //辅计量数量改变事件
function Amount_Change() { function Amount_Change() {
var Amount = $("#Amount").val() * 1;//辅计量数量
Amount = Amount.toFixed(6);
if (Amount <= 0) {
$.modalAlertNew("WMS00102");
return false;
}
//辅+张数 //辅+张数
if (AmountEnable == true && cretePageCountEnable == true) { if (AmountEnable == true && cretePageCountEnable == true) {
AmountAndcretePageCount(); AmountAndcretePageCount();
@ -466,6 +420,13 @@
//生成张数改变事件 //生成张数改变事件
function cretePageCount_Change() { function cretePageCount_Change() {
var cretePageCount = $("#cretePageCount").val() * 1;//张数
cretePageCount = cretePageCount.toFixed(6);
if (cretePageCount <= 0) {
$.modalAlertNew("WMS00102");
return false;
}
//张数+本 //张数+本
if (thisCreateQtyEnable == true && cretePageCountEnable == true) { if (thisCreateQtyEnable == true && cretePageCountEnable == true) {
thisCreateAndcretePageCount(); thisCreateAndcretePageCount();
@ -500,14 +461,14 @@
var YAmount = $("#YAmount").val() * 1;//单据辅计量数量 var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
var InvProportion= $("#InvProportion").val();//转换率 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; //InvProportion = 2;
var thisCreateQty = Amount * InvProportion; var thisCreateQty = Amount * InvProportion;
@ -533,14 +494,14 @@
cretePageCount = cretePageCount.toFixed(6); cretePageCount = cretePageCount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量 var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").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; var thisCreateQty = minPackQty * cretePageCount;
$("#thisCreateQty").val(thisCreateQty); $("#thisCreateQty").val(thisCreateQty);
var Ratio = 0; var Ratio = 0;
@ -563,10 +524,10 @@
Amount = Amount.toFixed(6); Amount = Amount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量 var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").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); var minPackQty = Amount / (YAmount / Quantity);
if (parseInt(Math.ceil(thisCreateQty * 10000)) % parseInt(Math.ceil(minPackQty * 10000)) != 0) { if (parseInt(Math.ceil(thisCreateQty * 10000)) % parseInt(Math.ceil(minPackQty * 10000)) != 0) {
createPageCount = parseInt(thisCreateQty / minPackQty) + 1; createPageCount = parseInt(thisCreateQty / minPackQty) + 1;
@ -594,10 +555,10 @@
cretePageCount = cretePageCount.toFixed(6); cretePageCount = cretePageCount.toFixed(6);
var Quantity = $("#AbsolveQty").val() * 1;//数量 var Quantity = $("#AbsolveQty").val() * 1;//数量
var YAmount = $("#YAmount").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;//最小包装量 var minPackQty = thisCreateQty / cretePageCount;//最小包装量
minPackQty = minPackQty.toFixed(6); minPackQty = minPackQty.toFixed(6);
$("#minPackQty").val(minPackQty); $("#minPackQty").val(minPackQty);

9
WMS-BS/NFine.Web/Configs/database.config
View File

@ -3,12 +3,11 @@
<!--88--> <!--88-->
<!--<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYvS4Yqtyk7MQQCyVSuOZkLhiiLi6XWtVy0yOKqlaakY5+nw0bF4ghhJzmIBkiFvhy+VAE+zZUBPjX0FvxafzRYQ=" providerName="System.Data.SqlClient" />--> <!--<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYvS4Yqtyk7MQQCyVSuOZkLhiiLi6XWtVy0yOKqlaakY5+nw0bF4ghhJzmIBkiFvhy+VAE+zZUBPjX0FvxafzRYQ=" providerName="System.Data.SqlClient" />-->
<!--<add name="connstr" connectionString="H4gf5pjlgIc6Op4X9b1E+skv3XXOgjieGuu++dXWza+I8kZJd/LnHfFDsF606DEhWQr2xQvy5+mk1pz1ZY9D1SKkLcA59hAN" providerName="System.Data.SqlClient" />--> <!--<add name="connstr" connectionString="H4gf5pjlgIc6Op4X9b1E+skv3XXOgjieGuu++dXWza+I8kZJd/LnHfFDsF606DEhWQr2xQvy5+mk1pz1ZY9D1SKkLcA59hAN" providerName="System.Data.SqlClient" />-->
<!--奥美201-->
<!--<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />-->
<!--奥美155--> <!--奥美155-->
<!--<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />
<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />
<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />
<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />-->
<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYoHgif5xJ5xoWc2SUmkcWhArfylP3Gae6hO2gepNTABL8bY5wxvaTCgLs5KoTSWUuplk4qyRDRcZbhTRQE4KW3I=" providerName="System.Data.SqlClient" />
<add name="connstr" connectionString="QY3xOGKaqLBbFNmPk/L8LRZweike0Eu3DXu6r1enMLcprlvSTVaHMtCwzmjhCu3ruT6hrWJtw9NmljjokAWAQj+FLfnZMAi+HmnWrKQnUlM=" providerName="System.Data.SqlClient" />
<add name="ERPconnstr" connectionString="Server=192.168.1.88;Initial Catalog=BFU9_Test;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" /> <add name="ERPconnstr" connectionString="Server=192.168.1.88;Initial Catalog=BFU9_Test;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
<add name="ATVERPconnstr" connectionString="Server=10.29.2.71;Initial Catalog=ATW-0717;User ID=sa;Password=atw.erp" providerName="System.Data.SqlClient" /> <add name="ATVERPconnstr" connectionString="Server=10.29.2.71;Initial Catalog=ATW-0717;User ID=sa;Password=atw.erp" providerName="System.Data.SqlClient" />

Write Preview
Loading…
Cancel
Save