Merge branch 'release' of http://192.168.12.182/invoice/pt into release

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -396,7 +396,11 @@ public class SDNYMainProcessController extends AbstractController {
         if (invoiceLineList != null && invoiceLineList.size() > 0) {
             for (SNInvoiceDetail snInvoiceDetail : invoiceLineList) {
                 SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail();
+
+                //设置id
+                sapInvoiceDetail.setZHID(UUID.randomUUID().toString().replace("-",""));
 //            sapInvoiceDetail.setZZWDJ("");
+
                 sapInvoiceDetail.setIMG_ID(imageId);
                 sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum());
 //            sapInvoiceDetail.setZCJSJ();
@@ -425,9 +429,9 @@ public class SDNYMainProcessController extends AbstractController {
                         sapInvoiceDetail.setZTAX(tax1.toString());
                     }
                 }
-                if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) {
+//                if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) {
-                    info.setZTAX(sapInvoiceDetail.getZTAX());
+//                    info.setZTAX(sapInvoiceDetail.getZTAX());
-                }
+//                }
 //            sapInvoiceDetail.setZHBH("");
                 sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice());
 //            sapInvoiceDetail.setZHID("");
@@ -437,7 +441,7 @@ public class SDNYMainProcessController extends AbstractController {
                 sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit());
                 sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode());
                 sapInvoiceDetail.setZSE(snInvoiceDetail.getTax());
-                sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate());
+                sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity());
                 sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate()));
                 sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
                 if (snInvoice.getInvoiceCode() != null) {
@@ -453,6 +457,11 @@ public class SDNYMainProcessController extends AbstractController {
 
         //获取税率
         String taxRate = snInvoice.getTaxRate();
+        if (taxRate != null && !taxRate.contains("%")){
+            BigDecimal bigDecimal = new BigDecimal(taxRate);
+            BigDecimal multiply = bigDecimal.multiply(new BigDecimal("100"));
+            info.setZTAX(multiply.toString());
+        }
         if (taxRate != null && taxRate.contains("%")) {
             String replace = taxRate.replace("%", "");
             BigDecimal bigDecimal = new BigDecimal(replace);

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

@@ -2339,7 +2339,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId);
 
         PageHelper.startPage(curr, size);
+        log.info("开始进行分页查询");
         List<TDxInvoiceDel> pageList = signInvoiceDelDao.selectDelfpList(pramsMap);
+        log.info("分页查询结果为 {}",pageList);
         PageInfo<TDxInvoiceDel> pageInfo = new PageInfo<>(pageList);
         List<TDxInvoiceDel> resultList = pageInfo.getList();
 
@@ -2349,6 +2351,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         List<QsjgQueryVO> returnList = new ArrayList<>();
         if (resultList != null && resultList.size() > 0) {
 
+            log.info("resultList不为空");
             int start = new Long(pageInfo.getStartRow()).intValue();
 
             for (int i = 0; i < resultList.size(); i++) {
@@ -2357,6 +2360,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             }
         }
         if (curr == 1) {
+            log.info("开始查询数量");
             QsInvoiceCount selectQsfpListCount = signInvoiceDelDao.selectDelfpListCount(pramsMap);
             if (selectQsfpListCount != null) {
 
@@ -2365,6 +2369,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             }
         }
         json.put("datalist", returnList);
+        log.info("returnList {}",returnList);
 
         return super.responseResult(json);
     }