Merge remote-tracking branch 'origin/dev0310' into dev0310

# Conflicts:
#	dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java

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

@@ -1144,6 +1144,7 @@ public class InterfaceController extends AbstractController {
         //同步 凭证号 判断自动认证接口开发
         if("FI847".equals(requestParam.getIS_INPUT().getIFYWID())){
             resultString = receiveErpInvoiceMessage(requestParam);
+            //进项税转出
         }else if("FI849".equals(requestParam.getIS_INPUT().getIFYWID())){
             resultString = transferOut(requestParam);
         }

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

@@ -62,8 +62,6 @@ public class SDNYMainProcessController extends AbstractController {
 
             return ResponseEntity.ok(R.error("发票代码不能为空！"));
         }
-//        pramsMap.put("invoiceType", iu.getFplxdm());
-
 
         if (pramsMap.get("invoiceNumber").isEmpty()) {
             return ResponseEntity.ok(R.error("发票号码不能为空！"));
@@ -80,6 +78,10 @@ public class SDNYMainProcessController extends AbstractController {
             return ResponseEntity.ok(R.error("开票日期不能为空！"));
         }
 
+        if (pramsMap.get("invoiceType").isEmpty()) {
+            return ResponseEntity.ok(R.error("开票日期不能为空！"));
+        }
+
         if (SNFplxEnum.ZP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
                 || SNFplxEnum.JDC.getSnFplxDm().equals(pramsMap.get("invoiceType"))
                 || SNFplxEnum.DZZP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
@@ -113,9 +115,12 @@ public class SDNYMainProcessController extends AbstractController {
                 || SNFplxEnum.QDPP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
         ) {
 
-            pramsMap.put("invoiceType", fplxdm);
             //查验发票数据
+            try {
                 checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
 
             if (!checkInvoiceResult.containsKey("code")) {
                 return ResponseEntity.ok(R.ok().put("data", checkInvoiceResult));

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

@@ -88,8 +88,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
     private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao;
 
     public String pushCheckResultToSAP(JSONObject result) throws Exception {
-        result.put("systemSign", "");
-        result.put("roleIds", "");
         log.info("获取角色请求参数：{} , 请求地址：{}", result, snYxUrl);
         String post = HttpUtil.post(snYxUrl, result, 30000);
         log.info("获取角色返回信息：{}", post);
@@ -113,6 +111,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
                 String fpdm = snInvoice.getInvoiceCode();
                 String fphm = snInvoice.getInvoiceNumber();
+
+                QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
+                currentWrapper.eq("uuid", fpdm + fphm);
+
+                BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
+
+
                 String kprq = snInvoice.getBillingDate();
                 String je = snInvoice.getTotalAmount();
                 String xfsh = snInvoice.getSalesTaxNo();
@@ -145,9 +150,14 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 recordInvoice.setInvoiceStatus("0");
                 recordInvoice.setInvoiceType(invoiceType);
                 recordInvoice.setCompany(company);
+
+                if(baseTDxRecordInvoice != null) {
+                    baseTDxRecordInvoiceDao.update(recordInvoice,recordWrapper);
+                }else{
                     baseTDxRecordInvoiceDao.insert(recordInvoice);
                 }
             }
+        }
 
         return "";
     }
@@ -185,7 +195,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
         return queryInvoiceResult;
     }
 
-    public JSONObject singleCheckInvoice(Map<String, String> pramsMap) {
+    public JSONObject singleCheckInvoice(Map<String, String> pramsMap) throws Exception{
 
         //1.封装查验参数
         ApiRequest apiRequest = new ApiRequest();
@@ -231,7 +241,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
         if ("0000".equals(contentMap.get("code"))) {
 
             HashMap<String, Object> invoiceData = JSONObject.parseObject(contentMap.get("data").toString(), HashMap.class);
-
+            if("0001".equals(invoiceData.get("cyjg"))) {
                 jsonObject.put("invoiceType", invoiceType);
                 jsonObject.put("administrativeDivisionNo", "");
                 jsonObject.put("administrativeDivisionName", "");
@@ -281,10 +291,10 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
                 List<Map<String, String>> returnDetailList = new ArrayList<>();
                 JSONArray detailList = (JSONArray) invoiceData.get("detailList");
-            for (int i = 0;i<detailList.size();i++) {
+                for (int i = 0; i < detailList.size(); i++) {
                     JSONObject detail = (JSONObject) detailList.get(i);
                     Map<String, String> snDetailMap = new HashMap<String, String>();
-                snDetailMap.put("rowNo", i + "");
+                    snDetailMap.put("rowNo", ++i + "");
                     snDetailMap.put("commodityCode", detail.getString("mxbh"));
                     snDetailMap.put("commodityName", detail.getString("hwmc"));
                     snDetailMap.put("specificationModel", detail.getString("ggxh"));
@@ -300,10 +310,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                     snDetailMap.put("type", detail.getString("lx"));
 
                     returnDetailList.add(snDetailMap);
-                i++;
                 }
 
                 jsonObject.put("invoiceLineList", returnDetailList);
+            }else{
+                jsonObject.put("cyjg",invoiceData.get("cyjg"));
+                jsonObject.put("cyjgxx",invoiceData.get("cyjgxx"));
+            }
 
         } else {
             jsonObject.put("code", contentMap.get("code"));