销售出库单去除账户余额判断

src/custom/beans/accountbalance/Accountbalance.java

@@ -255,7 +255,7 @@ public class Accountbalance extends BaseClass {
             } else {
                 BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance")).add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
                 if ((cashbillEntity.getAmount().add(cashbillEntity.getDiscountamountamount())).compareTo(canuseamount) == 1 && (cashbillEntity.getAmount().add(cashbillEntity.getDiscountamountamount())).compareTo(BigDecimal.ZERO)>=0) {
-                    throw new YosException(false, "该营销账户可用余额不足，支出凭证无法审核");
+                    //throw new YosException(false, "该营销账户可用余额不足，支出凭证无法审核");
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());
                 BigDecimal newdiscountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(cashbillEntity.getDiscountamountamount());

src/custom/restcontroller/sale/order/Order.java

@@ -122,7 +122,7 @@ public class Order extends Controller {
     //查询订单列表(经销商)
     public QuerySQL queryList(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks","rec_contactsid","checkdate","closedate","contact");
+                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks","rec_contactsid","checkdate","closedate","invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
                 "brandname");

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -400,8 +400,8 @@ public class aftersalesmag extends Controller {
                             + "' and sa_aftersalesmagid='" + sa_aftersalesmagid + "'");
 
             if (RowsStatus.isNotEmpty()) {
-                if (!RowsStatus.get(0).getString("status").equals("新建")) {
-                    batchDeleteErr.addErr(sa_aftersalesmagid, "非新建状态的返退单无法删除");
+                if (!RowsStatus.get(0).getString("status").equals("新建") || !RowsStatus.get(0).getString("status").equals("已撤回")) {
+                    batchDeleteErr.addErr(sa_aftersalesmagid, "非新建或已撤回状态的返退单无法删除");
                     continue;
                 }
             }

src/custom/restcontroller/webmanage/sale/toolscode/ExportExcel.java

@@ -4,10 +4,7 @@ package restcontroller.webmanage.sale.toolscode;
 import java.awt.Color;
 
 import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
@@ -158,6 +155,12 @@ public class ExportExcel {
         cellStyle2.setBorderRight(BorderStyle.THIN);//右边框
         cellStyle2.setWrapText(true);
 
+        DataFormat format = workbook.createDataFormat();
+        cellStyle1.setDataFormat(format.getFormat("@"));
+        cellStyle2.setDataFormat(format.getFormat("@"));
+        cellStyle3.setDataFormat(format.getFormat("@"));
+        cellStyle4.setDataFormat(format.getFormat("@"));
+
    	 /*第一行*/
        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 1));
 

src/custom/restcontroller/webmanage/sale/u8prodprice/ExportExcel.java

@@ -1,14 +1,12 @@
 package restcontroller.webmanage.sale.u8prodprice;
 
 
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 
 import java.awt.*;
+import java.awt.Color;
 
 public class ExportExcel {
     /**
@@ -146,6 +144,11 @@ public class ExportExcel {
         cellStyle2.setBorderTop(BorderStyle.THIN);//上边框
         cellStyle2.setBorderRight(BorderStyle.THIN);//右边框
         cellStyle2.setWrapText(true);
+        DataFormat format = xssfFWorkbook.createDataFormat();
+        cellStyle1.setDataFormat(format.getFormat("@"));
+        cellStyle2.setDataFormat(format.getFormat("@"));
+        cellStyle3.setDataFormat(format.getFormat("@"));
+        cellStyle4.setDataFormat(format.getFormat("@"));
         cellStyle1.setDataFormat(xssfFWorkbook.createDataFormat().getFormat("TEXT"));
         cellStyle2.setDataFormat(xssfFWorkbook.createDataFormat().getFormat("TEXT"));
         cellStyle3.setDataFormat(xssfFWorkbook.createDataFormat().getFormat("TEXT"));