销项发票提交

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

@@ -24,6 +24,7 @@ import com.dxhy.erp.utils.Base64;
 import com.dxhy.erp.utils.HmacSHA1Util;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -112,6 +113,9 @@ public class SDNYMainProcessController extends AbstractController {
     @Resource
     private RequestRecordService requestRecordService;
 
+    @Autowired
+    private ImageSubmitService imageSubmitService;
+
     /**
      * 查验发票
      */
@@ -1207,15 +1211,21 @@ public class SDNYMainProcessController extends AbstractController {
     @SysLog("影像系统提交销项发票")
     public ResponseEntity<String> imageSubmitSalesInvoice(@RequestBody SNRequestObject params) {
         log.info("影像系统提交销项发票 params:{}", JSONObject.toJSONString(params));
+        try {
+            R rs = null;
             if (params.getInvoiceInfoList() == null || params.getInvoiceInfoList().size() == 0) {
                 // 撤回
+                rs = imageSubmitService.salesInvoiceRollback(params);
             } else {
                 // 提交
+                rs = imageSubmitService.salesInvoiceSubmit(params);
+            }
+            return ResponseEntity.ok(JSONObject.toJSONString(rs));
+        }catch (Exception e) {
+            log.error("影像系统提交销项发票失败", e);
+            return ResponseEntity.ok(JSONObject.toJSONString(R.error(500, e.getMessage())));
         }
 
-
-
-        return ResponseEntity.ok(JSONObject.toJSONString(R.success()));
     }
 
 

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

@@ -142,7 +142,18 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
 
     @Override
     public R salesInvoiceRollback(SNRequestObject params) {
-        return null;
+        List<String> uuidList = new ArrayList<>();
+        params.getInvoiceInfoList().stream().forEach(item -> {
+            String uuid = (StringUtils.isBlank(item.getInvoiceCode()) ? "" : item.getInvoiceCode()) + item.getInvoiceNumber();
+            uuidList.add(uuid);
+        });
+        UpdateWrapper<SdnyTDxRecordInvoiceDetailSales> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set(true, "image_id", null);
+        updateWrapper.set(true, "bzdh", null);
+        updateWrapper.set(true, "bzr", null);
+        updateWrapper.in("uuid", uuidList);
+        sdnyTDxRecordInvoiceDetailSalesService.update(updateWrapper);
+        return pushSap(null, params);
     }
 
     /**
@@ -155,6 +166,8 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
     public R pushSap(List<SdnyTDxSaleRecordInvoice> invoiceList, SNRequestObject params) {
         String dt = DateUtil.now();
         List<ZData> zDataList = new ArrayList<>();
+        if (invoiceList != null) {
+            // 影像提交
             invoiceList.stream().forEach(item -> {
                 String invoiceType = FplxEnum.getSapFplxdm(item.getInvoiceType());
                 if (StringUtils.isBlank(invoiceType)) {
@@ -253,6 +266,8 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
                 zdata.setZSM(TaxRateCodeEnum.getCode(taxRate));
                 zDataList.add(zdata);
             });
+        }
+
         S4Request request = S4Request.builder()
                 .SYSID("FPXT")
                 .IFYWID("FI889")