优化

jinbooks-ui/src/views/settlement/carry-forward.vue

@@ -17,14 +17,14 @@
                     height="650"
                     @cell-mouse-enter="cellMouseEnter"
                     @cell-mouse-leave="cellMouseLeave">
-            <el-table-column label="编码" align="left" header-align="center" prop="code">
+            <el-table-column label="编码" align="left" header-align="center" prop="code"  width="150">
             </el-table-column>
             <el-table-column label="名称" align="left" header-align="center" prop="name">
             </el-table-column>
-            <el-table-column label="字头" align="center" prop="wordHead"/>
+            <el-table-column label="字头" align="center" prop="wordHead" width="80"/>
-            <el-table-column label="备注" align="left" prop="remark"/>
+            <el-table-column label="备注" align="left" prop="remark"  />
-            <el-table-column label="排序" align="left" prop="sortIndex" />
+            <el-table-column label="排序" align="left" prop="sortIndex"  width="80"/>
-            <el-table-column :label="$t('jbx.voucher.voucher')" align="center" prop="voucherId">
+            <el-table-column :label="$t('jbx.voucher.voucher')" align="center" prop="voucherId"   width="180">
               <template #default="scope">
                 <el-button v-if="scope.row.voucherId === null ||scope.row.voucherId ===''" type="primary"
                            @click="newVoucher(scope.row)">

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/ConfigSysService.java

@@ -110,6 +110,13 @@ public interface ConfigSysService {
     
     String getCurrentTermLastDateString(String bookId);
     
+    /**
+     * 账套上一期
+     * @param bookId
+     * @return
+     */
+    public String getPrevTerm(String bookId);
+    
     /**
      * 账套下一期
      * @param bookId

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/ConfigSysServiceImpl.java

@@ -139,6 +139,16 @@ public class ConfigSysServiceImpl implements ConfigSysService, ConfigService {
         return currentTerm;
     }
 
+    /**
+     * 获取下一期
+     */
+	@Override
+	public String getPrevTerm(String bookId) {
+		String currentTerm = getCurrentTerm(bookId);
+		YearMonth currentTermYearMonth = YearMonth.parse(currentTerm);
+		return currentTermYearMonth.minusMonths(1).toString();
+	}
+	
     /**
      * 获取下一期
      */

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java

@@ -140,11 +140,13 @@ public class SettlementCarryServiceImpl extends ServiceImpl<SettlementMapper, Se
 
         List<VoucherItemChangeDto> voucherItems = new ArrayList<>();
 
+        Map<String, VoucherTemplateItem> itemsMap = new HashMap<>();
+        for (VoucherTemplateItem item : items) {
+            itemsMap.put(item.getSubjectCode(), item);
+        }
+        
         if (voucherTemplate.getCode().startsWith("qm_jz_")) {
-            Map<String, VoucherTemplateItem> itemsMap = new HashMap<>();
+           
-            for (VoucherTemplateItem item : items) {
-                itemsMap.put(item.getSubjectCode(), item);
-            }
             //凭证 不转结
             voucherChangeDto.setCarryForward("y");
 
@@ -203,21 +205,79 @@ public class SettlementCarryServiceImpl extends ServiceImpl<SettlementMapper, Se
                 }
             }
         }else if (voucherTemplate.getCode().startsWith("jt_gz")||voucherTemplate.getCode().startsWith("jt_shebao")) {
+        	//计提本月
         	LambdaQueryWrapper<EmployeeSalarySummary> salaryWrapper = new LambdaQueryWrapper<>();
         	salaryWrapper.eq(EmployeeSalarySummary::getBelongDate, currentTerm);
         	salaryWrapper.eq(EmployeeSalarySummary::getBookId, bookId);
         	salaryWrapper.eq(EmployeeSalarySummary::getLabel, "salary");
         	salaryWrapper.eq(EmployeeSalarySummary::getDeleted, "n");
         	EmployeeSalarySummary summary = employeeSalarySummaryMapper.selectOne(salaryWrapper);
-        	 if (voucherTemplate.getCode().startsWith("jt_gz")){
+        	if(summary != null) {
-        		 for (VoucherTemplateItem item : items) {
+	        	 if (voucherTemplate.getCode().startsWith("jt_gz")){
-                     voucherItems.add(createVoucherItemDto(bookId, item, summary.getPayAmount()));
+	        		 for (VoucherTemplateItem item : items) {
-                 }
+	                     voucherItems.add(createVoucherItemDto(bookId, item, summary.getPayAmount()));
-        	 }else if (voucherTemplate.getCode().startsWith("jt_shebao")){
+	                 }
-        		 for (VoucherTemplateItem item : items) {
+	        	 }else if (voucherTemplate.getCode().startsWith("jt_shebao")){
-                     voucherItems.add(createVoucherItemDto(bookId, item, summary.getBusinessSocialInsurance()));
+	        		 for (VoucherTemplateItem item : items) {
-                 }
+	                     voucherItems.add(createVoucherItemDto(bookId, item, summary.getBusinessSocialInsurance()));
-        	 }
+	                 }
+	        	 }
+        	}
+        }else if (voucherTemplate.getCode().startsWith("zf_shebao")||voucherTemplate.getCode().startsWith("zf_gz")) {
+        	//支付上月
+        	String prevTerm = configSysService.getPrevTerm(bookId);
+        	LambdaQueryWrapper<EmployeeSalarySummary> salaryWrapper = new LambdaQueryWrapper<>();
+        	salaryWrapper.eq(EmployeeSalarySummary::getBelongDate, prevTerm);
+        	salaryWrapper.eq(EmployeeSalarySummary::getBookId, bookId);
+        	salaryWrapper.eq(EmployeeSalarySummary::getLabel, "salary");
+        	salaryWrapper.eq(EmployeeSalarySummary::getDeleted, "n");
+        	EmployeeSalarySummary summary = employeeSalarySummaryMapper.selectOne(salaryWrapper);
+        	if(summary != null) {
+	        	 if (voucherTemplate.getCode().startsWith("zf_gz")){
+	        		//银行存款计算
+	        		 BigDecimal creditYyckAmount = BigDecimal.ZERO;
+	        		 //应付职工薪酬
+	        		 if(itemsMap.containsKey("221101")) {
+	        			 debitAmount = summary.getPayAmount();
+	        			 creditYyckAmount = debitAmount;
+	        			 voucherItems.add(createVoucherItemDto(bookId, itemsMap.get("221101"), debitAmount));
+	        		 }
+	        		 //个人社保
+	        		 if(itemsMap.containsKey("122102")) {
+	        			 voucherItems.add(createVoucherItemDto(bookId, itemsMap.get("122102"), summary.getTotalSocialInsurance()));
+	        			 creditYyckAmount = creditYyckAmount.subtract(summary.getTotalSocialInsurance());
+	        		 }
+	        		 //个人所得税
+	        		 if(itemsMap.containsKey("222114")) {
+	        			 voucherItems.add(createVoucherItemDto(bookId, itemsMap.get("222114"), summary.getBusinessSocialInsurance()));
+	        			 creditYyckAmount = creditYyckAmount.subtract(summary.getBusinessSocialInsurance());
+	        		 }
+	        		 
+	        		 for (VoucherTemplateItem item : items) {
+	        			 if(item.getSubjectCode().startsWith("1002")) {
+	        				 voucherItems.add(createVoucherItemDto(bookId, item, creditYyckAmount));
+	        			 }
+	                 }
+	        		 creditAmount = debitAmount;
+	        	 }else if (voucherTemplate.getCode().startsWith("zf_shebao")){
+		        	if(itemsMap.containsKey("122102")) {
+		        		 //社保-个人
+		        		 debitAmount = debitAmount.add(summary.getTotalSocialInsurance());
+		        		 voucherItems.add(createVoucherItemDto(bookId, itemsMap.get("122102"), summary.getTotalSocialInsurance()));
+		        	}
+		        	if(itemsMap.containsKey("221103")) {
+		        		 //社保-单位
+		        		 debitAmount = debitAmount.add(summary.getBusinessSocialInsurance());
+		        		 voucherItems.add(createVoucherItemDto(bookId, itemsMap.get("221103"), summary.getBusinessSocialInsurance()));
+		        	}
+	        		 for (VoucherTemplateItem item : items) {
+	        			 if(item.getSubjectCode().startsWith("1002")) {
+	        				 voucherItems.add(createVoucherItemDto(bookId, item, debitAmount));
+	        			 }
+	                 }
+	        		 creditAmount = debitAmount;
+	        	 }
+        	}
         }else {
             for (VoucherTemplateItem item : items) {
                 voucherItems.add(createVoucherItemDto(bookId, item, BigDecimal.ZERO));

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementSubjectBalanceServiceImpl.java

@@ -72,6 +72,7 @@ public class StatementSubjectBalanceServiceImpl implements StatementSubjectBalan
         LambdaQueryWrapper<StatementSubjectBalance> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StatementSubjectBalance::getBookId, bookId);
         queryWrapper.eq(StatementSubjectBalance::getSubjectCode, subjectCode);
+        queryWrapper.eq(StatementSubjectBalance::getYearPeriod, configSysService.getCurrentTerm(bookId));
         return subjectBalanceMapper.selectOne(queryWrapper);
     }