销项发票提交问题修复

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

@@ -630,9 +630,30 @@ public class SDNYMainProcessController extends AbstractController {
                         QueryWrapper<RecordInvoiceSaleDetailModel> saleDetailWrapper = new QueryWrapper<>();
                         saleDetailWrapper.eq("invoice_no", invoiceNo);
                         List<RecordInvoiceSaleDetailModel> recordInvoiceSaleDetailModel = snPushCheckRecordService.selectSaleListByWrapper(saleDetailWrapper);
+                        List<BaseTDxRecordInvoiceDetail> baseTDxRecordInvoiceDetail = null;
+                        if(recordInvoiceSaleDetailModel == null || recordInvoiceSaleDetailModel.size() == 0){
+                            log.info("明细行为空，查验补充信息");
+                            checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap, null);
+
+                            if (!checkInvoiceResult.containsKey("code")) {
+                                if (!checkInvoiceResult.containsKey("cyjg")) {
+                                    snPushCheckRecordService.updateInvoice(dbName, checkInvoiceResult, recordWrapper);
+                                    QueryWrapper<BaseTDxRecordInvoiceDetail> detailWrapper = new QueryWrapper<>();
+                                    detailWrapper.eq("uuid", uuid);
+                                    baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper);
+                                } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) {
+                                    data = errorInfo(checkInvoiceResult, data);
+                                    return ResponseEntity.ok(JSONObject.toJSONString(data));
 
+                                }
+                            }
+                            checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper);
+                        }
                         JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice);
                         JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel);
+                        if(baseTDxRecordInvoiceDetail!= null && baseTDxRecordInvoiceDetail.size() > 0){
+                            saleDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail);
+                        }
                         convertToResult(checkInvoice, saleDetail);
 
                         data.put("data", checkInvoice);
@@ -1400,7 +1421,7 @@ public class SDNYMainProcessController extends AbstractController {
      * @param params
      * @return
      */
-    //@PostMapping("/imageSubmitSalesInvoice")
+    @PostMapping("/imageSubmitSalesInvoice")
     @ResponseBody
     @SysLog("影像系统提交销项发票")
     public ResponseEntity<String> imageSubmitSalesInvoice(@RequestBody SNRequestObject params) {

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

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

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

@@ -98,9 +98,9 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         detailQueryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
         if (detailList == null || detailList.size() == 0) {
-            QueryWrapper salesQueryWrapper = new QueryWrapper<>();
+            QueryWrapper<SdnyTDxRecordInvoiceDetailSales> salesQueryWrapper = new QueryWrapper<>();
             salesQueryWrapper.in("uuid", uuidList);
-            List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
+            List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = detailSalesDao.selectList(salesQueryWrapper);
             if (salesDetailList == null || salesDetailList.size() == 0) {
                 return R.error(500,"未查询到发票明细信息，请重新查验");
             }