From 3763a56f7bc9aead83a58dfcf6adf5d1a2dfa35e Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 8 Mar 2023 16:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=202023=E5=B9=B43=E6=9C=888=E6=97=A5=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/entity/RepairTransdetailEntity.java | 42 +++++++------- .../pms/entity/vo/RepairTransdetailVo.java | 56 ++++++++++--------- .../pms/mapper/RepairTransdetailMapper.java | 2 +- .../Impl/RepairTransdetailServiceImpl.java | 2 +- .../mapper/pms/RepairTransdetailMapper.xml | 39 ++----------- 5 files changed, 57 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailEntity.java b/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailEntity.java index 8a2b56c4..f1ac5e30 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailEntity.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/RepairTransdetailEntity.java @@ -1,6 +1,5 @@ package com.xujie.sys.modules.pms.entity; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -23,26 +22,25 @@ public class RepairTransdetailEntity implements Serializable { private Integer id; - @TableId - private String transno; + private String transNo; private String site; - private Float itemno; + private Float itemNo; - private String partno; + private String partNo; - private String locationid; + private String locationId; - private BigDecimal transqty; + private BigDecimal transQty; private String direction; - private String batchno; + private String batchNo; - private BigDecimal standcost; + private BigDecimal standCost; - private BigDecimal actualcost; + private BigDecimal actualCost; private BigDecimal price; @@ -50,31 +48,31 @@ public class RepairTransdetailEntity implements Serializable { private BigDecimal duty; - private String orderref1; + private String orderRef1; - private String orderref2; + private String orderRef2; - private String orderref3; + private String orderRef3; - private String orderref4; + private String orderRef4; - private String orderref5; + private String orderRef5; private String remark; - private String vitualpartflag; + private String vitualPartFlag; - private Date manufacturedate; + private Date manufactureDate; - private Date expireddate; + private Date expiredDate; - private String costgroupid; + private String costGroupId; - private BigDecimal transqty2; + private BigDecimal transQty2; - private String orderreftypeDb; + private String orderRefTypeDb; - private String orderreftype; + private String orderRefType; private String citemCode; diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/vo/RepairTransdetailVo.java b/src/main/java/com/xujie/sys/modules/pms/entity/vo/RepairTransdetailVo.java index f8e8cd26..4fd307e9 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/vo/RepairTransdetailVo.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/vo/RepairTransdetailVo.java @@ -1,7 +1,6 @@ package com.xujie.sys.modules.pms.entity.vo; -import com.baomidou.mybatisplus.annotation.TableId; import com.xujie.sys.common.utils.QueryPage; import lombok.Data; @@ -23,26 +22,25 @@ public class RepairTransdetailVo extends QueryPage implements Serializable { private Integer id; - @TableId - private String transno; + private String transNo; private String site; - private Float itemno; + private Float itemNo; - private String partno; + private String partNo; - private String locationid; + private String locationId; - private BigDecimal transqty; + private BigDecimal transQty; private String direction; - private String batchno; + private String batchNo; - private BigDecimal standcost; + private BigDecimal standCost; - private BigDecimal actualcost; + private BigDecimal actualCost; private BigDecimal price; @@ -50,31 +48,31 @@ public class RepairTransdetailVo extends QueryPage implements Serializable { private BigDecimal duty; - private String orderref1; + private String orderRef1; - private String orderref2; + private String orderRef2; - private String orderref3; + private String ordeRref3; - private String orderref4; + private String ordeRref4; - private String orderref5; + private String ordeRref5; private String remark; - private String vitualpartflag; + private String vitualPartFlag; - private Date manufacturedate; + private Date manufactureDate; - private Date expireddate; + private Date expiredDate; - private String costgroupid; + private String costgroupId; - private BigDecimal transqty2; + private BigDecimal transQty2; - private String orderreftypeDb; + private String orderRefTypeDb; - private String orderreftype; + private String orderRefType; private String citemCode; @@ -82,10 +80,16 @@ public class RepairTransdetailVo extends QueryPage implements Serializable { private String warehouseId; private String startTransDate; private String endTransDate; - private String batchNo; - private String locationId; - private String orderRef1; - private String partNo; private String userName; + + private String partDescription; + private String transType; + private String transDate; + + private String spec; + + private String supplierId; + + } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java index 6a1f52e4..31c3ab14 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java @@ -26,6 +26,6 @@ public interface RepairTransdetailMapper extends BaseMapper * @date: 2023/2/26 10:58 */ - IPage queryPage(Page objectPage,@Param("query") RepairTransdetailVo params); + IPage queryPage(Page objectPage,@Param("query") RepairTransdetailVo params); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java index d00e8759..c3426a32 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java @@ -16,7 +16,7 @@ public class RepairTransdetailServiceImpl extends ServiceImpl page = this.baseMapper.queryPage( + IPage page = this.baseMapper.queryPage( new Page<>( params.getPage(),params.getLimit()), params ); return new PageUtils(page); diff --git a/src/main/resources/mapper/pms/RepairTransdetailMapper.xml b/src/main/resources/mapper/pms/RepairTransdetailMapper.xml index ed4adff6..062cf3c0 100644 --- a/src/main/resources/mapper/pms/RepairTransdetailMapper.xml +++ b/src/main/resources/mapper/pms/RepairTransdetailMapper.xml @@ -3,41 +3,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select A.TransNo ,A.site,A.WarehouseID ,A.TransType ,A.UserName ,A.TransDate - ,B.PartNo ,B.LocationID ,B.TransQty ,B.BatchNo,B.ItemNo ,B.id ,C.spec + select A.TransNo Trans_No ,A.site,A.WarehouseID Warehouse_ID ,A.TransType Trans_Type + ,A.UserName User_Name,A.TransDate Trans_Date + ,B.PartNo Part_No ,B.LocationID Location_ID,B.TransQty Trans_Qty, + B.BatchNo Batch_No,B.ItemNo Item_No,B.id ,C.spec ,C.part_description,A.remark ,A.PartnerID as supplier_id,vcmv.supplier_name , A.OrderRef1 as order_ref1