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] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?= =?UTF-8?q?=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