备件出入库信息 2023年3月8日 sxm

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;
 

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;
+
+
 }

src/main/java/com/xujie/sys/modules/pms/mapper/RepairTransdetailMapper.java

@@ -26,6 +26,6 @@ public interface RepairTransdetailMapper extends BaseMapper<RepairTransdetailEnt
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.xujie.pms.entity.RepairTransdetailEntity>
      * @date: 2023/2/26 10:58
      */
-    IPage<RepairTransdetailEntity> queryPage(Page<Object> objectPage,@Param("query") RepairTransdetailVo params);
+    IPage<RepairTransdetailVo> queryPage(Page<Object> objectPage,@Param("query") RepairTransdetailVo params);
 
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/RepairTransdetailServiceImpl.java

@@ -16,7 +16,7 @@ public class RepairTransdetailServiceImpl extends ServiceImpl<RepairTransdetailM
 
     @Override
     public PageUtils queryPage(RepairTransdetailVo params) {
-        IPage<RepairTransdetailEntity> page = this.baseMapper.queryPage(
+        IPage<RepairTransdetailVo> page = this.baseMapper.queryPage(
                 new Page<>( params.getPage(),params.getLimit()), params
         );
         return new PageUtils(page);

src/main/resources/mapper/pms/RepairTransdetailMapper.xml

@@ -3,41 +3,12 @@
 
 <mapper namespace="com.xujie.sys.modules.pms.mapper.RepairTransdetailMapper">
 
-    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.xujie.sys.modules.pms.entity.RepairTransdetailEntity" id="repairTransdetailMap">
-        <result property="id" column="id"/>
-        <result property="transno" column="TransNo"/>
-        <result property="site" column="Site"/>
-        <result property="itemno" column="ItemNo"/>
-        <result property="partno" column="PartNo"/>
-        <result property="locationid" column="LocationID"/>
-        <result property="transqty" column="TransQty"/>
-        <result property="direction" column="Direction"/>
-        <result property="batchno" column="BatchNo"/>
-        <result property="standcost" column="StandCost"/>
-        <result property="actualcost" column="ActualCost"/>
-        <result property="price" column="Price"/>
-        <result property="freight" column="Freight"/>
-        <result property="duty" column="Duty"/>
-        <result property="orderref1" column="OrderRef1"/>
-        <result property="orderref2" column="OrderRef2"/>
-        <result property="orderref3" column="OrderRef3"/>
-        <result property="orderref4" column="OrderRef4"/>
-        <result property="orderref5" column="OrderRef5"/>
-        <result property="remark" column="Remark"/>
-        <result property="vitualpartflag" column="VitualPartFlag"/>
-        <result property="manufacturedate" column="ManufactureDate"/>
-        <result property="expireddate" column="ExpiredDate"/>
-        <result property="costgroupid" column="CostGroupID"/>
-        <result property="transqty2" column="TransQty2"/>
-        <result property="orderreftypeDb" column="OrderRefType_DB"/>
-        <result property="orderreftype" column="OrderRefType"/>
-        <result property="citemCode" column="citem_code"/>
-    </resultMap>
-    <select id="queryPage" resultType="com.xujie.sys.modules.pms.entity.RepairTransdetailEntity">
+    <select id="queryPage" resultType="com.xujie.sys.modules.pms.entity.vo.RepairTransdetailVo">
 
-        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