Merge remote-tracking branch 'origin/master'

src/main/java/fi/cas/formplugin/ArBillEditPlugin.java

@@ -83,7 +83,7 @@ import java.util.stream.Collectors;
  * 2024-07-24 wangj
  * 主要功能：应收挂账单标准表单插件改
  */
-public class ArBillEditPlugin extends PaymentBillEdit implements ClickListener, RowClickEventListener, SignCallbackLisenter {
+public class ArBillEditPlugin extends CasBillEdit implements ClickListener, RowClickEventListener, SignCallbackLisenter {
     private String labCurrencySign;
     private int currencyAmtprecision;
     private Format currencyFormat;

src/main/java/fi/em/opplugin/BusinessProcessingOpPlugin.java

@@ -36,6 +36,18 @@ public class BusinessProcessingOpPlugin extends AbstractOperationServicePlugIn {
                         throw new KDBizException("收款金额与合同冲销金额不一致!");
                     }
                 }
+                DynamicObjectCollection nckdEntryentity3 = info.getDynamicObjectCollection("nckd_entryentity3");
+                if (!nckdEntryentity3.isEmpty()) {
+                    BigDecimal nckdSkmxjehj = info.getBigDecimal("nckd_skmxjehj");//收款合计
+                    BigDecimal nckdYsgzjehj = info.getBigDecimal("nckd_ysgzjehj");//应收合计
+                    BigDecimal nckdhtamount = info.getBigDecimal("nckd_htamount");//合同合计
+                    double latitudeDo = nckdhtamount.doubleValue();
+                    double latitudeDou = nckdSkmxjehj.doubleValue();
+                    double latitudeDous = nckdYsgzjehj.doubleValue();
+                    if (latitudeDou != latitudeDo) {
+                        throw new KDBizException("收款金额与合同冲销金额不一致!");
+                    }
+                }
 
             } else if ("B".equals(detailtype)) {
                 BigDecimal nckdFkmxjehj = info.getBigDecimal("nckd_fkmxjehj");

src/main/java/fi/fa/opplugin/RealCardBillOpPlugin.java

@@ -67,17 +67,19 @@ public class RealCardBillOpPlugin extends AbstractOperationServicePlugIn {
                         //从拆分分录第二行开始回写
                         //获取拆分后卡片分录e管家实物卡片
                         DynamicObject card_list = collection.get(i+1).getDynamicObject("nckd_real_card_list");
-                        Long id = card_list.getLong("id");
-                        //查询实物卡片清单
-                        QFilter filter = new QFilter("id", QCP.equals,id);
-                        DynamicObject[] cardObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter});
-                        DynamicObject cardInfo = BusinessDataServiceHelper.loadSingle(cardObjects[0].getPkValue(), cardObjects[0].getDynamicObjectType().getName());
-                        //回写实物卡片字段到e管家实物卡片清单
-                        //回写e卡片实物清单字段
-                        cardInfo.set("nckd_card_real_org", orgName);
-                        cardInfo.set("nckd_card_real_code", number);
-                        cardInfo.set("nckd_card_real_name", name);
-                        SaveServiceHelper.save(new DynamicObject[]{cardInfo});
+                        if (card_list != null) {
+                            Long id = card_list.getLong("id");
+                            //查询实物卡片清单
+                            QFilter filter = new QFilter("id", QCP.equals,id);
+                            DynamicObject[] cardObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter});
+                            DynamicObject cardInfo = BusinessDataServiceHelper.loadSingle(cardObjects[0].getPkValue(), cardObjects[0].getDynamicObjectType().getName());
+                            //回写实物卡片字段到e管家实物卡片清单
+                            //回写e卡片实物清单字段
+                            cardInfo.set("nckd_card_real_org", orgName);
+                            cardInfo.set("nckd_card_real_code", number);
+                            cardInfo.set("nckd_card_real_name", name);
+                            SaveServiceHelper.save(new DynamicObject[]{cardInfo});
+                        }
                     }
                 }else if(StringUtils.equals(e.getOperationKey(),"unaudit")) {
                 //反审核，e管家实物卡片清单三个字段置为空

src/main/java/fi/fa/webService/DispatchMidController.java

@@ -17,7 +17,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
-import nckd.sys.web.common.utils.OperateHelper;
+import kd.bos.dataentity.OperateOption;
 import org.apache.commons.lang3.ObjectUtils;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -231,12 +231,12 @@ public class DispatchMidController implements Serializable {
                 entry1.set("inusedept", map.get("inDeptId"));//调入使用部门
             }
             //执行保存-提交-审核
-            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_dispatch", new DynamicObject[]{dispatch}, OperateHelper.createOperate());
+            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_dispatch", new DynamicObject[]{dispatch}, OperateOption.create());
             if (saveResult.isSuccess()){
                 //生单后反写中间表，防止反复生单
                 OncePush(jsonObject.getString("billno"));
-                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
-                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
+                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateOption.create());
+                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateOption.create());
             }
 
 
@@ -319,12 +319,12 @@ public class DispatchMidController implements Serializable {
 
             }
             //执行保存-提交-审核
-            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_change_dept", new DynamicObject[]{changeDept}, OperateHelper.createOperate());
+            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_change_dept", new DynamicObject[]{changeDept}, OperateOption.create());
             if (saveResult.isSuccess()) {
                 //生单后反写中间表，防止反复生单
                 OncePush(jsonObject.getString("billno"));
-                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
-                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
+                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateOption.create());
+                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateOption.create());
             }
         }
 

src/main/java/kd/imc/rim/common/invoice/recognitionnew/impl/AwsRecognitionServiceEx.java

@@ -64,8 +64,6 @@ public class AwsRecognitionServiceEx implements RecognitionService {
                 for(int times = 1; times <= retryTimes; ++times) {
                     //调用接口位置
                     String result = "";//ApiHttpUtils.Posthttp(url, imgStrToBase64)
-
-
                     logger.info("aws识别接口返回结果{}：{}", times, result);
                     boolean reTry = false;
                     if (!StringUtils.isNotEmpty(result)) {