diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
index 7bba39a0..5e9f6613 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
@@ -154,7 +154,9 @@ public class ArinvoicesController {
                             if (ObjectUtils.isNotEmpty(poundlistEntity)) {
                                 poundlistEntity.setSalesStatus("2");//修改磅单状态
                                 if (arinvoicesCrForm.getAmount() != null && arinvoicesCrForm.getInvoiceAmount() != null) {
-                                    if (arinvoicesCrForm.getInvoiceAmount().compareTo(arinvoicesCrForm.getAmount()) > -1) {
+                                    BigDecimal a = new BigDecimal(arinvoicesCrForm.getInvoiceAmount());
+                                    BigDecimal b = new BigDecimal(arinvoicesCrForm.getAmount());
+                                    if (a.compareTo(b) > -1) {
                                         poundlistEntity.setIsExpense("1");//修改销项票状态
                                     }
                                 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java
index 3aaff4aa..0f58088b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java
@@ -31,11 +31,11 @@ public class ArinvoicesCrForm  {
 
     /** 金额 **/
     @JsonProperty("amount")
-    private Integer amount;
+    private String amount;
 
     /** 数量 **/
     @JsonProperty("quantity")
-    private Integer quantity;
+    private String quantity;
 
     /** 币别  **/
     @JsonProperty("currency")
@@ -51,11 +51,11 @@ public class ArinvoicesCrForm  {
 
     /** 发票金额 **/
     @JsonProperty("invoiceAmount")
-    private Integer invoiceAmount;
+    private String invoiceAmount;
 
     /** 发票数量 **/
     @JsonProperty("invoiceQuantity")
-    private Integer invoiceQuantity;
+    private String invoiceQuantity;
 
     /** 销售订单号 **/
     @JsonProperty("salesOrderId")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java
index e138eeee..20ce13c3 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java
@@ -35,11 +35,11 @@ public class ArinvoicesInfoVO{
 
         /** 金额 **/
         @JsonProperty("amount")
-        private Integer amount;
+        private String amount;
 
         /** 数量 **/
         @JsonProperty("quantity")
-        private Integer quantity;
+        private String quantity;
 
         /** 币别  **/
         @JsonProperty("currency")
@@ -55,11 +55,11 @@ public class ArinvoicesInfoVO{
 
         /** 发票金额 **/
         @JsonProperty("invoiceAmount")
-        private Integer invoiceAmount;
+        private String invoiceAmount;
 
         /** 发票数量 **/
         @JsonProperty("invoiceQuantity")
-        private Integer invoiceQuantity;
+        private String invoiceQuantity;
 
         /** 销售订单号 **/
         @JsonProperty("salesOrderId")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java
index 9fdfabf9..2724a833 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java
@@ -38,11 +38,11 @@ public class ArinvoicesListVO{
 
     /** 金额 **/
     @JsonProperty("amount")
-    private Integer amount;
+    private String amount;
 
     /** 数量 **/
     @JsonProperty("quantity")
-    private Integer quantity;
+    private String quantity;
 
     /** 币别  **/
     @JsonProperty("currency")
@@ -61,11 +61,11 @@ public class ArinvoicesListVO{
 
     /** 发票金额 **/
     @JsonProperty("invoiceAmount")
-    private Integer invoiceAmount;
+    private String invoiceAmount;
 
     /** 发票数量 **/
     @JsonProperty("invoiceQuantity")
-    private Integer invoiceQuantity;
+    private String invoiceQuantity;
 
     /** 销售订单号 **/
     @JsonProperty("salesOrderId")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java
index 142fbb16..58a1a2ef 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java
@@ -37,12 +37,12 @@ public class ArinvoicesUpForm{
 
     /** 金额 **/
     @JsonProperty("amount")
-    private Integer amount;
+    private String amount;
 
 
     /** 数量 **/
     @JsonProperty("quantity")
-    private Integer quantity;
+    private String quantity;
 
 
     /** 币别  **/
@@ -62,12 +62,12 @@ public class ArinvoicesUpForm{
 
     /** 发票金额 **/
     @JsonProperty("invoiceAmount")
-    private Integer invoiceAmount;
+    private String invoiceAmount;
 
 
     /** 发票数量 **/
     @JsonProperty("invoiceQuantity")
-    private Integer invoiceQuantity;
+    private String invoiceQuantity;
 
 
     /** 销售订单号 **/
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
index 67b9394e..26c1ad2f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
@@ -663,30 +663,30 @@ public class SaleorderitemController {
 		}
 		vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class ));
 
-		List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id);
-		for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){
-		    QueryWrapper<Receiptout_item0Entity> queryWrapper = new QueryWrapper<>();
-		    queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutsoitemEntity.getId());
-		    List<Receiptout_item0Entity> list = receiptout_item0Service.list(queryWrapper);
-
-		}
-		vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class ));
-		List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id);
-		for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){
-		}
-		vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class ));
-		List<CollectionsoitemEntity> CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id);
-		for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){
-		}
-		vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class ));
-		List<SalesbacksoitemEntity> SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id);
-		for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){
-		}
-		vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class ));
-		List<PaymentsoitemEntity> PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id);
-		for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){
-		}
-		vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class ));
+//		List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id);
+//		for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){
+//		    QueryWrapper<Receiptout_item0Entity> queryWrapper = new QueryWrapper<>();
+//		    queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutsoitemEntity.getId());
+//		    List<Receiptout_item0Entity> list = receiptout_item0Service.list(queryWrapper);
+//
+//		}
+//		vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class ));
+//		List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id);
+//		for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){
+//		}
+//		vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class ));
+//		List<CollectionsoitemEntity> CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id);
+//		for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){
+//		}
+//		vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class ));
+//		List<SalesbacksoitemEntity> SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id);
+//		for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){
+//		}
+//		vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class ));
+//		List<PaymentsoitemEntity> PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id);
+//		for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){
+//		}
+//		vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class ));
     //副表
         return ActionResult.success(vo);
     }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java
index d49729c8..e1d08b06 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java
@@ -51,19 +51,19 @@ public class SaleorderitemCrForm  {
 
     /** 垫资金额 **/
     @JsonProperty("advanceAmount")
-    private Integer advanceAmount;
+    private String advanceAmount;
 
     /** 重量 **/
     @JsonProperty("num")
-    private Integer num;
+    private String num;
 
     /** 金额 **/
     @JsonProperty("price")
-    private Integer price;
+    private String price;
 
     /** 不含税金额 **/
     @JsonProperty("notPrice")
-    private Integer notPrice;
+    private String notPrice;
 
     /** 备注信息 **/
     @JsonProperty("remark")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
index e628e338..3c16104f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
@@ -53,19 +53,19 @@ public class SaleorderitemInfoVO{
 
         /** 垫资金额 **/
         @JsonProperty("advanceAmount")
-        private Integer advanceAmount;
+        private String advanceAmount;
 
         /** 重量 **/
         @JsonProperty("num")
-        private Integer num;
+        private String num;
 
         /** 金额 **/
         @JsonProperty("price")
-        private Integer price;
+        private String price;
 
         /** 不含税金额 **/
         @JsonProperty("notPrice")
-        private Integer notPrice;
+        private String notPrice;
 
         /** 备注信息 **/
         @JsonProperty("remark")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
index 0c497343..b0860956 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
@@ -52,19 +52,19 @@ public class SaleorderitemListVO{
 
     /** 垫资金额 **/
     @JsonProperty("advanceAmount")
-    private Integer advanceAmount;
+    private String advanceAmount;
 
     /** 重量 **/
     @JsonProperty("num")
-    private Integer num;
+    private String num;
 
     /** 金额 **/
     @JsonProperty("price")
-    private Integer price;
+    private String price;
 
     /** 不含税金额 **/
     @JsonProperty("notPrice")
-    private Integer notPrice;
+    private String notPrice;
 
     /** 备注信息 **/
     @JsonProperty("remark")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java
index 1518d825..a4698ff1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java
@@ -60,22 +60,22 @@ public class SaleorderitemUpForm{
 
     /** 垫资金额 **/
     @JsonProperty("advanceAmount")
-    private Integer advanceAmount;
+    private String advanceAmount;
 
 
     /** 重量 **/
     @JsonProperty("num")
-    private Integer num;
+    private String num;
 
 
     /** 金额 **/
     @JsonProperty("price")
-    private Integer price;
+    private String price;
 
 
     /** 不含税金额 **/
     @JsonProperty("notPrice")
-    private Integer notPrice;
+    private String notPrice;
 
 
     /** 备注信息 **/
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
index 9cefb2d9..70134be6 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
@@ -54,13 +54,13 @@
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
+            <el-col :span="8" >
                 <el-form-item  label="出库日期"
  prop="issueDate" >
                         <p>{{jnpf.dateFormat(dataForm.issueDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
+            <el-col :span="8" >
                 <el-form-item  label="单据状态"
  prop="status" >
                          <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
index d5cb0e3d..22f05b7f 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
@@ -333,6 +333,8 @@
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
           excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
 					if(a == this.dataForm.saleback_item0List[i].vehicleId){
+            debugger
+					  this.dataForm.saleback_item0List[i].vehicleId = b.vehicle_id;
             this.dataForm.saleback_item0List[i].materialId = b.material_id;
             this.dataForm.saleback_item0List[i].settlement = b.settlement;
             this.dataForm.saleback_item0List[i].unit = b.unit;
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index c1ee0e7d..9a32492d 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -655,7 +655,7 @@
                         salesbacksoitemList:[],
                         paymentsoitemList:[],
             },
-                            activemtmitd:'1',
+                            activemtmitd:'0',
             rules:
             {
                             contractCode: [
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index a09cd057..7e366600 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -58,8 +58,8 @@
                                     </el-button>
                                     <el-button type="text" icon="el-icon-delete" @click="invoicesEntry()" >发票录入
                                     </el-button>
-<!--                                    <el-button type="text" icon="el-icon-delete" @click="collection()" >回款-->
-<!--                                    </el-button>-->
+                                    <el-button type="text" icon="el-icon-delete" @click="collection()" >回款
+                                    </el-button>
                                     <el-button type="text" icon="el-icon-check" @click="archive()" >归档
                                     </el-button>
                                     <el-button type="text" icon="el-icon-check" @click="materialBack()" >退货
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
index 306f2e8a..cfe892cb 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
@@ -331,11 +331,12 @@
         return sums;
       },
 			popupSelectChange2(a, b){
-			  debugger
         var excludeFields = [];
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
           excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
-					if(a == this.dataForm.saleback_item0List[i].vehicleId){
+					if(a == this.dataForm.saleback_item0List[i].id){
+					  debugger
+            this.dataForm.saleback_item0List[i].vehicleId = b.vehicle_id;
 						this.dataForm.saleback_item0List[i].materialId = b.material_id;
 						this.dataForm.saleback_item0List[i].settlement = b.settlement;
 						this.dataForm.saleback_item0List[i].unit = b.unit;