diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java index 13ff68ad..3e8def88 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java +++ b/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 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); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java index 1782777a..088e4a3c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java +++ b/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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java index 469b9810..113dab6b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java +++ b/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; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java index 25bfb903..e3b83532 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java +++ b/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; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java index 623bfc66..23ab1b6b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java +++ b/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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java index f0eb34a0..d1606579 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java +++ b/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; + } \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue index d93d816f..4713dffa 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue @@ -1,5 +1,5 @@ @@ -153,6 +160,7 @@ export default { payable: '', status: "1", prepaid: '', + erpCode: '', supplierSiteCode: '', creatorTime: "", lastModifyTime: "", diff --git a/SC-web/src/views/scm/basicInformation/supplier/Form.vue b/SC-web/src/views/scm/basicInformation/supplier/Form.vue index b3c48b57..3d7c9440 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/Form.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/Form.vue @@ -180,10 +180,16 @@ - + + + + + + + @@ -227,6 +233,7 @@ export default { payable: '', status: "1", prepaid: '', + erpCode: '', supplierSiteCode: '', creatorTime: "", lastModifyTime: "", diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue index da1669b7..8b7e4a12 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/index.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue @@ -136,6 +136,8 @@ + +