ariesy 修复底账库已有数据 明细行字段赋值错误

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

@@ -193,10 +193,10 @@ public class SDNYMainProcessController extends AbstractController {
                 String invoiceNo = checkInvoiceByUuid.getInvoiceNo();
                 QueryWrapper<BaseTDxRecordInvoiceDetail> detailWrapper = new QueryWrapper<>();
                 detailWrapper.eq("invoice_no", invoiceNo);
-                DynamicContextHolder.push(DbConstant.DETAIL_READ);
+                DynamicContextHolder.push("business" + DbConstant.DETAIL_READ);
                 List<BaseTDxRecordInvoiceDetail> baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper);
 
-                DynamicContextHolder.push(DbConstant.BUSINESS_READ);
+                DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ);
 
                 JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid);
                 JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail);
@@ -443,16 +443,20 @@ public class SDNYMainProcessController extends AbstractController {
                 //如果是卷票计算合计金额
                 Float hjje = null;
                 if (detail.getString("detailAmount") != null && detail.getString("taxAmount") != null) {
-                    Float je = Float.parseFloat(detail.getString("je"));
-                    Float se = Float.parseFloat(detail.getString("se"));
-                    hjje = je + se;
+                    Float je = Float.parseFloat(detail.getString("detailAmount"));
+                    if(detail.getString("taxAmount") != null) {
+                        Float se = Float.parseFloat(detail.getString("se"));
+                        hjje = je + se;
+                    }else{
+                        hjje = je;
+                    }
                 }
 
                 if (hjje != null)
                     snDetailMap.put("amount", hjje.toString());
 
             } else {
-                snDetailMap.put("tax", "***".equals(detail.getString("amount")) ? "0.00" : detail.getString("se"));
+                snDetailMap.put("tax", "***".equals(detail.getString("taxAmount")) ? "0.00" : detail.getString("taxAmount"));
                 snDetailMap.put("amount", detail.getString("detailAmount"));
             }
 

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java

@@ -288,7 +288,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                 String invoiceType = queryInvoiceResult.getString("invoiceType");
                 String invoiceCode = queryInvoiceResult.getString("invoiceCode");
                 String invoiceNo = queryInvoiceResult.getString("invoiceNo");
-                String uuid = invoiceCode + invoiceNo;
+                String uuid = invoiceCode == null ? invoiceNo : invoiceCode + invoiceNo;
                 List<TDxRecordInvoiceDetail> invoiceDetailList = new ArrayList<>(dataArray.size());
                 for (int i = 0; i < dataArray.size(); i++) {
                     JSONObject invoiceDetailQuery = dataArray.getJSONObject(i);