Skip to content

Commit

Permalink
salesNs
Browse files Browse the repository at this point in the history
  • Loading branch information
@2hangying
2hangying committed Feb 6, 2017
1 parent f1bdeda commit 9acec9b
Show file tree
Hide file tree
Showing 2 changed files with 256 additions and 17 deletions.
77 changes: 60 additions & 17 deletions testcase/sales/salesNoColorSize.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,10 @@ function setNoColorSize_1Params() {
o = { "新值" : "0", "数值" : [ "按门店获取客户上次价" ] };
ret = isAnd(ret, setGlobalParam(qo, o));

qo = { "备注" : "按订货开单的销售单是否允许修改" };
o = { "新值" : "0", "数值" : [ "允许修改,同时更新订单状态", "in" ] };
ret = isAnd(ret, setGlobalParam(qo, o));

// qo = { "备注" : "按明细" };
// o = { "新值" : "1", "数值" : [ "显示与第1个价格的差额", "in" ] };
// ret = isAnd(ret, setGlobalParam(qo, o));
Expand Down Expand Up @@ -12421,7 +12425,7 @@ function test170731() {
var f1 = new TField("接收店", TF_SC, 1, "中洲店");
var fields = [ f0, f1 ];
setTFieldsValue(window, fields);
json = { "明细" : [ { "货品" : "3035", "数量" : r } ] };
json = { "明细" : [ { "货品" : "k300", "数量" : r } ] };
editSalesBillNoColorSize(json);

tapMenu("门店调出", "按批次查");
Expand All @@ -12430,12 +12434,12 @@ function test170731() {
tapFirstText();
qr1 = getQRDet();
tapReturn();
var ret3 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isEqual("3035,jkk",
qr1.data[0]["货品"]), isAqualNum(r, qr1.data[0]["数量"]));
var ret3 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isIn(qr1.data[0]["货品"],
"k300"), isAqualNum(r, qr1.data[0]["数量"]));

r = "1." + getRandomInt(100);
tapMenu("销售订货", "新增订货+");
var json = { "客户" : "ls", "明细" : [ { "货品" : "8989", "数量" : r } ],
var json = { "客户" : "ls", "明细" : [ { "货品" : "k300", "数量" : r } ],
"特殊货品" : { "抹零" : 2.7, "打包费" : 7.8 } };
editSalesBillNoColorSize(json);

Expand All @@ -12445,11 +12449,10 @@ function test170731() {
tapFirstText();
qr1 = getQRDet();
tapReturn();
var ret4 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isEqual("8989,我们",
qr1.data[0]["货品"]), isAqualNum(r, qr1.data[0]["数量"]), isEqual(
"00000,抹零", qr1.data[1]["货品"]), isAqualNum(2.7, qr1.data[1]["单价"]),
isEqual("00001,打包费", qr1.data[2]["货品"]), isAqualNum(7.8,
qr1.data[2]["单价"]));
var ret4 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isIn(qr1.data[0]["货品"],
"k300"), isAqualNum(r, qr1.data[0]["数量"]), isEqual("00000,抹零",
qr1.data[1]["货品"]), isAqualNum(2.7, qr1.data[1]["单价"]), isEqual(
"00001,打包费", qr1.data[2]["货品"]), isAqualNum(7.8, qr1.data[2]["单价"]));

tapMenu("销售开单", "按订货开单");
query();
Expand All @@ -12469,7 +12472,7 @@ function test170731() {

r = "1." + getRandomInt(100);
tapMenu("销售开单", "开 单+");
var json = { "客户" : "ls", "明细" : [ { "货品" : "3035", "数量" : r } ],
var json = { "客户" : "ls", "明细" : [ { "货品" : "k300", "数量" : r } ],
"特殊货品" : { "抹零" : 1.9, "打包费" : 3.5 } };
editSalesBillNoColorSize(json);

Expand All @@ -12479,11 +12482,10 @@ function test170731() {
tapFirstText();
qr1 = getQRDet();
tapReturn();
var ret6 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isEqual("3035,jkk",
qr1.data[0]["货品"]), isAqualNum(r, qr1.data[0]["数量"]), isEqual(
"00000,抹零", qr1.data[1]["货品"]), isAqualNum(1.9, qr1.data[1]["单价"]),
isEqual("00001,打包费", qr1.data[2]["货品"]), isAqualNum(3.5,
qr1.data[2]["单价"]));
var ret6 = isAnd(isAqualNum(r, qr.data[0]["数量"]), isIn(qr1.data[0]["货品"],
"k300"), isAqualNum(r, qr1.data[0]["数量"]), isEqual("00000,抹零",
qr1.data[1]["货品"]), isAqualNum(1.9, qr1.data[1]["单价"]), isEqual(
"00001,打包费", qr1.data[2]["货品"]), isAqualNum(3.5, qr1.data[2]["单价"]));

r = "1." + getRandomInt(100);
tapMenu("盘点管理", "新增盘点+");
Expand All @@ -12499,10 +12501,51 @@ function test170731() {
qr2.data[0]["货品"]), isAqualNum(r, qr2.data[0]["数量"]));
tapReturn();

// 采购入库单,采购订货单,销售订货单,销售单,门店调出单,单据修改时不提示款号已停用
tapMenu("货品管理", "货品查询");
var Keys = [ "款号名称" ];
var Fields = queryGoodsFields(Keys);
changeTFieldValue(Fields["款号名称"], "k300");
query(Fields);
tapFirstText();
tapButtonAndAlert("停 用", OK);
tapPrompt();

var menu = { "采购入库" : "按批次查", "采购订货" : "按批次查", "销售订货" : "按批次查",
"销售开单" : "按批次查", "门店调出" : "按批次查" };
for ( var menu1 in menu) {
tapMenu(menu1, menu[menu1]);
query();
tapFirstText();
var t = randomWord(false, 6);
var o = [ { "备注" : [ t ] } ];
editChangeSalesBillOrderRemarks(o, "no");
saveAndAlertOk();
tapPrompt();
var ret8 = isAnd(!isIn(alertMsg, "款号已停用"));
tapReturn();

tapMenu(menu1, menu[menu1]);
query();
tapFirstText();
var qr2 = getQRDet();
tapReturn();
ret8 = isAnd(ret8, isEqual(t, qr2.data[0]["备注"]));
}

tapMenu("货品管理", "货品查询");
tapButton(window, CLEAR);
var Keys = { "款号名称" : "k300", "是否停用" : "是" };
var Fields = queryGoodsFields(Keys);
query(Fields);
tapFirstText();
tapButtonAndAlert("启 用", OK);
tapPrompt();

logDebug(" ret=" + ret + ", ret1=" + ret1 + ", ret2=" + ret2 + ", ret3="
+ ret3 + ", ret4=" + ret4 + ", ret5=" + ret5 + ", ret6=" + ret6
+ ", ret7=" + ret7);
return ret && ret1 && ret2 && ret3 && ret4 && ret5 && ret6 && ret7;
+ ", ret7=" + ret7 + ", ret8=" + ret8);
return ret && ret1 && ret2 && ret3 && ret4 && ret5 && ret6 && ret7 && ret8;
}
function test170732() {
// 全局参数：非总经理开单时是否允许修改折扣：默认不允许，开单模式：客户折扣、产品折扣、童装+产品折扣，产品折扣+代收
Expand Down
196 changes: 196 additions & 0 deletions testcase/sales/salesNoColorSizeElse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ function testSalesNoColorSizeElseAll_2() {
run("【销售开单－按订货开单】键盘检查", "test170259");
run("【销售开单-物流核销】核销明细，查询之后 顶部显示为0", "test170739");
run("【销售开单-收款】跨门店收款", "test170740");
run("【销售开单-按汇总-客户对账单-打印】打印", "test170763");
run("【销售开单-开单】按订货开单的销售单允许修改，同时更新订单状态", "test170764");
run("【销售开单-开单】按订货开单的销售单不允许修改，必须作废后重新按订货开单", "test170765");
// run("【销售开单】挂单界面打印时提示检查", "test170400");//打印按钮灰化，无法点击
// run("【销售开单】挂单界面打印时提示检查", "test170400_2");//打印按钮灰化，无法点击
// run("【销售开单-核销】物流单核销-特殊货品", "test170569");//加到170288
Expand Down Expand Up @@ -10595,4 +10598,197 @@ function test170740() {
isEqual("仓库店", qr.data[0]["门店"]));

return ret;
}
function test170763() {
tapMenu("销售开单", "按汇总", "客户对账单");
tapButton(window, PRINT);
var btn = [ "打印预览(按批次)", "打印预览(按明细)" ];
for (var j = 0; j < btn.length; j++) {
tapButton(window, btn[j]);
tapPrompt();
debugArray(alertMsgs);
var alertMsg1 = getArray1(alertMsgs, -1);
var ret = isAnd(isIn(alertMsg1, "打印预览时请到查询界面选择客户和门店"));
}
tapNaviLeftButton();

logDebug(" ret=" + ret);
return ret;
}
function test170764() {
var qo, o, ret = true;
qo = { "备注" : "按订货开单的销售单是否允许修改" };
o = { "新值" : "0", "数值" : [ "允许修改,同时更新订单状态", "in" ] };
ret = isAnd(ret, setGlobalParam(qo, o));

tapMenu("销售订货", "新增订货+");
var json = { "客户" : "ls", "明细" : [ { "货品" : "3035", "数量" : 20 } ] };
editSalesBillNoColorSize(json);

tapMenu("销售开单", "按订货开单");
query();
tapFirstText();
json = editSalesBillSave({});

tapMenu("销售开单", "按订货开单");
query();
var qr = getQR();
var batch = qr.data[0]["批次"];
var a = qr.data[0]["发货状态"];

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 10 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售开单", "按订货开单");
query();
var qr2 = getQR();
var b = qr2.data[0]["发货状态"];
var batch1 = qr.data[0]["批次"];
var ret1 = isAnd(isEqual("全部发货", a), isEqual("部分发货", b), isEqual(batch,
batch1), isEqual(20, qr2.data[0]["订货数"]), isEqual(10,
qr2.data[0]["已发数"]), isEqual(10, qr2.data[0]["差异数"]));

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 20 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售开单", "按订货开单");
query();
qr2 = getQR();
var c = qr2.data[0]["发货状态"];
var batch2 = qr.data[0]["批次"];
var ret2 = isAnd(isEqual("部分发货", b), isEqual("全部发货", c), isEqual(batch1,
batch2), isEqual(20, qr2.data[0]["订货数"]), isEqual(20,
qr2.data[0]["已发数"]), isEqual(0, qr2.data[0]["差异数"]));

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 0 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售开单", "按订货开单");
query();
qr2 = getQR();
var d = qr2.data[0]["发货状态"];
var batch3 = qr.data[0]["批次"];
var ret3 = isAnd(isEqual("全部发货", c), isEqual("未发货", d), isEqual(batch3,
batch2), isEqual(20, qr2.data[0]["订货数"]), isEqual(0,
qr2.data[0]["已发数"]), isEqual(20, qr2.data[0]["差异数"]));

tapMenu("销售开单", "按订货开单");
query();
tapFirstText();
var o = [ { "数量" : [ 10 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 30 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售开单", "按订货开单");
query();
qr2 = getQR();
var e = qr2.data[0]["发货状态"];
var batch4 = qr.data[0]["批次"];
var ret4 = isAnd(isEqual("全部发货", e), isEqual(batch3, batch4), isEqual(20,
qr2.data[0]["订货数"]), isEqual(30, qr2.data[0]["已发数"]), isEqual(-10,
qr2.data[0]["差异数"]));

tapMenu("销售开单", "按批次查");
query();
var batch7 = qr.data[0]["批次"];
tapFirstText();
tapButtonAndAlert("作 废", OK);

tapMenu("销售开单", "按订货开单");
query();
qr2 = getQR();
var f = qr2.data[0]["发货状态"];
var batch5 = qr.data[0]["批次"];
var ret5 = isAnd(isEqual("未发货", f), isEqual(batch5, batch4), isEqual(20,
qr2.data[0]["订货数"]), isEqual(0, qr2.data[0]["已发数"]), isEqual(20,
qr2.data[0]["差异数"]));

tapMenu("销售开单", "按订货开单");
query();
tapFirstText();
var o = [ { "数量" : [ 10 ] } ];
editChangeSalesBillOrderNum(o);

tapMenu("销售订货", "按批次查");
tapFirstText();
runAndAlert("test170262End", OK);
tapPrompt();
// 销售订货-按批次查界面检查订单状态在test170262

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 30 ] } ];
editChangeSalesBillOrderNum(o);
tapMenu("销售开单", "按批次查");
query();
qr2 = getQR();
var batch6 = qr.data[0]["批次"];
var ret6 = isAnd(isEqual(batch7, batch6), isEqual(30, qr2.data[0]["数量"]));

logDebug(" ret=" + ret + ", ret1=" + ret1 + ", ret2=" + ret2 + ", ret3="
+ ret3 + ", ret4=" + ret4 + ", ret5=" + ret5 + ", ret6=" + ret6);
return ret && ret1 && ret2 && ret3 && ret4 && ret5 && ret6;
}
function test170765() {
var qo, o, ret = true;
qo = { "备注" : "按订货开单的销售单是否允许修改" };
o = { "新值" : "1", "数值" : [ "不允许修改,必须作废后重新按订货开单", "in" ] };
ret = isAnd(ret, setGlobalParam(qo, o));

tapMenu("销售订货", "新增订货+");
var json = { "客户" : "ls", "明细" : [ { "货品" : "3035", "数量" : 20 } ] };
editSalesBillNoColorSize(json);

tapMenu("销售开单", "按订货开单");
query();
tapFirstText();
json = editSalesBillSave({});

tapMenu("销售开单", "按订货开单");
query();
var qr = getQR();
var batch = qr.data[0]["批次"];
var a = qr.data[0]["发货状态"];

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 10 ] } ];
editChangeSalesBillOrderNum(o);
debugArray(alertMsgs);
var alertMsg2 = getArray1(alertMsgs, -2);
var ret1 = isAnd(isIn(alertMsg2, "按订货开单的销售单是否允许修改\"为\"不允许"));

tapMenu("销售订货", "按批次查");
tapFirstText();
runAndAlert("test170262End", OK);
tapPrompt();
// 销售订货-按批次查界面检查订单状态在test170262

tapMenu("销售开单", "按批次查");
query();
tapFirstText();
var o = [ { "数量" : [ 30 ] } ];
editChangeSalesBillOrderNum(o);
debugArray(alertMsgs);
var alertMsg2 = getArray1(alertMsgs, -2);
var ret2 = isAnd(isIn(alertMsg2, "按订货开单的销售单是否允许修改\"为\"不允许"));

logDebug(" ret=" + ret + ", ret1=" + ret1 + ", ret2=" + ret2);
return ret && ret1 && ret2;
}

0 comments on commit 9acec9b

Please sign in to comment.