计量相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/MaterialPriceDifferential.java

@@ -0,0 +1,48 @@
+package org.springblade.manager.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * @author yangyj
+ * @Date 2024/4/19 10:50
+ * @description 永久性工程材料差价金额预览表
+ */
+public class MaterialPriceDifferential {
+    public static final String ID="20310000000";
+    public static final String TBN="MtPiDf";
+    public static final String TBN_CH="永久性工程材料差价金额预览表";
+    /**期号*/
+    @JSONField(name = "key_1",label="期号",ordinal = 1)
+    private String periodNumber;
+
+    @JSONField(name = "key_2",label="材料名称",ordinal = 1)
+    private String name;
+
+    @JSONField(name = "key_3",label="单位",ordinal = 5)
+    private String unit;
+
+    @JSONField(name = "key_4",label="数量",ordinal = 5)
+    private String quantity  ;
+
+    @JSONField(name = "key_5",label="基期单价",ordinal = 5)
+    private String priceBase;
+    @JSONField(name = "key_6",label="基期金额",ordinal = 9)
+    private String amountBase;
+
+    @JSONField(name = "key_7",label="当期单价",ordinal = 9)
+    private String price;
+    @JSONField(name = "key_8",label="当期金额",ordinal = 9)
+    private String amount;
+
+    @JSONField(name = "key_9",label="价差",ordinal = 13)
+    private String priceSpread;
+    @JSONField(name = "key_10",label="总金额",ordinal = 13)
+    private String total;
+
+    @JSONField(name = "key_11",label="计量表编号",ordinal = 15)
+    private String formNumber;
+
+    @JSONField(name = "key_12",label="批准文号",ordinal = 15)
+    private String approvalNumber;
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/MaterialsArrival.java

@@ -0,0 +1,44 @@
+package org.springblade.manager.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2024/4/19 11:50
+ * @description 工程材料到达现场计量表
+ */
+@Data
+public class MaterialsArrival {
+    public static final String ID="20330000000";
+    public static final String TBN="MtAiv";
+    public static final String TBN_CH="工程材料到达现场计量表";
+
+    @JSONField(name = "key_1",label="期号",ordinal = 1)
+    private String periodNumber;
+    @JSONField(name = "key_2",label="材料名称",ordinal = 1)
+    private String name;
+    @JSONField(name = "key_1",label="单位",ordinal = 1)
+    private String unit;
+    @JSONField(name = "key_2",label="数量",ordinal = 1)
+    private String quantity;
+
+    @JSONField(name = "key_2",label="单价",ordinal = 1)
+    private String price;
+
+    @JSONField(name = "key_1",label="金额",ordinal = 1)
+    private String amount;
+    @JSONField(name = "key_2",label="按合同规定预付总金额",ordinal = 1)
+    private String total;
+    @JSONField(name = "key_1",label="材料来源",ordinal = 1)
+    private String source;
+    @JSONField(name = "key_2",label="发票",ordinal = 1)
+    private String Invoice;
+
+    @JSONField(name = "key_1",label="质保书编号",ordinal = 1)
+    private String warrantyNumber;
+    @JSONField(name = "key_2",label="监抽报告编号",ordinal = 1)
+    private String ssr;
+
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/PeriodMaterial.java

@@ -2,6 +2,9 @@ package org.springblade.manager.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 /**
  * @author yangyj
  * @Date 2024/4/18 16:26
@@ -9,4 +12,7 @@ import lombok.Data;
  */
 @Data
 public class PeriodMaterial {
+    private LocalDate date;
+    private Long periodId;
+    private BigDecimal money;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -291,8 +291,8 @@ public class WbsTreeController extends BladeController {
     }
 
     public  boolean isModel(String id){
-         Set<String> set = new HashSet<>();
-         set.add(BaseInfo.ID);
+         /*   Set<String> set = new HashSet<>();
+          set.add(BaseInfo.ID);
          set.add(MeterPeriodInfo.ID);
          set.add(AdvancePaymentCertificate.ID);
          set.add(MaterialAdvancePayment.ID);
@@ -303,7 +303,10 @@ public class WbsTreeController extends BladeController {
          set.add(SubInterimMeterPaySummary.ID);
          set.add(InterimMeterPaySummary.ID);
          set.add(InterimMeter.ID);
-         return set.contains(id);
+         set.add(MaterialPriceDifferential.ID);
+         set.add(MaterialsArrival.ID);*/
+
+         return MODEL_MAP.containsKey(id);
      };
 
    public final static Map<String,List<WbsFormElementVO>> MODEL_MAP = new LinkedHashMap<>();
@@ -319,6 +322,8 @@ public class WbsTreeController extends BladeController {
         MODEL_MAP.put(SubInterimMeterPaySummary.ID,FormulaUtils.toElementVos(SubInterimMeterPaySummary.class));
         MODEL_MAP.put(InterimMeterPaySummary.ID,FormulaUtils.toElementVos(InterimMeterPaySummary.class));
         MODEL_MAP.put(InterimMeter.ID,FormulaUtils.toElementVos(InterimMeter.class));
+        MODEL_MAP.put(MaterialPriceDifferential.ID,FormulaUtils.toElementVos(MaterialPriceDifferential.class));
+        MODEL_MAP.put(MaterialsArrival.ID,FormulaUtils.toElementVos(MaterialsArrival.class));
     }
     public List<WbsFormElementVO> dataModel(String id){
           return MODEL_MAP.getOrDefault(id,Collections.emptyList());

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/TableElementConverter.java

@@ -372,7 +372,7 @@ public class TableElementConverter implements ITableElementConverter {
         public void convert() {
               /*模版选择*/
               for(NodeTable nt:tableAll){
-                  if("m_20240222111932_1760504568283660288".equals(nt.getInitTableName())||"m_20240222093331_1760477888294944768".equals(nt.getInitTableName())||"m_20240222110914_1760501976056987648".equals(nt.getInitTableName())){
+                  if("m_20240222111932_1760504568283660288".equals(nt.getInitTableName())||"m_20240222093331_1760477888294944768".equals(nt.getInitTableName())||"m_20240222110914_1760501976056987648".equals(nt.getInitTableName())||"m_20240222101436_1760488226289614848".equals(nt.getInitTableName())){
                       meterInfo.setConfig(MeterInfo.MB_ZJ);
                       break;
                   }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -269,6 +269,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         titleMap.put(SubInterimMeterPaySummary.TBN_CH, new String[]{SubInterimMeterPaySummary.TBN, SubInterimMeterPaySummary.ID});
         titleMap.put(InterimMeterPaySummary.TBN_CH, new String[]{InterimMeterPaySummary.TBN, InterimMeterPaySummary.ID});
         titleMap.put(InterimMeter.TBN_CH, new String[]{InterimMeter.TBN, InterimMeter.ID});
+        titleMap.put(MaterialPriceDifferential.TBN_CH, new String[]{MaterialPriceDifferential.TBN, MaterialPriceDifferential.ID});
         TN_TAB_LIST=titleMap.entrySet().stream().map(kv -> {
             TreeNodeVOByTabType tn = new TreeNodeVOByTabType();
             tn.setTitle(kv.getKey());