improve

jimxim · Feb 17, 2017 · 8c436e5 · 8c436e5
1 parent 25778b1
commit 8c436e5
Show file tree

Hide file tree

Showing 14 changed files with 244 additions and 122 deletions.
diff --git a/all.js b/all.js
@@ -53,6 +53,8 @@
 #import "testcase/salesOrder/salesOrder.js"
 #import "testcase/salesOrder/salesOrderFields.js"
 
+#import "testcase/sensitive/sensitive.js"
+
 #import "testcase/shopIn/shopIn.js"
 #import "testcase/shopIn/shopInFields.js"
 

diff --git a/lib/sales.js b/lib/sales.js
@@ -3,6 +3,7 @@
 var colorSize = "no";
 /**
  * 新增开单，无颜色尺码 核销5是指核销界面上按钮下标，多选是个按钮
+ * 
  * @param o 输入对象，eg: { "客户" : "zhhz1", "店员" : "005", "发货" : "仓库店","日期" :
  *            "2015-10-01", "价格":"打包价","明细" : [ { "货品" : "k300", "数量" : 5,"备注" :
  *            "xx" } ], "核销" : [ 5 ]，"特殊货品" : { "抹零" : 9, "打包费" : 10 } , "现金" :
@@ -16,6 +17,7 @@ function editSalesBillNoColorSize(o) {
 }
 /**
  * 新增开单，颜色尺码
+ * 
  * @param o 主要明细不同，其它同非颜色尺码，eg: { "明细" : [ { "货品" : "14L595", "数量" : [ 5, 6, 7 ] }, {
  *            "货品" : "150921", "数量" : [ 1, 2, 3 ] } ],"关闭明细":"no" };
  */
@@ -24,6 +26,7 @@ function editSalesBillColorSize(o) {
 }
 /**
  * 新增开单，尺码头部
+ * 
  * @param o 主要明细不同，其它同非颜色尺码，eg: { "明细" : [ { "货品" : "141229000", "颜色" : "灰色",
  *            "尺码" : { "S2" : 2, "S3" : 3 } } ] };
  */
@@ -32,6 +35,7 @@ function editSalesBillSizehead(o) {
 }
 /**
  * 具体实现
+ * 
  * @param o
  * @param colorSize
  * @returns
@@ -82,6 +86,7 @@ function editSalesBill(o, colorSize) {
 }
 /**
  * 无颜色尺码明细
+ * 
  * @param o
  */
 function editSalesBillDetNoColorSize(o) {
@@ -148,6 +153,7 @@ function editSalesBillDetNoColorSize(o) {
 
 /**
  * 颜色尺码明细
+ * 
  * @param o
  */
 function editSalesBillDetColorSize(o) {
@@ -214,6 +220,7 @@ function editSalesBillDetColorSize(o) {
 /**
  * 尺码表头明细 { "明细" : [ { "货品" : "141229000", "颜色" : "灰色", "尺码" : { "S2" : 2, "S3" :
  * 3 } }, { "货品" : "141229000", "颜色" : "黑色", "尺码" : { "S1" : 1 } } ] };
+ * 
  * @param o
  */
 function editSalesBillDetSizehead(o) {
@@ -225,7 +232,7 @@ function editSalesBillDetSizehead(o) {
     var view1 = getScrollView(-1);
     var texts = getStaticTexts(view1);
     // 尺码头部下显示库存 文本框下标与标题不对应，根据相应X轴重新取值
-    var tfidx = getDetSizheadTFIndex(titles);
+//    var tfidx = getDetSizheadTFIndex(titles);
     var tfNum = tfidx["明细输入框个数"];// 不能用标题个数判断
 
     for (var i = 0; i < details.length; i++) {
@@ -247,7 +254,8 @@ function editSalesBillDetSizehead(o) {
         var sizeObj = d["尺码"];
         for ( var j in sizeObj) {
             var cm = sizeObj[j];
-            colIndex = tfidx[j];
+            // colIndex = tfidx[j];
+            colIndex = titles[j];
             f = new TField(j, TF, start + colIndex, cm);
             fields.push(f);
         }
@@ -310,6 +318,7 @@ function editSalesBillCustomer(o) {
 
 /**
  * 简单字段输入
+ * 
  * @param o
  * @param key
  */
@@ -470,6 +479,7 @@ function editSalesBillGetValue() {
 }
 /**
  * 获取开单界面值
+ * 
  * @returns
  */
 function getSalesBillValueByLabel() {
@@ -531,6 +541,7 @@ function editSalesBillSave(o) {
 
 /**
  * 开单界面新增客户 eg:o={"名称":"小王","手机":"1234","店员":"000","适用价格":"零批价","地址":"a"};
+ * 
  * @param o
  */
 function editSalesBillAddCustomer(o) {
@@ -575,6 +586,7 @@ function editSalesBillAddCustomer(o) {
 }
 /**
  * 开单界面，新增货品 颜色尺码模式不会自动添加到单据，开单细节不同，因此暂时不放到editSalesBill中
+ * 
  * @param o
  *            eg：{"款号":"kh","名称":"名称","进货价":120,"零批价":130,"打包价":140,"大客户价":150,"Vip价格":160,
  *            "添加到单据":"否"}
@@ -635,13 +647,15 @@ function editSalesBillAddGoods(o) {
 }
 /**
  * 刷卡
+ * 
  * @param o eg:{"刷卡":[100]} 或 {"刷卡":[100,"交"]}
  */
 function editSalesBillCard(o) {
     editSalesBillBank(o, "刷卡", 0);
 }
 /**
  * 汇款
+ * 
  * @param o eg:{"汇款":[100]} 或 {"汇款":[100,"交"]}
  */
 function editSalesBillRemit(o) {
@@ -690,6 +704,7 @@ function editSalesBillUnpay(o) {
 
 /**
  * 代收,模式2会返回代收金额
+ * 
  * @param o eg: {"代收":"是"} 或者 {"代收":{"物流商":"yt","运单号":"123","备注":"a","代收金额":90}}
  */
 function editSalesBillAgency(o) {
@@ -752,6 +767,7 @@ function editSalesBillAgency2(obj) {
 
 /**
  * 开单明细，点击款号TableView的cell
+ * 
  * @param o eg: { "明细" : [ { "货品" : "30", "表格行包含" : "绿茶"} ]}
  * @returns
  */
@@ -781,6 +797,7 @@ function editSalesBillDetTapCell(o, colorSize) {
 
 /**
  * 颜色尺码库存数,只能根据坐标来判断属于哪个尺码，哪个颜色
+ * 
  * @returns {"花色-27-常青店":-3,... } 如果只显示本门店的，key中不带本店，eg:{"花色-27":-3,... }
  */
 function getColorSizeStockNum() {
@@ -846,6 +863,7 @@ function getColorSizeStockNum() {
 }
 /**
  * 如果不指定输入框个数，自动判断个数
+ * 
  * @param o
  * @returns {Number} 明细输入框个数
  */
@@ -880,63 +898,66 @@ function getSalesBillDetTfNum(o, idx) {
 }
 /**
  * 尺码表头模式 获取明细输入框个数，标题列号，从0开始
+ * 
  * @params order 寻找顺序
  * @returns {"明细输入框个数":10,"货品":0,"颜色":1,"T9":2,"S1":2,...}
  */
 function getDetSizheadTitle(order) {
     // debugElementTree(window);
     // 标题以#开头，表示序号，以操作结束
-    var texts = getStaticTexts(window), ignore = 1;
+    var ret = {}, colX = {}, temp = {}, colIndex = -1;
+    var texts = getStaticTexts(window);
     var qrTitle1 = getSalesBillDetTitle1Index(texts, order);// 起始标题 # 图
     var qrTitle2 = getQResultTitle(texts, "操作", "#", order);// 结束标题 操作
-    var ret = {}, temp = {}, colX = {}, colIndex = -1, i;
-    // 对应输入框的标题，货品，颜色，尺码...,单价，小计
-    for (i = qrTitle1.index + 1; i < qrTitle2.index; i++) {
-        colIndex++;
-        var width = texts[i].rect().size.width;
-        if (width > 5) {
-            var title = texts[i].name();
-            // logDebug("i=" + i + " title=" + title + " colIndex=" + colIndex);
+    for (var j = qrTitle1.index + 1; j < qrTitle2.index; j++) {
+        var width = texts[j].rect().size.width;
+        if (width > 5) {// 忽略隐藏标题
+            var title = texts[j].name();
             if (!isNull(title) && isDefined(title)) {
-                ret[title] = colIndex;
-            } else {
-                title = "cm" + colIndex;
-                ret[title] = colIndex;
+                colX[title] = getX(texts[j]);
             }
-            temp[title] = colIndex;
-            colX[title] = getX(texts[i]);
-        } else {
-            ignore++;
         }
-
     }
-    ret["明细输入框个数"] = qrTitle2.index - qrTitle1.index - ignore;// 只是有效的输入框个数
-    ret["标题坐标"] = colX;// 尺码表头显示尺码 确定TF对应的标题用，其他都是下标对应的关系
-    // debugObject(colX,"colX");
-    // debugObject(temp,"temp");
-    // 其它尺码加入标题
-    for (i = qrTitle2.index + 1; i < texts.length; i++) {
-        var y = getY(texts[i]);
-        if (y > 300) {
-            break;// 排除底下的静态文本
+
+    var headView = getScrollView(-2);// -2尺码表头 -1单据明细
+    var headTexts = getStaticTexts(headView);
+    var len = headTexts.length;
+    // 获取第一行尺码组
+    var x = 0, xPre = 0
+    for (var i = 0; i < len; i++) {
+        var x = getX(headTexts[i]);
+        if (xPre > 0 && xPre > x) {
+            break;
         }
-        var x = texts[i].rect().origin.x;
-        var size = texts[i].name();
-        var t = getKeyByXy(colX, x);
-        // logDebug("x=" + x + " size=" + size + " t=" + t);
-        if (!isNull(t) && isDefined(t) && !isNull(size) && isDefined(size)) {
-            ret[size] = temp[t];
-        } else {
-            // logInfo("忽略 size=" + size + " t=" + t);
+        colIndex++;// 尺码下标
+        var title = headTexts[i].name();
+        if (isNull(title) || isUndefined(title)) {
+            title = "cm" + colIndex;
         }
-
+        colX[title] = x;
+        xPre = x;
     }
+    ret = getDetSizheadTFIndex(colX);// 根据TF的X轴取下标，兼容是否显示库存
+    ret["标题坐标"] = colX;// 尺码表头显示尺码 确定TF对应的标题用，其他都是下标对应的关系
+
+    // 其它尺码加入标题，取前4组尺码 其他的尺码组未维护，取出来没用
+//    for (var ii = colIndex + 1, len = 4 * (colIndex + 1); ii < len; ii++) {
+//        var x = getX(headTexts[ii]);
+//        var size = texts[ii].name();
+//        for ( var t in colX) {
+//            if (colX[t] == x) {
+//                ret[size] = temp[t]; // 根据X轴取标题 过滤掉隐藏的内容
+//                break;
+//            }
+//        }
+//    }
     debugObject(ret, "ret");
     return ret;
 }
 
 /**
  * 加载挂单
+ * 
  * @param i 下标，从0开始
  */
 function loadHangBill(i) {
@@ -999,6 +1020,7 @@ function testGetColorSizeStockNum1() {
 }
 /**
  * 所有挂单
+ * 
  * @returns {Boolean}
  */
 function testGetAllHangBills() {

diff --git a/suite1.js b/suite1.js
@@ -21,11 +21,10 @@ function test000All() {
  var caseName="测试用例";
 // TITLE_SXE = getTitleSXE();//新综合汇总 列表标题
 // testCheckMenuAll();//菜单检查，跑用例前先跑一遍
-
 // run(caseName, "setSizeHeadParams_1");//
 // testSizeHead001_shop1();
- run(caseName, "onlyTest");
-// run(caseName, "ts100059Color");//
+// run(caseName, "test280001");
+ run(caseName, "onlyTest");//
 }   
 function onlyTest(){
  UIATarget.localTarget().logElementTree();
@@ -41,6 +40,9 @@ function onlyTest(){
 // { "货品" : "agc001", "颜色" : "白色", "尺码" : { "L" : 10, "XL" : 20 } },
 // { "货品" : "agc001", "颜色" : "黑色", "尺码" : { "S" : 30 } } ]};
 // editSalesBill(json, colorSize);
+//       tapMenu("盘点管理", "更多", "未盘点款号");
+//       var tf = getQueryTFields([ "厂商" ]);
+//       debugObject(tf[0]);
 
 // target.captureScreenWithName("test");
    }catch(e){
@@ -53,6 +55,7 @@ function onlyTest(){
  // debugObject(gCache,"gCache");
    return true;
 }
+
 //
 function loginGoodsParams001(){
     var p1 = {"角色":"总经理","帐套":"autotest1"};

diff --git a/testcase/check/checkFields.js b/testcase/check/checkFields.js
@@ -355,53 +355,49 @@ function checkUnCheckCodeField(key, show) {
     switch (key) {
     case "code":
     case "款号":
-        f = new TField("款号", TF_AC, 0, "a", 1, 0);
-        if (show) {
-            f.value = "5880,kha,210元";
-        }
+        f = new TField("款号_421", TF_AC, 0, "a", -1, 0);
         break;
     case "name":
     case "款号名称":
-        f = new TField("款号名称", TF, 1, "aaa");
+        f = new TField("款号名称_525", TF, 1, "aaa");
         break;
     case "brand":
     case "品牌":
-        f = new TField("品牌", TF, 2, "Addidas");
+        f = new TField("品牌_156", TF_AC, 2, "Addidas",-1,0);
         if (show) {
             f.type = TF;
-            f.index = 1
         }
         break;
     case "type":
     case "类别":
-        f = new TField("类别", TF_SC, 3, "登山服");
+        f = new TField("类别_221", TF_SC, 3, "登山服");
         break;
     case "provider":
     case "厂商":
-        f = new TField("厂商", TF_AC, 4, "adi", 1, 0);
+        f = new TField("厂商_451", TF_AC, 4, "adi", -1, 0);
         if (show) {
             f.value = "Adida公司";
         }
         break;
     case "shop":
     case "门店":
-        f = new TField("门店", TF, 5, "常青店");
+        f = new TField("门店_436", TF, 5, "常青店",-1,0);//实际为TF_AC
         break;
     case "day1":
     case "日期从":
-        f = new TField("日期从", TF_DT, 6, "2015-9-11");
+        f = new TField("操作日期从_92", TF_DT, 6, getToday());
         break;
     case "day2":
     case "日期到":
-        f = new TField("日期到", TF_DT, 7, getToday());
+        f = new TField("到_93", TF_DT, 7, getToday());
         break;
     case "batch1":
     case "批次从":
-        f = new TField("批次从", TF, 8, "1");
+        f = new TField("批次从_544", TF, 8, "1");
         break;
     case "batch2":
     case "批次到":
-        f = new TField("批次到", TF, 9, "20");
+        f = new TField("到_545", TF, 9, "20");
         break;
     default:
         logWarn("未知key＝" + key);

diff --git a/testcase/goods/goods.js b/testcase/goods/goods.js
@@ -3866,9 +3866,8 @@ function ts100116() {
     editSalesBill(json, colorSize);
 
     tapMenu("货品管理", "当前库存");
-    var keys = { "款号" : code };
-    var fields = queryGoodsStockFields(keys);
-    query(fields);
+    var qKeys = { "款号" : code };
+    conditionQuery(qKeys);
     var qr = getQR();
     var ret = isEqual(1, qr.data[0]["上架天数"]);
 

diff --git a/testcase/goods/goodsFields.js b/testcase/goods/goodsFields.js
@@ -17,9 +17,7 @@ function testQueryGoodsStockFields() {
  * @returns
  */
 function queryGoodsStockFields(keys, show) {
-    if (isUndefined(show)) {
-        show = false;
-    }
+    show = show || false;
     var idx = getValueFromCacheF1("getQueryBtnIndex");// 第一个...按钮下标
     return getTFields("queryGoodsStockField", window, keys, show, idx);
 }