Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -365,9 +365,9 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                     setModifyDate(nowDate);
                     setId(textbookWarehouseRecord.getId());
                     setIssuedNumber(ObjectUtils.isEmpty(textbookWarehouseRecord.getIssuedNumber()) ? 0 : textbookWarehouseRecord.getIssuedNumber()
-                             + confirmNumber);
+                             + textbookWarehouseRecords.getConfirmNumber());
                     setRemainNumber(ObjectUtils.isEmpty(textbookWarehouseRecord.getRemainNumber()) ? 0 : textbookWarehouseRecord.getRemainNumber()
-                            - confirmNumber
+                            - textbookWarehouseRecords.getConfirmNumber()
                     );
                 }});
 
@@ -419,10 +419,10 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 textbookIssueRecord.setDataItemId(wfTextbookClaimItem.getId());
                 textbookIssueRecord.setTextbookWarehouseRecordId(textbookWarehouseRecords.getTextbookWarehouseRecordId());
                 textbookIssueRecord.setTextbookId(wfTextbookClaimItem.getTextbookId());
-                textbookIssueRecord.setIssueNumber(confirmNumber);
+                textbookIssueRecord.setIssueNumber(textbookWarehouseRecords.getConfirmNumber());
                 textbookIssueRecord.setRecedeNumber(0);
-                textbookIssueRecord.setActualIssueNumber(confirmNumber);
-                textbookIssueRecord.setActualTotalPrice(textbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(confirmNumber)));
+                textbookIssueRecord.setActualIssueNumber(textbookWarehouseRecords.getConfirmNumber());
+                textbookIssueRecord.setActualTotalPrice(textbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(textbookWarehouseRecords.getConfirmNumber())));
                 if(ObjectUtils.isNotEmpty(dto.getReceiveUserId())){
                     textbookIssueRecord.setReceiveUserId(dto.getReceiveUserId());
                 }else {