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

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

@@ -1237,11 +1237,6 @@ public class InterfaceController extends AbstractController {
                 es.setZMESSAGE("底账数据不存在");
                 outPut.setES_OUTPUT(es);
                 return JsonUtils.getInstance().toJsonString(outPut);
-            }else if(!invoices.get(0).getAuthStatus().equals("4")){
-                es.setZTYPE("E");
-                es.setZMESSAGE("发票状态不是认证成功不允许转出");
-                outPut.setES_OUTPUT(es);
-                return JsonUtils.getInstance().toJsonString(outPut);
             }
         }
 

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

@@ -99,7 +99,7 @@ public class SDNYMainProcessController extends AbstractController {
         JSONObject checkInvoiceResult = null;
         InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode"));
         String fplxdm = iu.getFplxdm();
-        if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType"))) {
+        if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType")) || pramsMap.get("invoiceCode").startsWith("50000")) {
             //查验类发票,执行查验操作后入库
             log.info("查验类发票,执行查验操作后入库");
             //权限校验

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
 import com.dxhy.auth.client.annotation.IgnoreClientToken;
 import com.dxhy.auth.client.annotation.IgnoreUserToken;
+import com.dxhy.common.vo.TaxOrgCode;
 import com.dxhy.extend.entity.PullRecordReq;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -265,6 +267,12 @@ public class ExtInvoicePoolController extends AbstractController {
             if(pullRecordReq.getSm().equals("99")){
                 pullRecordReq.setSm("");
             }
+            if(pullRecordReq.getCompanyCode().equals("99")){
+                List<TaxOrgCode> orgCodes = getUserInfo().getOrgCodes();
+                List<String> collect = orgCodes.stream().map(TaxOrgCode::getOrgCode).collect(Collectors.toList());
+                pullRecordReq.setOrgCode(collect);
+                pullRecordReq.setCompanyCode("");
+            }
             return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq)));
         }catch (Exception e){
             e.printStackTrace();

dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java

@@ -34,62 +34,70 @@ public class VouncherSyncController {
         //是否全量 X为全量推送，空为增量推送。
         //全量推送逻辑为 查询出的符合条件的凭证全部推送，全量推送不再检查是否在自定义表中已传输。
         //增量推送，已传输的凭证数据不再推送（检查传输记录表是否已传输成功）
+        try{
+        String companyCodes = map.get("companyCode");
+        String[] split = companyCodes.split(",");
+        StringBuilder sb = new StringBuilder();
+        for (String str:split){
+            /**
+             * 传参逻辑   年  月 必传  期间只能传一个月的
+             *
+             */
+            String ifAll=map.get("ifAll");
+            //公司代码
 
+            //开始日期
+            String startTime= map.get("startTime");
+            String endTime = map.get("endTime");
+            if(startTime!=null && startTime!=""){
+                startTime=startTime.replace("-","");
+            }
+            if(endTime!=null && endTime!=""){
+                endTime=endTime.replace("-","");
+            }
+            //结束日期
+            String month=map.get("monat");
+            //GJAHR  nian
+            String gjahr=map.get("gjahr");
 
-        /**
+            SNSAPObject object = new SNSAPObject();
-         * 传参逻辑   年  月 必传  期间只能传一个月的
+            object.setSYSID("FPXT");
-         *
+            object.setIFYWID("FI842");
-         */
+            object.setBSKEY(UUID.randomUUID().toString().replace("-", ""));
-        String ifAll=map.get("ifAll");
+            //object.setSAPKEY("");
-        //公司代码
-        String companyCode = map.get("companyCode");
-        //开始日期
-        String startTime= map.get("startTime");
-        String endTime = map.get("endTime");
-        if(startTime!=null && startTime!=""){
-            startTime=startTime.replace("-","");
-        }
-        if(endTime!=null && endTime!=""){
-            endTime=endTime.replace("-","");
-        }
-        //结束日期
-        String month=map.get("monat");
-        //GJAHR  nian
-        String gjahr=map.get("gjahr");
-
-        SNSAPObject object = new SNSAPObject();
-        object.setSYSID("FPXT");
-        object.setIFYWID("FI842");
-        object.setBSKEY(UUID.randomUUID().toString().replace("-", ""));
-        //object.setSAPKEY("");
 
 //        object.setZFILED1("");
 //        object.setZFILED2("");
 //        object.setZFILED3("");
 //        object.setZFILED4("");
-        object.setZFILED5("200");
+            object.setZFILED5("200");
-        Map<String,String> requestMap = new HashMap<>();
+            Map<String,String> requestMap = new HashMap<>();
-        List<Object> list = new ArrayList<>();
+            List<Object> list = new ArrayList<>();
-        requestMap.put("ZGSDM",companyCode);
+            requestMap.put("ZGSDM",str);
-        requestMap.put("GJAHR",gjahr);
+            requestMap.put("GJAHR",gjahr);
-        requestMap.put("MONAT",month);
+            requestMap.put("MONAT",month);
-        requestMap.put("ZDATEF",startTime);
+            requestMap.put("ZDATEF",startTime);
-        requestMap.put("ZDATET",endTime);
+            requestMap.put("ZDATET",endTime);
-        requestMap.put("ZFLAG",ifAll);
+            requestMap.put("ZFLAG",ifAll);
-        object.setZDATA(JSONObject.toJSONString(requestMap));
+            object.setZDATA(JSONObject.toJSONString(requestMap));
-        JSONObject request = new JSONObject();
+            JSONObject request = new JSONObject();
-        request.put("IS_INPUT",object);
+            request.put("IS_INPUT",object);
-        try{
+
             String s = vouncherSyncService.sendPo(JSONObject.toJSONString(request));
             Map map1 = JSONObject.parseObject(s, Map.class);
             Map output = (Map)map1.get("ES_OUTPUT");
             String ztype =(String) output.get("ZTYPE");
             if(ztype.equals("S")){
-                return ResponseEntity.ok(R.ok().put("data","数据拉取成功"));
+
             }else {
-                return ResponseEntity.ok(R.error((String)output.get("ZDATA")));
+                sb.append(str+output.get("ZDATA"));
             }
-
+        }
+        if(sb.length()>0){
+            return ResponseEntity.ok(R.ok().put("data",sb));
+        }else{
+            return ResponseEntity.ok(R.ok().put("data","拉取成功"));
+        }
         }catch (Exception e ){
             e.printStackTrace();
             return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT));

dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java

@@ -2,12 +2,16 @@ package com.dxhy.extend.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author wangzhikun
  * @Date 2023/4/14 2023/4/14
  */
 @Data
 public class PullRecordReq {
+    private String companyCode;
+
     //公司名称
     private String companyName;
     //账期
@@ -27,6 +31,8 @@ public class PullRecordReq {
     //过账终止日期
     private String accountEndDate;
 
+    private List<String> orgCode;
+
     private int curr;
     private int size;
 }

dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@@ -616,6 +616,15 @@
         <if test="companyName!=null and companyName != ''">
             and vr.butxt = #{companyName}
         </if>
+        <if test ="orgCode !=null and orgCode.size>0">
+            and vr.bukrs in
+            <foreach collection="orgCode" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="companyCode !=null and companyCode !=''">
+            and vr.bukrs = #{companyCode}
+        </if>
         <if test ="accountPeriod !=null and accountPeriod !=''">
             and CONCAT_WS("-",vr.gjahr,vr.monat) = #{accountPeriod}
         </if>

dxhy-sign/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.dxhy.base</groupId>
             <artifactId>sims-base-sms</artifactId>
-            <version>6.1.4.0-BASE</version>
+            <version>1.0.0.1-sdenergy</version>
             <scope>compile</scope>
         </dependency>
         <dependency>