1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -470,8 +470,8 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 expenseInfo.setStatusFlag(StatusEnum.COST_PAYMENT.getFlag());
                 expenseInfo.setStatus(StatusEnum.COST_PAYMENT.getName());
             }
-            //合同非粮款和库点费用自动分配的情况，未分配金额默认等于费用金额
-            if (("3".equals(expenseInfo.getCostType()) && "1".equals(expenseInfo.getExpensesPurpose())) || ("3".equals(expenseInfo.getExpensesPurpose()) && !"1".equals(expenseInfo.getAutoAssign())) || "7".equals(expenseInfo.getExpensesPurpose())|| ("7".equals(expenseInfo.getCostType()) && "1".equals(expenseInfo.getExpensesPurpose()))) {
+            //合同非粮款和库点费用非自动分配的情况，未分配金额默认等于费用金额
+            if (("3".equals(expenseInfo.getCostType()) && "1".equals(expenseInfo.getExpensesPurpose())) || ("3".equals(expenseInfo.getExpensesPurpose()) && "1".equals(expenseInfo.getAutoAssign())) || "7".equals(expenseInfo.getExpensesPurpose())|| ("7".equals(expenseInfo.getCostType()) && "1".equals(expenseInfo.getExpensesPurpose()))) {
                 expenseInfo.setUnallocatedAmount(expenseInfo.getAmountMoney());
             }
             //合同粮款校验