diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
index e32cfcba..ff2100c2 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
@@ -378,7 +378,11 @@ public class ReceiptinController {
             List<Receiptin_item0Entity> Receiptin_item0List = JsonUtil.getJsonToList(receiptinUpForm.getReceiptin_item0List(),Receiptin_item0Entity.class);
             for(Receiptin_item0Entity entitys : Receiptin_item0List){
 
-
+            if (entitys.getUnit().equals("吨")){
+                entitys.setUnit("0");
+            }else if (entitys.getUnit().equals("千克")){
+                entitys.setUnit("1");
+            }
 
 
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
index a47f25b7..f468c0d1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
@@ -113,4 +113,7 @@ public class Receiptout_item0Entity  {
     @TableField("SALESORDERITEM_ID")
     private String salesorderitemId;
 
+    @TableField("VEHICLE_ID")
+    private String vehicleId;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
index ca2adcda..3c3be7db 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
@@ -66,5 +66,8 @@ public class Receiptout_item0Model  {
     @JsonProperty("deleteUserId")
     private String deleteUserId;
 
+    /** 磅单类型 **/
+    @JsonProperty("vehicleId")
+    private String vehicleId;
 
 }
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
index 455b9318..e03a3627 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
@@ -76,9 +76,10 @@
             </div>
     <el-table :data="dataForm.receiptin_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="licenseno" label="车牌号">
+
+            <el-table-column prop="vehicleId"  label="车牌号">
             <template slot-scope="scope">
-                            <p>{{scope.row.licenseno}}</p>
+                            <p>{{scope.row.vehicleId}}</p>
         </template>
         </el-table-column>
             <el-table-column prop="materialname" label="物料名称">
@@ -131,9 +132,9 @@
                             <p>{{scope.row.batchno}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="poundType" label="磅单类型">
+            <el-table-column prop="pountType" label="磅单类型">
             <template slot-scope="scope">
-                        <p>{{ scope.row.poundType | dynamicText(poundTypeOptions) }}</p>
+                        <p>{{ scope.row.pountType | dynamicText(pountTypeOptions) }}</p>
         </template>
         </el-table-column>
     </el-table>
@@ -186,7 +187,7 @@
 
                                     unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
                                     rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
-                                    poundTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
+              pountTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
         }
         },
         computed: {},
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
index 30596790..106b0c79 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
@@ -436,7 +436,7 @@
         for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
           excludeFields.push(this.dataForm.receiptin_item0List[i].vehicleId);
           if (a == this.dataForm.receiptin_item0List[i].vehicleId) {
-            this.dataForm.receiptin_item0List[i].ticketno = b.ticketno;
+            this.dataForm.receiptin_item0List[i].vehicleId = b.ticketno;
             this.dataForm.receiptin_item0List[i].materialname = b.material_name;
             this.dataForm.receiptin_item0List[i].reservoirareaId = b.in_area;
             this.dataForm.receiptin_item0List[i].warehouseId = b.name;
@@ -557,7 +557,7 @@
       },
       addreceiptin_item0List() {
         let item = {
-          licenseno: undefined,
+          vehicleId: undefined,
           materialname: undefined,
           reservoirareaId: undefined,
           warehouseId: undefined,
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
index 410ead96..e2a4c796 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
@@ -76,9 +76,9 @@
 <!--            </div>-->
     <el-table :data="dataForm.receiptout_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="licenseNo" label="车牌号">
+            <el-table-column prop="vehicleId" label="车牌号">
             <template slot-scope="scope">
-                            <p>{{scope.row.licenseNo}}</p>
+                            <p>{{scope.row.vehicleId}}</p>
         </template>
         </el-table-column>
             <el-table-column prop="materialName" label="物料名称">
@@ -86,12 +86,12 @@
                             <p>{{scope.row.materialName}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="reservoirareaId" label="库区id">
+            <el-table-column prop="reservoirareaId" label="库区名称">
             <template slot-scope="scope">
                             <p>{{scope.row.reservoirareaId}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="warehouseId" label="仓库id">
+            <el-table-column prop="warehouseId" label="仓库名称">
             <template slot-scope="scope">
                             <p>{{scope.row.warehouseId}}</p>
         </template>
@@ -131,9 +131,9 @@
                             <p>{{scope.row.batchNo}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="deleteUserId" label="磅单类型">
+            <el-table-column prop="poundType" label="磅单类型">
             <template slot-scope="scope">
-                        <p>{{ scope.row.deleteUserId | dynamicText(deleteUserIdOptions) }}</p>
+                        <p>{{ scope.row.poundType | dynamicText(deleteUserIdOptions) }}</p>
         </template>
         </el-table-column>
     </el-table>
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index a7e4529b..8ae9b8da 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -94,16 +94,26 @@
                     </div>
                     <el-table :data="dataForm.receiptout_item0List" size='mini' show-summary :summary-method="getSummaries">
                       <el-table-column type="index" width="50" label="序号" align="center" />
-                      <el-table-column prop="licenseNo" width="140" label="车牌号" align="center">
+<!--                      <el-table-column prop="licenseNo" width="140" label="车牌号" align="center">-->
+<!--                        <template slot-scope="scope">-->
+<!--                          <popupSelect v-model="scope.row.licenseNo" placeholder="请选择" clearable-->
+<!--                            :field="'licenseNo'+scope.$index" interfaceId="392933248017164229"-->
+<!--                            :bissId="dataForm.sourceNo" :excludeFields="excludeFields" :columnOptions="receiptout_item0licenseNocolumnOptions"-->
+<!--                            propsValue="license_num" relationField="license_num" popupType="dialog" popupWidth="800px"-->
+<!--                            hasPage :pageSize="20" @change="popupSelectlicenseNo">-->
+<!--                          </popupSelect>-->
+<!--                        </template>-->
+<!--                      </el-table-column>-->
+                      <el-table-column prop="vehicleId" width="140" label="车牌号" align="center">
                         <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.licenseNo" placeholder="请选择" clearable
-                            :field="'licenseNo'+scope.$index" interfaceId="392933248017164229"
-                            :bissId="dataForm.sourceNo" :excludeFields="excludeFields" :columnOptions="receiptout_item0licenseNocolumnOptions"
-                            propsValue="license_num" relationField="license_num" popupType="dialog" popupWidth="800px"
-                            hasPage :pageSize="20" @change="popupSelectlicenseNo">
+                          <popupSelect   v-model="scope.row.vehicleId"  :bissId="dataForm.sourceNo" :excludeFields="excludeFields"
+                                         placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="392933248017164229" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="vehicle_id" relationField="ticketno" popupType="dialog"
+                                         popupWidth="800px"
+                                         hasPage :pageSize="20"  @change="popupSelectlicenseNo">
                           </popupSelect>
                         </template>
                       </el-table-column>
+
                       <el-table-column prop="materialName" label="物料名称" width="140" align="center">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.materialName" placeholder="请输入" clearable :disabled="true">
@@ -293,12 +303,15 @@
           "id": "2"
         }],
 
-        receiptout_item0licenseNocolumnOptions: [{
+        receiptout_item0vehicleIdcolumnOptions: [{
           "label": "车辆号",
-          "value": "license_num"
+          "value": "ticketno"
         }, {
           "label": "库区名称",
           "value": "out_area"
+        }, {
+          "label": "仓库名称",
+          "value": "name"
         }, {
           "label": "物料名称",
           "value": "material_name"
@@ -416,8 +429,9 @@
         var num = 0;
         var amount = 0;
         for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
-          excludeFields.push(this.dataForm.receiptout_item0List[i].licenseNo);
-          if (a == this.dataForm.receiptout_item0List[i].licenseNo) {
+          excludeFields.push(this.dataForm.receiptout_item0List[i].vehicleId);
+          if (a == this.dataForm.receiptout_item0List[i].vehicleId) {
+            this.dataForm.receiptout_item0List[i].vehicleId = b.ticketno;
             this.dataForm.receiptout_item0List[i].materialName = b.material_name;
             this.dataForm.receiptout_item0List[i].deliveryNum = b.settlement;
             this.dataForm.receiptout_item0List[i].unit = b.unit;
@@ -428,6 +442,7 @@
             this.dataForm.receiptout_item0List[i].deleteUserId = b.pound_type;
             this.dataForm.receiptout_item0List[i].rateAmount = b.price * b.rate;
             this.dataForm.receiptout_item0List[i].reservoirareaId = b.out_area;
+            this.dataForm.receiptout_item0List[i].warehouseId = b.name;
           }
           num = num + parseFloat(this.dataForm.receiptout_item0List[i].deliveryNum);
           amount = amount + parseFloat(this.dataForm.receiptout_item0List[i].amount);
@@ -537,7 +552,7 @@
       },
       addreceiptout_item0List() {
         let item = {
-          licenseNo: undefined,
+          vehicleId: undefined,
           materialName: undefined,
           reservoirareaId: undefined,
           warehouseId: undefined,