Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java

@@ -228,6 +228,14 @@ public class ContractFileController {
     @PostMapping("/ImportData")
     public ActionResult ImportData(@RequestBody ContractFileModel data) {
         List<ContractFileModel> dataList = JsonUtil.getJsonToList(data.getList(), ContractFileModel.class);
+        for (ContractFileModel model : dataList) {
+            if (model.getNum()==null||model.getNum().equals("0")){
+                return ActionResult.fail("合同导入数量是必填项");
+            }
+            if (model.getAmount()==null||model.getAmount().equals("0")){
+                return ActionResult.fail("合同导入金额是必填项");
+            }
+        }
         //导入数据
         ContractfileImportVO result = contractFileService.importData(dataList);
         return ActionResult.success(result);

SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java

@@ -127,4 +127,7 @@ public class SupplierEntity  {
     @TableField("IS_PAYMENT")
     private String isPayment;
 
+    @TableField("ERP_CODE")
+    private String erpCode;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java

@@ -115,6 +115,9 @@ public class SupplierCrForm  {
     @JsonProperty("lastModifyTime")
     private String lastModifyTime;
 
+    /** ERP编码 **/
+    @JsonProperty("erpCode")
+    private String erpCode;
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java

@@ -121,4 +121,7 @@ public class SupplierInfoVO{
         @JsonProperty("lastModifyTime")
         private Date  lastModifyTime;
 
+        /** ERP编码 **/
+        @JsonProperty("erpCode")
+        private String erpCode;
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java

@@ -145,6 +145,10 @@ public class SupplierListVO{
     @JsonProperty("lastModifyTime")
     private Date  lastModifyTime;
 
+    /** ERP编码 **/
+    @JsonProperty("erpCode")
+    private String erpCode;
+
 
     private BigDecimal settlemenSum;
 

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java

@@ -142,5 +142,9 @@ public class SupplierUpForm{
     @JsonProperty("lastModifyTime")
     private String lastModifyTime;
 
+    /** ERP编码 **/
+    @JsonProperty("erpCode")
+    private String erpCode;
+
 
 }

SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'审核'" :close-on-click-modal="false" append-to-body
+  <el-dialog :title="!dataForm.id ? '添加车辆图片' :  isDetail ? '添加车辆图片':'添加车辆图片'" :close-on-click-modal="false" append-to-body
              :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
     <el-row :gutter="15" class="">
       <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
@@ -18,6 +18,7 @@
               </JNPF-UploadImg>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
             <el-form-item label="物料名称" prop="materialId">
               <popupSelect disabled v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"
@@ -78,6 +79,11 @@
               <el-input-number disabled v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="毛重" prop="grossWeight">
               <el-input-number disabled v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
@@ -240,6 +246,7 @@
           advance: "0",
           transportPrice: 0,
           salesPrice: 0,
+          collectPrice: 0,
           purchasePrice: 0,
           businessId: "",
           naturalId: "",
@@ -313,6 +320,11 @@
             message: '请输入',
             trigger: 'blur'
           }, ],
+          collectPrice: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }, ],
           salesPrice: [{
             required: true,
             message: '请输入',

SC-web/src/views/scm/basicInformation/supplier/Detail.vue

@@ -109,6 +109,13 @@
                             <p>{{ dataForm.prepaid }}</p>
                         </el-form-item>
                     </el-col>
+C
+                  <el-col :span="12">
+                    <el-form-item label="ERP编码" prop="erpCode">
+                      <p>{{ dataForm.erpCode }}</p>
+                    </el-form-item>
+                  </el-col>
+
                 </template>
             </el-form>
         </el-row>
@@ -153,6 +160,7 @@ export default {
                 payable: '',
                 status: "1",
                 prepaid: '',
+                erpCode: '',
                 supplierSiteCode: '',
                 creatorTime: "",
                 lastModifyTime: "",

SC-web/src/views/scm/basicInformation/supplier/Form.vue

@@ -180,10 +180,16 @@
                     <el-col :span="12">
                         <el-form-item label="预付科目" prop="prepaid">
                             <el-input v-model="dataForm.prepaid" placeholder="请输入预付科目" clearable :style='{ "width": "100%" }'>
-
                             </el-input>
                         </el-form-item>
                     </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="ERP编码" prop="erpCode">
+                      <el-input v-model="dataForm.erpCode" placeholder="请输入ERP编码" clearable :style='{ "width": "100%" }'>
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+
                 </template>
             </el-form>
         </el-row>
@@ -227,6 +233,7 @@ export default {
                 payable: '',
                 status: "1",
                 prepaid: '',
+                erpCode: '',
                 supplierSiteCode: '',
                 creatorTime: "",
                 lastModifyTime: "",

SC-web/src/views/scm/basicInformation/supplier/index.vue

@@ -136,6 +136,8 @@
           </el-table-column>
 
           <el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable sortable="custom" />
+          <el-table-column prop="erpCode" label="ERP编码" width="120" align="center" sortable />
+
           <el-table-column label="操作" fixed="right" width="80">
             <template slot-scope="scope">
               <!--              <el-button type="text" v-has="'btn_edit'"-->
@@ -218,6 +220,7 @@ export default {
         { prop: 'prepaid', label: '预付科目' },
         { prop: 'isPayment', label: '是否付款' },
         { prop: 'status', label: '是否启用' },
+        { prop: 'erpCode', label: 'ERP编码' },
         { prop: 'supplierSiteCode', label: '供应商地点' }
       ],
       supplierLevelOptions: [{ 'fullName': '一级', 'id': '1' }, { 'fullName': '二级', 'id': '2' }, {

SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue

@@ -153,6 +153,14 @@
               </popupSelect>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
@@ -220,6 +228,7 @@
           poundlistNo: '',
           tareWeight: 0,
           grossWeight: 0,
+          collectPrice: 0,
           buckleWeight: 0,
           netWeight: 0,
           unit: "0",

SC-web/src/views/scm/basicInformation/tradeupload/Form.vue

@@ -155,6 +155,13 @@
               </popupSelect>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
@@ -223,6 +230,7 @@
           tareWeight: 0,
           grossWeight: 0,
           buckleWeight: 0,
+          collectPrice: 0,
           netWeight: 0,
           unit: "0",
           transportType: "0",
@@ -251,6 +259,7 @@
             message: '请选择合同',
             trigger: 'change'
           }, ],
+
           vehicleId: [{
             required: true,
             message: '请选择车辆',

SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue

@@ -180,6 +180,11 @@
               </popupSelect>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
@@ -240,6 +245,7 @@
           advance: "0",
           transportPrice: 0,
           salesPrice: 0,
+          collectPrice: 0,
           purchasePrice: 0,
           businessId: "",
           naturalId: "",

SC-web/src/views/scm/basicInformation/tradeupload/index.vue

@@ -117,6 +117,7 @@
           />
           <el-table-column prop="salesPrice" label="销售价格" width="150" align="center" sortable
           />
+          <el-table-column prop="collectPrice" sortable label="收货价格" width="150" align="center" />
           <el-table-column prop="businessName" label="业务员" width="120" align="center" sortable
           />
           <el-table-column prop="remark" label="备注" width="200" align="center" sortable
@@ -230,6 +231,10 @@
           { prop: 'transportType', label: '运输类型' },
           { prop: 'transportPrice', label: '运费' },
           { prop: 'salesPrice', label: '销售价格' },
+          {
+            prop: 'collectPrice',
+            label: '收货价格'
+          },
           { prop: 'creatorUserName', label: '业务员' },
           { prop: 'remark', label: '备注' }
         ],