From 2d5b67fa7e1bf5778656613925919809ca6beb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 14 Mar 2023 19:29:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SalebackController.java | 39 +++++++++++++++++++ .../jnpf/saleback/entity/SalebackEntity.java | 2 + .../saleback/entity/Saleback_item0Entity.java | 27 +++++++++++++ .../jnpf/saleback/mapper/SalebackMapper.java | 6 +++ .../model/saleback/Saleback_item0Model.java | 34 ++++++++++++++++ .../saleback/service/SalebackService.java | 3 ++ .../service/impl/SalebackServiceImpl.java | 6 ++- .../mapper/saleback/SalebackMapper.xml | 24 ++++++++++++ .../scm/basicInformation/saleback/Form.vue | 2 +- .../saleorder/salebackForm.vue | 2 +- 10 files changed, 142 insertions(+), 3 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java index 72171fa6..ae14f1a9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java @@ -344,6 +344,7 @@ public class SalebackController { List jg_salesback_item0List = salebackService.GetSaleback_item0List(id); List jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class); for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){ + Map licenseNumMap = new HashMap<>(); jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap)); Map materialIdMap = new HashMap<>(); @@ -364,6 +365,44 @@ public class SalebackController { return ActionResult.success(vo); } + /** + * 表单信息(详情页) + * + * @param id + * @return + */ + @GetMapping("/detail2/{id}") + public ActionResult detailInfo2(@PathVariable("id") String id){ + SalebackEntity entity= salebackService.getInfo(id); + SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class); + List saleback_item0Models = salebackService.querySaleBackItemInfo(id); + + + //子表数据转换 +// List jg_salesback_item0List = salebackService.GetSaleback_item0List(id); + List jg_salesback_item0ModelList = JsonUtil.getJsonToList(saleback_item0Models,Saleback_item0Model.class); +// for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){ +// +// Map licenseNumMap = new HashMap<>(); +// jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap)); +// Map materialIdMap = new HashMap<>(); +// jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap)); +// Map businessIdMap = new HashMap<>(); +// jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap)); +// } + vo.setSaleback_item0List(jg_salesback_item0ModelList); + + +// vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class)); + +//添加到详情表单对象中 + Map salesOrderIdMap = new HashMap<>(); + vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",vo.getSalesOrderId(),salesOrderIdMap)); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + + return ActionResult.success(vo); + } + diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java index 97920346..2a797dfd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java @@ -94,4 +94,6 @@ public class SalebackEntity { @TableField(exist = false) private String saledocumentNo; + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java index b620a00c..de458ee4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -110,5 +111,31 @@ public class Saleback_item0Entity { @TableField("MATERIAL_ID") private String materialId; + /** 客户 **/ + @TableField(exist = false) + private String customerName; + + /** 是否垫资 **/ + @TableField(exist = false) + private String advance; + + /** 含税单价 **/ + @TableField(exist = false) + private String salesPrice; + + /** 净重 **/ + @TableField(exist = false) + private String netWeight; + + /** 磅单图片 **/ + @TableField(exist = false) + private String poundPictures; + + /** 车辆图片 **/ + @TableField(exist = false) + private String vehiclePictures; + + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java index 988e057d..d2c76f11 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java @@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.saleback.entity.SalebackEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.saleback.entity.Saleback_item0Entity; import jnpf.saleback.model.saleback.SalebackPagination; +import jnpf.saleback.model.saleback.Saleback_item0Model; import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * * saleback @@ -20,4 +24,6 @@ import org.apache.ibatis.annotations.Param; */ public interface SalebackMapper extends BaseMapper { IPage querySaleBack(@Param("page") Page page, @Param("salebackPagination") SalebackPagination salebackPagination); + + List querySaleBackItem(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java index e1a9a032..fd85cb14 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java @@ -1,5 +1,6 @@ package jnpf.saleback.model.saleback; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -61,5 +62,38 @@ public class Saleback_item0Model { @JsonProperty("salesorderItem0Id") private String salesorderItem0Id; + /** 客户 **/ + @JsonProperty("customerName") + private String customerName; + + /** 是否垫资 **/ + @JsonProperty("advance") + private String advance; + + /** 含税单价 **/ + @JsonProperty("salesPrice") + private String salesPrice; + + /** 净重 **/ + @JsonProperty("netWeight") + private String netWeight; + + /** 磅单图片 **/ + @JsonProperty("poundPictures") + private String poundPictures; + + /** 车辆图片 **/ + @JsonProperty("vehiclePictures") + private String vehiclePictures; + + /** 制单时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + + /** 不含税金额 **/ + @JsonProperty("noPrice") + private String noPrice; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java index d2b53aca..7cd800ae 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java @@ -4,6 +4,8 @@ import jnpf.saleback.entity.Saleback_item0Entity; import jnpf.saleback.entity.SalebackEntity; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.saleback.model.saleback.SalebackPagination; +import jnpf.saleback.model.saleback.Saleback_item0Model; + import java.util.*; /** * @@ -32,6 +34,7 @@ public interface SalebackService extends IService { // 子表方法 List GetSaleback_item0List(String id); + List querySaleBackItemInfo(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java index 387c7e33..dacaa2c6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java @@ -2,6 +2,7 @@ package jnpf.saleback.service.impl; import jnpf.saleback.entity.*; import jnpf.saleback.mapper.SalebackMapper; +import jnpf.saleback.model.saleback.Saleback_item0Model; import jnpf.saleback.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.util.RandomUtil; @@ -265,7 +266,10 @@ public class SalebackServiceImpl extends ServiceImpl querySaleBackItemInfo(String id) { + return salebackMapper.querySaleBackItem(id); + } } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml index 4853257b..c4ea6f0c 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml @@ -26,4 +26,28 @@ and a.creator_time > #{salebackPagination.startDate} AND a.POUND_DATE <= #{salebackPagination.endDate} + + + diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue index c722b8e2..038809e7 100644 --- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue @@ -337,9 +337,9 @@ this.dataForm.saleback_item0List[i].price = b.sales_price; this.dataForm.saleback_item0List[i].rate = b.rate; this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement; - this.dataForm.saleback_item0List[i].pountUser = b.business_id; this.dataForm.saleback_item0List[i].pountType = b.pound_type; this.dataForm.saleback_item0List[i].businessId = b.business_id; + this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId; this.rateOptions.find((item) => { if (this.dataForm.saleback_item0List[i].rate == item.id) { this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100 diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue index 3fa8c20b..c89b6e60 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue @@ -342,9 +342,9 @@ this.dataForm.saleback_item0List[i].price = b.sales_price; this.dataForm.saleback_item0List[i].rate = b.rate; this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement; - this.dataForm.saleback_item0List[i].pountUser = b.business_id; this.dataForm.saleback_item0List[i].pountType = b.pound_type; this.dataForm.saleback_item0List[i].businessId = b.business_id; + this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId; this.rateOptions.find((item) => { if (this.dataForm.saleback_item0List[i].rate == item.id) { this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100 From be917b8b38d40be81ec0d1fc5dff22890d645088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Wed, 15 Mar 2023 08:13:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CollectionController.java | 109 +++++++++++++++--- .../scm/basicInformation/collection/index.vue | 4 +- 2 files changed, 94 insertions(+), 19 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index b97b8f95..fab92f7f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -91,12 +91,12 @@ public class CollectionController { return ActionResult.success(result); } - /** +/* *//** * 提交 * * @param ids * @return - */ + *//* @PostMapping("/commit/{ids}") @Transactional public ActionResult commit(@PathVariable("ids") String ids) { @@ -175,7 +175,7 @@ public class CollectionController { } } return ActionResult.fail("请选择一条数据"); - } + }*/ /** * 认款 @@ -189,24 +189,99 @@ public class CollectionController { String[] idList = ids.split(","); for (String id : idList) { CollectionEntity collectionEntity = collectionService.getInfo(id); - if (ObjectUtils.isNotEmpty(collectionEntity)) { - if (collectionEntity.getStatus().equals("0")) { - return ActionResult.fail("请先提交"); - } - if (collectionEntity.getStatus().equals("2")) { - return ActionResult.fail("已认款，无需再次提交"); - } - if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) { - return ActionResult.fail("请先输入收款金额"); + if (collectionEntity.getStatus().equals("1")){ + return ActionResult.fail("已提交"); + } + if (collectionEntity.getStatus().equals("2")){ + return ActionResult.fail("已认款"); + } + if (collectionEntity.getStatus().equals("0")) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id); + List collection_item0EntityList = collection_item0Service.list(queryWrapper);//查询收款单子表信息 + for (Collection_item0Entity collection_item0Entity : collection_item0EntityList) { + BigDecimal sum = new BigDecimal(0); + SaleorderitemEntity saleordercetEntity = saleorderitemService.getById(collection_item0Entity.getSalesorderId());//查询销售订单信息 + if (saleordercetEntity.getAmountCollected() == null) { + saleordercetEntity.setAmountCollected(new BigDecimal(0)); + } +// if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())) { +// return ActionResult.fail("已回款金额等于金额"); +// } + if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) { + return ActionResult.fail("请先输入回款金额"); + } else { + sum = saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount()); + if (sum.compareTo(saleordercetEntity.getPrice()) > 0) { + return ActionResult.fail("总回款金额大于金额"); + } + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleordercetEntity.getId()); + List list = salesorder_item0Service.list(queryWrapper1); + List poundlist = new ArrayList<>(); + for (Salesorder_item0Entity saleItem : list){ + PoundlistEntity poundlistEntity = collectionService.queryPoundInfo(saleItem.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + poundlist.add(poundlistEntity); + } + } + if (poundlist.size() > 0) { + poundlist = poundlist.stream().sorted(Comparator.comparing(PoundlistEntity::getAdvance).reversed() + .thenComparing(Comparator.comparing(PoundlistEntity::getPoundDate))).collect(Collectors.toList()); + }else{ + return ActionResult.fail("磅单为空"); + } + BigDecimal amount = new BigDecimal(0); + List poundlist1 = new ArrayList<>(); + for (PoundlistEntity pound : poundlist){ + if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) { + amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement())); + if (amount.compareTo(sum) < 1) { + poundlist1.add(pound); + }else{ + break; + } + } + } + for (PoundlistEntity poundlistEntity : poundlist1){ + poundlistEntity.setIsCollection("1"); + if (poundlistEntity.getPaymentDate() == null){ + poundlistEntity.setPaymentDate(new Date()); + } + poundlistService.updateById(poundlistEntity); + } + saleordercetEntity.setAmountCollected(sum); +// saleordercetEntity.setStatus("3"); + saleorderitemService.updateById(saleordercetEntity); + collectionEntity.setStatus("2"); + collectionService.updateById(collectionEntity); + return ActionResult.success("认款成功"); } - collectionEntity.setStatus("2"); - collectionService.updateById(collectionEntity); - return ActionResult.success("认款成功"); - } else { - return ActionResult.fail("数据为空"); } } return ActionResult.fail("请选择一条数据"); +// String[] idList = ids.split(","); +// for (String id : idList) { +// CollectionEntity collectionEntity = collectionService.getInfo(id); +// if (ObjectUtils.isNotEmpty(collectionEntity)) { +// if (collectionEntity.getStatus().equals("0")) { +// return ActionResult.fail("请先提交"); +// } +// if (collectionEntity.getStatus().equals("2")) { +// return ActionResult.fail("已认款，无需再次提交"); +// } +// if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) { +// return ActionResult.fail("请先输入收款金额"); +// } +// collectionEntity.setStatus("2"); +// collectionService.updateById(collectionEntity); +// return ActionResult.success("认款成功"); +// } else { +// return ActionResult.fail("数据为空"); +// } +// } +// return ActionResult.fail("请选择一条数据"); } /** * 列表 diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue index 9707a012..0800dc89 100644 --- a/SC-web/src/views/scm/basicInformation/collection/index.vue +++ b/SC-web/src/views/scm/basicInformation/collection/index.vue @@ -40,8 +40,8 @@ - 提交 - + + 认款 From e980bfbcfd9b27a40c931f5b2d581056c6adab79 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Wed, 15 Mar 2023 08:39:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=A3=85=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/poundlist/model/poundlist/PoundlistCrForm.java | 7 +++++++ .../jnpf/poundlist/model/poundlist/PoundlistInfoVO.java | 5 +++++ .../jnpf/poundlist/model/poundlist/PoundlistListVO.java | 7 +++++++ .../jnpf/poundlist/model/poundlist/PoundlistUpForm.java | 4 +++- .../java/jnpf/tradeupload/entity/TradeuploadEntity.java | 3 +++ .../tradeupload/model/tradeupload/TradeuploadCrForm.java | 3 +++ .../tradeupload/model/tradeupload/TradeuploadInfoVO.java | 3 +++ .../tradeupload/model/tradeupload/TradeuploadListVO.java | 4 ++++ .../tradeupload/model/tradeupload/TradeuploadUpForm.java | 4 ++++ 9 files changed, 39 insertions(+), 1 deletion(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java index 75ca3470..9be55a00 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java @@ -2,7 +2,10 @@ package jnpf.poundlist.model.poundlist; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; + +import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -139,6 +142,10 @@ public class PoundlistCrForm { @JsonProperty("remark") private String remark; + /** 创建时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java index 742ae672..454a1c74 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java @@ -143,4 +143,9 @@ public class PoundlistInfoVO{ @JsonProperty("remark") private String remark; + /** 创建时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java index 84190088..c91c166d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java @@ -212,6 +212,8 @@ public class PoundlistListVO{ @JsonProperty("rate") private String rate; + + @JsonProperty("vehicleName") private String vehicleName; @@ -238,4 +240,9 @@ public class PoundlistListVO{ @TableField("salesId") private String salesId; + /** 创建时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java index 5a506ead..36eb08eb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java @@ -169,5 +169,7 @@ public class PoundlistUpForm{ @JsonProperty("remark") private String remark; - + /** 创建时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; } \ No newline at end of file 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 9e1c442f..16d38c11 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 @@ -187,6 +187,9 @@ public class TradeuploadEntity { @TableField("IS_EXPENSE") private String isExpense; + @TableField("COLLECT_PRICE") + private BigDecimal collectPrice; + @TableField(exist = false) private String materialName; 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 5d595f80..7cfc560f 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 @@ -156,5 +156,8 @@ public class TradeuploadCrForm { @JsonProperty("isExamine") private String isExamine; + /** 收货单价 **/ + @JsonProperty("collectPrice") + private String collectPrice; } \ No newline at end of file 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 a9829a3e..bcd0e0ba 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 @@ -129,4 +129,7 @@ public class TradeuploadInfoVO{ @JsonProperty("isExamine") private String isExamine; + /** 收货单价 **/ + @JsonProperty("collectPrice") + private String collectPrice; } \ No newline at end of file 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 b2ef39e5..b949a5a0 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 @@ -181,4 +181,8 @@ public class TradeuploadListVO{ @JsonProperty("naturalName") private String naturalName; + + /** 收货单价 **/ + @JsonProperty("collectPrice") + private String collectPrice; } \ No newline at end of file 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 cc486b83..592d938b 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 @@ -147,5 +147,9 @@ public class TradeuploadUpForm{ @JsonProperty("isExamine") private String isExamine; + /** 收货单价 **/ + @JsonProperty("collectPrice") + private String collectPrice; + } \ No newline at end of file From 2c96cfa04bb12fab2b8af8afed3281665a689e2e Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Wed, 15 Mar 2023 11:27:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/contractfile/ContractFileListQuery.java | 6 ++++++ .../model/contractfile/ContractFileListQueryModel.java | 2 ++ .../model/contractfile/ContractFilePagination.java | 6 ++++++ .../service/impl/ContractFileServiceImpl.java | 9 +++++++++ 4 files changed, 23 insertions(+) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQuery.java index 6443ebca..1deb469e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQuery.java @@ -19,6 +19,12 @@ public class ContractFileListQuery extends Pagination { /** 合同名称 */ private String contractName; + + /** 供应商/客户名 **/ + private String name; + + /** 合同类型 **/ + private String contractType; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java index b15e1484..fbee4182 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java @@ -14,6 +14,8 @@ public class ContractFileListQueryModel { // @JsonProperty("name") private String name; + /** 合同类型 **/ + private String contractType; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java index 355e20f7..5cf6bc32 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java @@ -20,6 +20,12 @@ public class ContractFilePagination extends Pagination { /** 合同名称 */ private String contractName; + + /** 供应商/客户名 **/ + private String name; + + /** 合同类型 **/ + private String contractType; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index bb4dbcbe..5cb439e9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -144,6 +144,15 @@ public class ContractFileServiceImpl extends ServiceImpl 0) { contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList); } From 23b5aac2031588e0f1235dc031a647eb0e20dca8 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Wed, 15 Mar 2023 11:28:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/basicInformation/collection/Form.vue | 2 +- .../basicInformation/contractfile/index.vue | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue index 97349bd8..47b75047 100644 --- a/SC-web/src/views/scm/basicInformation/collection/Form.vue +++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue @@ -32,7 +32,7 @@ - + diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue index d75c4217..8086c599 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue @@ -14,10 +14,32 @@ + + 查询 重置 + + 展开 + + + 收起 + @@ -137,10 +159,13 @@ }, data() { return { + showAll: false, detailVisible: false, query: { contractCode: undefined, - contractName: undefined + contractName: undefined, + name: undefined, + contractType: undefined }, treeProps: { children: 'children',