Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -136,6 +136,7 @@ class DeliverybillCtl extends CtlBase {
       try {
       try {
         var rs = await this.service.findInfoByDeliverCode(pobj);
         var rs = await this.service.findInfoByDeliverCode(pobj);
         var ms = await this.materialService.findInfoByDeliverNumber(pobj);
         var ms = await this.materialService.findInfoByDeliverNumber(pobj);
+        console.log("ms___________________________" + JSON.stringify(ms));
         var rarr = {
         var rarr = {
           "baseInfo": {},
           "baseInfo": {},
           "contactsInfo": {},
           "contactsInfo": {},
@@ -260,7 +261,7 @@ class DeliverybillCtl extends CtlBase {
             }
             }
 
 
             if (position_t_info.positionData && position_t_info.positionData.length > 0) {
             if (position_t_info.positionData && position_t_info.positionData.length > 0) {
-              for (var i = 0; i < pobj.positionInfo.positionData.length; i++) {
+              for (var i = 0; i < position_t_info.positionData.length; i++) {
                 if (position_t_info.positionData[i].fixedPhone && position_t_info.positionData[i].fixedPhone != 'undefined') {
                 if (position_t_info.positionData[i].fixedPhone && position_t_info.positionData[i].fixedPhone != 'undefined') {
                   position_t_info.positionData[i].fixedPhone = system.decryptStr(position_t_info.positionData[i].fixedPhone);
                   position_t_info.positionData[i].fixedPhone = system.decryptStr(position_t_info.positionData[i].fixedPhone);
                 }
                 }