RTR 业务计提

mjava-ts/src/main/java/com/malk/taisen/service/impl/RtrServerImpl.java

@@ -11,6 +11,7 @@ import com.malk.taisen.service.RtrServer;
 import com.malk.taisen.util.CusutUtil;
 import com.malk.taisen.util.HttpUtil;
 import com.malk.utils.UtilMap;
+import com.malk.utils.UtilNumber;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -91,8 +92,8 @@ public class RtrServerImpl implements RtrServer {
                     x++;
                     itemObj.put("ZOA_ITEMNO", sjItemNo);//OA单据行号
                     itemObj.put("SHKZG", "S");//  S借方
-                    sapJson.put("ZTAXOUT_AMT", "0");
-                    sapJson.put("ZTAX_AMT", "0");
+                    itemObj.put("ZTAXOUT_AMT", "0"); // 进项转出金额
+                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,"numberField_miwh5y8a_value","0")); // 税额
 //                    itemObj.put("HKONT", String.valueOf(row.get("textField_mipgl0w1"))); //会计科目:取接口行项目接口字段会计科目 HKONT
                     itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y87"))); //会计科目:取接口行项目接口字段会计科目 HKONT
                     itemObj.put("DMBTR", String.valueOf(row.get("numberField_mipgl0w2_value")));  //凭证金额:取接口行项目接口字段 DMBTR
@@ -122,6 +123,8 @@ public class RtrServerImpl implements RtrServer {
                     }
                     x++;
                     itemObj.put("ZOA_ITEMNO", sjItemNo);//OA单据行号
+                    itemObj.put("ZTAXOUT_AMT", "0"); // 进项转出金额
+                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,"numberField_miwh5y8m_value","0")); // 税额
 //                    itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y8d"))); //会计科目:取接口行项目接口字段会计科目 HKONT
                     itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y8e"))); //会计科目:取接口行项目接口字段会计科目 HKONT
                     itemObj.put("DMBTR", String.valueOf(row.get("numberField_miwh5y8f_value")));  //凭证金额:取接口行项目接口字段 DMBTR
@@ -132,6 +135,7 @@ public class RtrServerImpl implements RtrServer {
                     itemObj.put("ZUONR", String.valueOf(row.get("textField_miwh5y8k")));///分配:取接口行项目接口字段分配 ZUONR
                     itemObj.put("XREF1", String.valueOf(row.get("textField_miwh5y8l")));///参考码1:取接口行项目接口字段 XREF1
                     itemObj.put("SGTXT", String.valueOf(row.get("textareaField_miwh5y8c")));///行项目文本:取接口行项目接口字段行项目文本 SGTXT
+
                     itemArray.put(itemObj);
                 }
             }
@@ -161,20 +165,26 @@ public class RtrServerImpl implements RtrServer {
                         ydClient.operateData(YDParam.builder().formInstanceId(InstanceId).updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_l9nsavm2, textField_mejezfwk, textareaField_mi5kjmxb, selectField_mi72r4s6", E_GJAHR, e_belnr,E_MESSAGE,"成功"))).build(), YDConf.FORM_OPERATION.update);
                     }else {
                         //  报错写入
-                        ydClient.operateData(YDParam.builder().formInstanceId(InstanceId).updateFormDataJson(JSON.toJSONString(UtilMap.map("textareaField_mi5kjmxb, selectField_mi72r4s6", E_MESSAGE,"失败" ))).build(), YDConf.FORM_OPERATION.update);
+                        saveError(InstanceId,E_MESSAGE);
                     }
                 } catch (Exception ex) {
                     log.error("解析异常{}",ex.getMessage());
+                    saveError(InstanceId,post);
                 }
             } else {
                 log.error("返回值数组为空");
+                saveError(InstanceId,"返回值数组为空,返回值："+post);
             }
         }else {
             //  报错写入
-            ydClient.operateData(YDParam.builder().formInstanceId(InstanceId).updateFormDataJson(JSON.toJSONString(UtilMap.map("textareaField_mi5kjmxb, selectField_mi72r4s6", post,"失败" ))).build(), YDConf.FORM_OPERATION.update);
+            saveError(InstanceId,post);
         }
     }
 
+    private void saveError(String InstanceId,String errorMsg){
+        ydClient.operateData(YDParam.builder().formInstanceId(InstanceId).updateFormDataJson(JSON.toJSONString(UtilMap.map("textareaField_mi5kjmxb, selectField_mi72r4s6", errorMsg,"失败" ))).build(), YDConf.FORM_OPERATION.update);
+    }
+
     //匹配条件用
     private static final String KEY = "key";
     private static final String VALUE = "value";