diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java
index dcf7c901..fd2c5fec 100644
--- a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java
+++ b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java
@@ -152,11 +152,36 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn {
                         String number = yem_em_replace.getString("number");
                         if (number.equals("CNY")) {
                             temp.set("yem_creditrmbamt", bigDecimal);
-                            temp.set("yem_koujiancny", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
                         }
                         if (number.equals("USD")) {
                             temp.set("yem_creditusdamt", bigDecimal);
-                            temp.set("yem_koujianusd", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
+                            if ("CNY".equals(number)) {
+                                temp.set("yem_koujianusd", bigDecimal);
+                            } else if ("USD".equals(number)) {
+                                temp.set("yem_koujianusd", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
+                                temp.set("yem_koujiancny", yemCreditrmbamt);
+                            }
+                        }
+                        if (yemCurrency != null) {
+                /*
+                  （1）如果结算币别=美元：
+                  ①　扣减后金额（美元）=上次美元金额（实际）+ 配件资金池增加金额-配件资金池扣减金额；
+                  ②　扣减后金额（人民币）= 上次人民币金额（实际）；
+                  （2）如果结算币别=人民币：
+                   ①　扣减后金额（美元）=上次美元金额（实际）；
+                   ②　扣减后金额（人民币）= 上次人民币金额（实际）+ 配件资金池增加金额-配件资金池扣减金额；
+                 */
+
+                            String numbers = yemCurrency.getString("number");
+//                BigDecimal yemCreditusdamt = temp.getBigDecimal("yem_creditusdamt");//上次美元金额（实际）
+//                            BigDecimal yemCreditrmbamt = temp.getBigDecimal("yem_creditrmbamt");//上次人民币金额（实际）
+                            if ("CNY".equals(numbers)) {
+                                temp.set("yem_koujianusd", bigDecimal);
+                                temp.set("yem_koujiancny", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
+                            } else if ("USD".equals(numbers)) {
+                                temp.set("yem_koujianusd", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
+                                temp.set("yem_koujiancny", bigDecimal);
+                            }
                         }
                     }
                 }
@@ -176,6 +201,8 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn {
                     }
                 }
             }
+
+
         }
         SaveServiceHelper.update(temp);
     }