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/exception/BizExceptionCode.java

@@ -44,7 +44,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     SALEOUT_ALL_TURNIN(72003, "该出货单已全部转退货,无法转销售退货单"),
     SALEOUT_POSTSTATUS_ERROR(72004,"当前单据状态无法进行此操作。"),
     SALEOUT_POST_ERROR(72005,""),
-    SALEOUT_UNAUDIT_ERROR(72006,"销售订单已出货,无法反审核"),
+    SALEOUT_UNAUDIT_ERROR(72006,"销售订单已转出货单,无法反审核"),
     //资金
 
     //库存

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

@@ -480,9 +480,6 @@ public class SaleServiceImpl implements SaleService{
             saledetailMapper.updateByPrimaryKeySelective(saleDetail);
 
         }
-        //更新主表入库状态
-        sale.setSa_sendstatus(Status.TURNOUT.getDisplay());
-        sale.setSa_sendstatuscode(Status.TURNOUT.name());
         //更新存在字段
         saleMapper.updateByPrimaryKeySelective(sale);
         prodIODetailMapper.updatePDSaleOut(pi_id);

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -210,7 +210,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
         var me = this;
         var form = this.getView();
         warnMsg('确定删除该单据吗?', function(btn){
-			if(btn == 'yes'){
+			if(btn == '是'){
                 var viewModel = me.getViewModel();
                 var id = viewModel.get(form._idField);
                 var code = viewModel.get(form._codeField);