Merge remote-tracking branch 'origin/coverBillin' into release

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -1242,7 +1242,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
     public void updateInvoice(String dbName, JSONObject checkInvoiceResult, QueryWrapper<BaseTDxRecordInvoice> recordWrapper) throws Exception {
         //先删除原有主数据,再查验更新主数据和明细数据
-        int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper);
+//        int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper);
 
         checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber"));
         signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName);

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

@@ -161,17 +161,26 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                 }
             }
         } else {
-            TdxRecordInvoice recordInvoiceUpdate = new TdxRecordInvoice();
+//            TdxRecordInvoice recordInvoiceUpdate = new TdxRecordInvoice();
 //            recordInvoiceUpdate.setQsDate(DateUtils.getSqlDateLong());
 //            recordInvoiceUpdate.setQsName(userName);
 //            recordInvoiceUpdate.setQsStatus(FpqsjgEnum.YQS.getQsjgDm());
 //            recordInvoiceUpdate.setQsType(qsType);
-            recordInvoiceUpdate.setUuid(recordInvoice.getUuid());
-            if (recordInvoice.getDeptId() != null) {
-                recordInvoiceUpdate.setDeptId(recordInvoice.getDeptId());
-                recordInvoiceUpdate.setDeptName(recordInvoice.getDeptName());
+//            recordInvoiceUpdate.setUuid(recordInvoice.getUuid());
+//            if (recordInvoice.getDeptId() != null) {
+//                recordInvoiceUpdate.setDeptId(recordInvoice.getDeptId());
+//                recordInvoiceUpdate.setDeptName(recordInvoice.getDeptName());
+//            }
+            this.updateInvoice(recordInvoice);
+
+            if (recordInvoiceDetail.size() > 0) {
+                boolean deleteDetail =
+                        signInvoiceDetailService.deleteDetail(recordInvoice.getUuid(), dbName);
+                if (deleteDetail) {
+                    log.info("保存明细表的字段和字段值为{}",recordInvoiceDetail);
+                    signInvoiceDetailService.saveInvoiceDetail(recordInvoiceDetail, dbName);
+                }
             }
-            this.updateInvoice(recordInvoiceUpdate);
         }
     }