Merge branch 'master' of ssh://10.10.101.21/source/platform-b2b into dev

src/main/java/com/uas/platform/b2b/task/SendNoticeTask.java

@@ -6,6 +6,7 @@ import com.uas.platform.b2b.dao.PurchaseOrderDao;
 import com.uas.platform.b2b.model.CommunalLog;
 import com.uas.platform.core.util.HttpUtil;
 import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -40,6 +41,8 @@ public class SendNoticeTask {
     @Autowired
     PurchaseOrderDao purchaseOrderDao;
 
+    private static final Logger logger = Logger.getLogger(SendNoticeTask.class);
+
     /**
      * 时间格式
      */
@@ -107,6 +110,7 @@ public class SendNoticeTask {
             HttpUtil.Response response = HttpUtil.sendGetRequest(searchInfoUrl + id, null);
             if (StringUtils.isEmpty(response.getResponseText())) {
                 noExistIds.add(id);
+                logger.error(String.format("表"+tableName+"未建索引","id为"+id));
             }
         }
         if (!CollectionUtils.isEmpty(noExistIds)) {
@@ -120,8 +124,6 @@ public class SendNoticeTask {
                 };
                 request.addHeader("Authorization", "Basic YWRtaW46c2VsZWN0MTExKioq");
                 request.setURI(URI.create(searchUpdateUrl + noExistId));
-                HttpUtil.Response response = HttpUtil.sendHttpUriRequest(request);
-                System.out.println(noExistId + " " + response.getResponseText());
             }
         }
     }

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -354,6 +354,13 @@
                             <div >
                             	<a ng-click="viewApprove(order.salecode, order.deputyuu)">审批流程</a>
                             </div>
+                            <span ng-if="order.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
+                            <span ng-if="!order.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #CA3955">未打印</span>
+                            <div class="operates">
+                                <a ng-click="print(order)" title="打印{{order.print? '(已打印)':'(未打印)'}}" ng-class="{'unPrinted' : !order.print, 'text-muted': order.print}">
+                                    <i class="fa fa-print fa-lg"></i>
+                                </a>
+                            </div>
                         </div>
                         <div class="col-md-12" ng-if="order.remark != null && order.statuscode == 222">订单反馈：<span class="text-inverse" ng-bind="order.remark"></span></div>
                     </td>