Merge remote-tracking branch 'origin/master'

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcdm/formplugin/annualincome/SalAnnualIncomeBillEdit.java

@@ -81,6 +81,12 @@ public class SalAnnualIncomeBillEdit extends AbstractFormPlugin implements Plugi
         // 排除薪资核算组
         List<Long> excludeGroupIds = SwcUtils.getExcludePayRollGroupIds(calYear);
         groupIds.removeAll(excludeGroupIds);
+
+        if(groupIds.size() == 0) {
+            this.getView().showMessage("当前核算组已生成过数据，请勿重复生成！");
+            return;
+        }
+
         // 获取年度最后一天
         Date endDate = SwcUtils.getLastDayOfYear(calYear);
         // 声明service

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/outdata/basedata/OutImpTemplateEdit.java

@@ -159,6 +159,7 @@ public class OutImpTemplateEdit extends AbstractFormPlugin implements Plugin {
         setter.addField("nckd_datatype", new Object[0]);
         setter.addField("nckd_comment", new Object[0]);
         setter.addField("nckd_uniquecode", new Object[0]);
+        setter.addField("nckd_ispreset", new Object[0]);
         return setter;
     }
 
@@ -342,7 +343,10 @@ public class OutImpTemplateEdit extends AbstractFormPlugin implements Plugin {
         int index;
         for(index = 0; index < entryDatas.size(); ++index) {
             DynamicObject entry = (DynamicObject)entryDatas.get(index);
-            if (!StringUtils.equals(entry.getString("nckd_itemtype"), "0")) {
+//            if (!StringUtils.equals(entry.getString("nckd_itemtype"), "0")) {
+//                break;
+//            }
+            if(!entry.getBoolean("nckd_ispreset")) {
                 break;
             }
         }
@@ -355,7 +359,7 @@ public class OutImpTemplateEdit extends AbstractFormPlugin implements Plugin {
         List<OutImpPresetItem> presetItemEnumsList = OutImpTemplateHelper.getPresetItemEnumList();
         if (!CollectionUtils.isEmpty(presetItemEnumsList)) {
             for(OutImpPresetItem presetItemEnum : presetItemEnumsList) {
-                tableValueSetter.addRow(new Object[]{presetItemEnum.getMatchColumn(), "2", presetItemEnum.getItemId(), 0L, 0L, 0L, 0L, presetItemEnum.getItemNumber(), presetItemEnum.getItemName(), presetItemEnum.getDataTypeId(), presetItemEnum.getComment(), ""});
+                tableValueSetter.addRow(new Object[]{presetItemEnum.getMatchColumn(), "2", presetItemEnum.getItemId(), 0L, 0L, 0L, 0L, presetItemEnum.getItemNumber(), presetItemEnum.getItemName(), presetItemEnum.getDataTypeId(), presetItemEnum.getComment(), "", true});
             }
         }
         model.beginInit();

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/outdata/basedata/OutItemSelectAddItemPlugin.java

@@ -352,6 +352,9 @@ public class OutItemSelectAddItemPlugin extends AbstractFormPlugin implements Pl
 
         IDataModel model = this.getModel();
         for (DynamicObject matchRelationData : matchRelationDatas) {
+            if(matchRelationData.getBoolean("nckd_ispreset")) {
+                continue;
+            }
             String itemType = matchRelationData.getString("nckd_itemtype");
             String itemCategory = ITEM_TYPE_MAPPING.get(itemType);