diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialCrForm.java index 85aa8301..89e5618b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialCrForm.java @@ -85,7 +85,7 @@ public class MaterialCrForm { /** 读取时间 **/ @JsonProperty("readDate") - private String readDate; + private Long readDate; /** 错误信息 **/ @JsonProperty("errorMessage") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialInfoVO.java index faa3ff0f..6f76aec5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialInfoVO.java @@ -89,7 +89,7 @@ public class MaterialInfoVO{ /** 读取时间 **/ @JsonProperty("readDate") - private String readDate; + private Long readDate; /** 错误信息 **/ @JsonProperty("errorMessage") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java index 2d8f67ef..0fea9986 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java @@ -107,8 +107,9 @@ public class MaterialListVO{ /** 读取时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("readDate") - private String readDate; + private Date readDate; /** 错误信息 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialUpForm.java index 900fbed6..f4c86132 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialUpForm.java @@ -105,7 +105,7 @@ public class MaterialUpForm{ /** 读取时间 **/ @JsonProperty("readDate") - private String readDate; + private Long readDate; /** 错误信息 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index a0f1f1e2..84ab1e27 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -52,7 +52,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Slf4j @RestController @@ -87,11 +87,11 @@ public class TradeuploadController { //处理id字段转名称,若无需转或者为空可删除 for(TradeuploadEntity entity:list){ Map materialCodeMap = new HashMap<>(); - entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap)); - Map salesNameMap = new HashMap<>(); - entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap)); - Map licenseNoMap = new HashMap<>(); - entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap)); + entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap)); + Map salesNameMap = new HashMap<>(); + entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap)); + Map licenseNoMap = new HashMap<>(); + entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap)); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); } @@ -210,8 +210,8 @@ public class TradeuploadController { case "transportType" : entitys.add(new ExcelExportEntity("运输方式" ,"transportType")); break; - case "departmentId" : - entitys.add(new ExcelExportEntity("运费" ,"departmentId")); + case "transportPrice" : + entitys.add(new ExcelExportEntity("运费" ,"transportPrice")); break; case "licenseNo" : entitys.add(new ExcelExportEntity("车号" ,"licenseNo")); @@ -243,8 +243,8 @@ public class TradeuploadController { case "vehiclePictures" : entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures")); break; - case "creatorusername" : - entitys.add(new ExcelExportEntity("制单人" ,"creatorusername")); + case "creatorUserName" : + entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName")); break; default: break; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java index 3c500554..778ddb62 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data @TableName("jg_poundlist") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java index 7ee41c9b..241a8f57 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本: V3.2.0 * 版权: LINKAGE-BOOT * 作者: LINKAGE-BOOT研发团队 - * 日期: 2023-01-05 + * 日期: 2023-01-09 */ public interface TradeuploadMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java index d91d638e..b349a683 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadCrForm { @@ -48,8 +48,8 @@ public class TradeuploadCrForm { private String transportType; /** 运费 **/ - @JsonProperty("departmentId") - private Integer departmentId; + @JsonProperty("transportPrice") + private Integer transportPrice; /** 车号 **/ @JsonProperty("licenseNo") @@ -92,8 +92,8 @@ public class TradeuploadCrForm { private String vehiclePictures; /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java index e49fbd3a..bb076b76 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadInfoVO{ @@ -52,8 +52,8 @@ public class TradeuploadInfoVO{ private String transportType; /** 运费 **/ - @JsonProperty("departmentId") - private Integer departmentId; + @JsonProperty("transportPrice") + private Integer transportPrice; /** 车号 **/ @JsonProperty("licenseNo") @@ -96,7 +96,7 @@ public class TradeuploadInfoVO{ private String vehiclePictures; /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListQuery.java index 6b9dfce5..4f07a8b3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java index 385e2329..74250825 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadListVO{ @@ -59,8 +59,8 @@ public class TradeuploadListVO{ /** 运费 **/ - @JsonProperty("departmentId") - private Integer departmentId; + @JsonProperty("transportPrice") + private Integer transportPrice; /** 车号 **/ @JsonProperty("licenseNo") @@ -109,8 +109,8 @@ public class TradeuploadListVO{ /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java index 24a04968..650c6ee8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadPagination extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java index 94d4fd12..07f9ab4f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java index 5ee61ff9..05d8b540 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java @@ -15,7 +15,7 @@ import lombok.Data; * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 - * @日期: 2023-01-05 + * @日期: 2023-01-09 */ @Data public class TradeuploadUpForm{ @@ -59,8 +59,8 @@ public class TradeuploadUpForm{ /** 运费 **/ - @JsonProperty("departmentId") - private Integer departmentId; + @JsonProperty("transportPrice") + private Integer transportPrice; /** 车号 **/ @@ -114,8 +114,8 @@ public class TradeuploadUpForm{ /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/TradeuploadService.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/TradeuploadService.java index f1b53659..da5a0068 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/TradeuploadService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/TradeuploadService.java @@ -10,7 +10,7 @@ import java.util.*; * 版本: V3.2.0 * 版权: LINKAGE-BOOT * 作者: LINKAGE-BOOT研发团队 - * 日期: 2023-01-05 + * 日期: 2023-01-09 */ public interface TradeuploadService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java index 6e5aae15..4d64044e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; * 版本: V3.2.0 * 版权: LINKAGE-BOOT * 作者: LINKAGE-BOOT研发团队 - * 日期: 2023-01-05 + * 日期: 2023-01-09 */ @Service public class TradeuploadServiceImpl extends ServiceImpl implements TradeuploadService{ diff --git a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue index 4bb43f23..25c966b0 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue @@ -139,7 +139,7 @@ :style='{"width":"100%"}'> - + @@ -416,16 +416,16 @@ }, ], }, currencyOptions: [{ - "fullName": "CNY", - "id": "CNY" + "fullName": "人民币", + "id": "0" }, { - "fullName": "USD", - "id": "USD" + "fullName": "美元", + "id": "1" }, { - "fullName": "EUR", - "id": "EUR" + "fullName": "英镑", + "id": "2" }], - + contractTypeOptions: [{ "fullName": "采购合同", "id": "1" diff --git a/SC-web/src/views/scm/basicInformation/material/Form.vue b/SC-web/src/views/scm/basicInformation/material/Form.vue index 73b42494..e85fa5df 100644 --- a/SC-web/src/views/scm/basicInformation/material/Form.vue +++ b/SC-web/src/views/scm/basicInformation/material/Form.vue @@ -147,11 +147,11 @@ - + - +