2-8计量公式

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

@@ -44,6 +44,8 @@ public class InventoryUnitChange implements DataModel{
     private String pageTotal;
     @JSONField(name = "key_68",label="第N页" ,ordinal = 101)
     private String pageIndex;
+    /**变更令ID*/
+    private Long changeId;
     /**是否是汇总小结数据，输出的时候显示，计算的时候不参与*/
     private Boolean isSummary=false;
     /**计算的时候控制正负属性*/

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

@@ -988,6 +988,7 @@ public class ExecutorMeter extends FormulaExecutor {
                     List<ChangeTokenInventory> ChangeTokenInventoryList = entry.getValue();
                     InventoryUnitChange change = new InventoryUnitChange();
                     ContractInventoryForm inventory = InventoryUCUtil.getInventory(ChangeTokenInventoryList.get(0).getContractFormId());
+                    change.setChangeId(ChangeTokenInventoryList.get(0).getChangeTokenId());
                     /*清单编号*/
                     change.setInventoryNum(inventory.getChapterNumber()+"章");
                     /*项目编号*/
@@ -1263,13 +1264,13 @@ public class ExecutorMeter extends FormulaExecutor {
                          }
                          ipc.setCurrentPeriodPay(StringUtils.handleNull(currentMoney.get(cm.getKey())));
                          //2-8公式开发前逻辑
-                         //本期变更金额
+//                         //本期变更金额
 //                         ipc.setCurrentPeriodChangeMoney(StringUtils.handleNullZero(sumChangeMoneyForChapter(changeTokenList0,ch)
 //                                 ,tec.getPayRadicScale()));
-                         //上期末变更金额
+//                         //上期末变更金额
 //                         ipc.setPreviousPeriodEndChangeMoney(StringUtils.handleNullZero(sumChangeMoneyForChapter(changeTokenList1,ch)
 //                                 ,tec.getPayRadicScale()));
-                         //本期末变更金额
+//                         //本期末变更金额
 //                         ipc.setCurrentPeriodEndChangeMoney(StringUtils.handleNullZero(sumChangeMoneyForChapter(changeTokenList2,ch)
 //                                 ,tec.getPayRadicScale()));
                          //2-8公式开发后逻辑

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/InventoryUCUtil.java

@@ -127,7 +127,7 @@ public class InventoryUCUtil {
 
     //获取变更情况
     public static ChangeInventoryForm getChangeForm(Long contractId, Long prePeriodId, String formNumber) {
-        String sql="select * from s_change_inventory_form where contract_id="+contractId+" and period_id="+prePeriodId+" and form_number='"+formNumber+"' and is_deleted=0";
+        String sql="select * from s_change_inventory_form where contract_id="+contractId+" and period_id="+prePeriodId+" and form_number='"+formNumber+"' and is_deleted=0 ";
         try {
             return jdbcTemplate.queryForObject(sql,new BeanPropertyRowMapper<>(ChangeInventoryForm.class));
         } catch (EmptyResultDataAccessException e) {
@@ -140,8 +140,8 @@ public class InventoryUCUtil {
         for (InventoryUnitChange change : dataList) {
             ChangeInventoryForm changeForm = getChangeForm(contractId, periodId, change.getFormNumber());
             if(changeForm==null){
-                String insertSql = "INSERT INTO s_change_inventory_form(id,contract_id,period_id,inventory_num,form_number,item_name,change_total,change_money,after_change_total,after_change_money,is_deleted) VALUES(?,?,?,?,?,?,?,?,?,?,?)";
-                jdbcTemplate.update(insertSql, SnowFlakeUtil.getId(), contractId, periodId,change.getInventoryNum(), change.getFormNumber(), change.getItemName(),
+                String insertSql = "INSERT INTO s_change_inventory_form(id,contract_id,period_id,change_id,inventory_num,form_number,item_name,change_total,change_money,after_change_total,after_change_money,is_deleted) VALUES(?,?,?,?,?,?,?,?,?,?,?)";
+                jdbcTemplate.update(insertSql, SnowFlakeUtil.getId(), contractId, periodId,change.getChangeId(),change.getInventoryNum(), change.getFormNumber(), change.getItemName(),
                         change.getChangePeriodUnit(), change.getChangePeriodAmount(), change.getChangeEndPeriodUnit(),
                         change.getChangeEndPeriodAmount(), 0);
             }else {

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ChangeTokenFormServiceImpl.java

@@ -531,6 +531,8 @@ public class ChangeTokenFormServiceImpl extends BaseServiceImpl<ChangeTokenFormM
             changeTokenInventoryService.deleteByTokenId(id);
             //删除附件
             attachmentFormService.deleteByMasterId(id);
+            String deleted="delete from s_change_inventory_form where change_id="+id;
+            jdbcTemplate.execute(deleted);
         }
     }
 
@@ -840,5 +842,8 @@ public class ChangeTokenFormServiceImpl extends BaseServiceImpl<ChangeTokenFormM
                 .eq(ChangeTokenForm::getId,id)
                 .set(ChangeTokenForm::getCommandStatus,0));
 
+        String deleted="delete from s_change_inventory_form where change_id="+id;
+        jdbcTemplate.execute(deleted);
+
     }
 }