Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Operation.java

@@ -82,6 +82,11 @@ public enum Operation {
      */
     TURNPRODOUT("msg.turnProdIO","msg.turnSuccess"),
 
+    /**
+     * 销售转采购
+     */
+    TURNPURCHASE("msg.turnPurchase","msg.turnSuccess"),
+
     /**
      * 转销售验退单
      */

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -597,6 +597,8 @@ public class SaleServiceImpl implements SaleService{
         baseDTO.setCode(result);
         baseDTO.setId(Long.valueOf(String.valueOf(purchaseId)));
         baseDTO.setName(BillCodeSeq.PURCHASE.getName());
+
+        messageLogService.customizeLog(baseDTO, Operation.TURNPURCHASE);
         return baseDTO;
     }
 

frontend/saas-web/app/view/core/form/RemoteCombo.js

@@ -32,7 +32,6 @@ Ext.define('saas.view.core.form.RemoteCombo', {
        me.store=store;
     },
     createPicker: function() {
-        debugger
         var me = this,
             picker;
         var count = this.store.getCount();