款项确认移动位置后，合同审核款项保存调整

anrui-base/anrui-base-biz/pom.xml

@@ -89,6 +89,12 @@
             <version>4.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui.fin</groupId>
+            <artifactId>anrui-fin-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java

@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.common.base.config",
         "com.yxt.anrui.base"
 })
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin"})
 public class BaseApplication {
 
     public static void main(String[] args) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@@ -15,8 +15,8 @@ import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo;
 import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel;
 import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo;
 import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo;
-import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto;
-import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.StringUtils;
@@ -73,7 +73,7 @@ public class CommonContractRest implements CommonContractFeign {
     @Autowired
     private FileUploadComponent fileUploadComponent;
     @Autowired
-    private BusUncollectedReceivablesDetailedFeign busUncollectedReceivablesDetailedFeign;
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
     @Autowired
     private BusOrderFeign busOrderFeign;
 
@@ -141,32 +141,32 @@ public class CommonContractRest implements CommonContractFeign {
         String deposit = busOrderDepositVo.getDeposit();
         int fictitious = 1;
         for (BusOrderVehicleVo vehicleDto : vehicleDtos) {
-            BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDepositDto = new BusUncollectedReceivablesDetailedDto();
-            busUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
-            busUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金");
-            busUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit);
-            busUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo());
-            busUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid());
-            busUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName());
-            busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid());
-            busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile());
-            busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid());
-            busUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid());
-            busUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName());
-            busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto);
-            BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto();
-            busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
-            busUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款");
-            busUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price));
-            busUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo());
-            busUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid());
-            busUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName());
-            busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid());
-            busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile());
-            busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid());
-            busUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid());
-            busUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName());
-            busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto);
+            FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDepositDto = new FinUncollectedReceivablesDetailedDto();
+            finUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
+            finUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金");
+            finUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit);
+            finUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo());
+            finUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid());
+            finUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName());
+            finUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid());
+            finUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile());
+            finUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid());
+            finUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid());
+            finUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName());
+            finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDepositDto);
+            FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedSingleDto = new FinUncollectedReceivablesDetailedDto();
+            finUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
+            finUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款");
+            finUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price));
+            finUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo());
+            finUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid());
+            finUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName());
+            finUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid());
+            finUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile());
+            finUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid());
+            finUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid());
+            finUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName());
+            finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto);
         }
         return rb.success().setData(commonContract.getSid());
     }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "对应金蝶系统的科目类别表")
 @FeignClient(
-        contextId = "anrui_fin-FinAccountCategory",
-        name = "anrui_fin",
+        contextId = "anrui-fin-FinAccountCategory",
+        name = "anrui-fin",
         path = "finaccountcategory",
         fallback = FinAccountCategoryFeignFallback.class)
 public interface FinAccountCategoryFeign {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = " 对应金蝶系统的核算维度表")
 @FeignClient(
-        contextId = "anrui_fin-FinAccountingDimension",
-        name = "anrui_fin",
+        contextId = "anrui-fin-FinAccountingDimension",
+        name = "anrui-fin",
         path = "finaccountingdimension",
         fallback = FinAccountingDimensionFeignFallback.class)
 public interface FinAccountingDimensionFeign {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "对应金蝶系统的会计要素表")
 @FeignClient(
-        contextId = "anrui_fin-FinAccountingElements",
-        name = "anrui_fin",
+        contextId = "anrui-fin-FinAccountingElements",
+        name = "anrui-fin",
         path = "finaccountingelements",
         fallback = FinAccountingElementsFeignFallback.class)
 public interface FinAccountingElementsFeign {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java

@@ -26,8 +26,8 @@ import java.util.List;
  */
 @Api(tags = "公司开票申请单")
 @FeignClient(
-        contextId = "anrui_fin-FinGinvoiceapply",
-        name = "anrui_fin",
+        contextId = "anrui-fin-FinGinvoiceapply",
+        name = "anrui-fin",
         path = "v1/finginvoiceapply",
         fallback = FinGinvoiceapplyFeignFallback.class)
 public interface FinGinvoiceapplyFeign {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java

@@ -26,8 +26,8 @@ import java.util.List;
  */
 @Api(tags = "公司开票申请单开票信息")
 @FeignClient(
-        contextId = "anrui_fin-FinGinvoiceapplyInfo",
-        name = "anrui_fin",
+        contextId = "anrui-fin-FinGinvoiceapplyInfo",
+        name = "anrui-fin",
         path = "v1/finginvoiceapplyinfo",
         fallback = FinGinvoiceapplyInfoFeignFallback.class)
 public interface FinGinvoiceapplyInfoFeign {