采购管理

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpContractPageVO.java

@@ -51,11 +51,11 @@ public class DrpContractPageVO {
    @ApiModelProperty("创建人")
    private String createBy;
    @ApiModelProperty("创建时间")
-   private LocalDateTime crtime;
+   private LocalDateTime createTime;
    @ApiModelProperty("更新人")
-   private String upby;
+   private String updateBy;
    @ApiModelProperty("更新时间")
-   private LocalDateTime uptime;
+   private LocalDateTime updateTime;
    @ApiModelProperty("审批人")
    private String approveBy;
    @ApiModelProperty("审批完成时间")
@@ -175,18 +175,6 @@ public class DrpContractPageVO {
       return this.remark;
    }
 
-   public LocalDateTime getCrtime() {
-      return this.crtime;
-   }
-
-   public String getUpby() {
-      return this.upby;
-   }
-
-   public LocalDateTime getUptime() {
-      return this.uptime;
-   }
-
    public String getApproveBy() {
       return this.approveBy;
    }
@@ -315,18 +303,6 @@ public class DrpContractPageVO {
       this.remark = remark;
    }
 
-   public void setCrtime(final LocalDateTime crtime) {
-      this.crtime = crtime;
-   }
-
-   public void setUpby(final String upby) {
-      this.upby = upby;
-   }
-
-   public void setUptime(final LocalDateTime uptime) {
-      this.uptime = uptime;
-   }
-
    public void setApproveBy(final String approveBy) {
       this.approveBy = approveBy;
    }
@@ -394,4 +370,28 @@ public class DrpContractPageVO {
    public void setCreateBy(String createBy) {
       this.createBy = createBy;
    }
+
+   public LocalDateTime getCreateTime() {
+      return createTime;
+   }
+
+   public void setCreateTime(LocalDateTime createTime) {
+      this.createTime = createTime;
+   }
+
+   public String getUpdateBy() {
+      return updateBy;
+   }
+
+   public void setUpdateBy(String updateBy) {
+      this.updateBy = updateBy;
+   }
+
+   public LocalDateTime getUpdateTime() {
+      return updateTime;
+   }
+
+   public void setUpdateTime(LocalDateTime updateTime) {
+      this.updateTime = updateTime;
+   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpExcelInquiryVO.java

@@ -36,7 +36,7 @@ public class DrpExcelInquiryVO implements Serializable {
    @ApiModelProperty("决标时间")
    private String bidTime;
    @ApiModelProperty("制表时间")
-   private String crtime;
+   private String createTime;
 
    public String getInquiryId() {
       return this.inquiryId;
@@ -90,10 +90,6 @@ public class DrpExcelInquiryVO implements Serializable {
       return this.bidTime;
    }
 
-   public String getCrtime() {
-      return this.crtime;
-   }
-
    public void setInquiryId(final String inquiryId) {
       this.inquiryId = inquiryId;
    }
@@ -146,7 +142,11 @@ public class DrpExcelInquiryVO implements Serializable {
       this.bidTime = bidTime;
    }
 
-   public void setCrtime(final String crtime) {
+   public String getCreateTime() {
-      this.crtime = crtime;
+      return createTime;
+   }
+
+   public void setCreateTime(String createTime) {
+      this.createTime = createTime;
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpFinalBidsQuotePageVO.java

@@ -39,7 +39,7 @@ public class DrpFinalBidsQuotePageVO implements Serializable {
    @ApiModelProperty("指导价格")
    private Integer guidePrice;
    @ApiModelProperty("定价时间")
-   private LocalDateTime crtime;
+   private LocalDateTime createTime;
 
    public String getImageUrl() {
       return SysUtil.getCutFileUrl(this.imageUrl);
@@ -93,10 +93,6 @@ public class DrpFinalBidsQuotePageVO implements Serializable {
       return this.guidePrice;
    }
 
-   public LocalDateTime getCrtime() {
-      return this.crtime;
-   }
-
    public void setInquiryDetailId(final Long inquiryDetailId) {
       this.inquiryDetailId = inquiryDetailId;
    }
@@ -149,7 +145,11 @@ public class DrpFinalBidsQuotePageVO implements Serializable {
       this.guidePrice = guidePrice;
    }
 
-   public void setCrtime(final LocalDateTime crtime) {
+   public LocalDateTime getCreateTime() {
-      this.crtime = crtime;
+      return createTime;
+   }
+
+   public void setCreateTime(LocalDateTime createTime) {
+      this.createTime = createTime;
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpPurPlanDetailPageVO.java

@@ -53,7 +53,7 @@ public class DrpPurPlanDetailPageVO {
    @ApiModelProperty("供应商id")
    private Long supllerId;
    @ApiModelProperty("创建时间")
-   private LocalDateTime crtime;
+   private LocalDateTime createTime;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("货品首选供应商id")
@@ -159,10 +159,6 @@ public class DrpPurPlanDetailPageVO {
       return this.supllerId;
    }
 
-   public LocalDateTime getCrtime() {
-      return this.crtime;
-   }
-
    public String getRemark() {
       return this.remark;
    }
@@ -291,10 +287,6 @@ public class DrpPurPlanDetailPageVO {
       this.supllerId = supllerId;
    }
 
-   public void setCrtime(final LocalDateTime crtime) {
-      this.crtime = crtime;
-   }
-
    public void setRemark(final String remark) {
       this.remark = remark;
    }
@@ -342,4 +334,12 @@ public class DrpPurPlanDetailPageVO {
    public void setCertName(final String certName) {
       this.certName = certName;
    }
+
+   public LocalDateTime getCreateTime() {
+      return createTime;
+   }
+
+   public void setCreateTime(LocalDateTime createTime) {
+      this.createTime = createTime;
+   }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/domain/vo/DrpQuoteComparisonDetailVO.java

@@ -33,7 +33,7 @@ public class DrpQuoteComparisonDetailVO {
    @ApiModelProperty("指导价格")
    private Integer guidePrice;
    @ApiModelProperty("定价时间")
-   private LocalDateTime crtime;
+   private LocalDateTime createTime;
    @ApiModelProperty("说明")
    private String remark;
    @ApiModelProperty("图片")
@@ -93,10 +93,6 @@ public class DrpQuoteComparisonDetailVO {
       return this.guidePrice;
    }
 
-   public LocalDateTime getCrtime() {
-      return this.crtime;
-   }
-
    public String getRemark() {
       return this.remark;
    }
@@ -157,10 +153,6 @@ public class DrpQuoteComparisonDetailVO {
       this.guidePrice = guidePrice;
    }
 
-   public void setCrtime(final LocalDateTime crtime) {
-      this.crtime = crtime;
-   }
-
    public void setRemark(final String remark) {
       this.remark = remark;
    }
@@ -180,4 +172,12 @@ public class DrpQuoteComparisonDetailVO {
    public void setRecentMarketPrice(final Integer recentMarketPrice) {
       this.recentMarketPrice = recentMarketPrice;
    }
+
+   public LocalDateTime getCreateTime() {
+      return createTime;
+   }
+
+   public void setCreateTime(LocalDateTime createTime) {
+      this.createTime = createTime;
+   }
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpInspectGoodsMapper.xml

@@ -93,7 +93,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY a.crtime DESC
+        ORDER BY a.create_time DESC
     </select>
 <!--    <select id="sumInspectQualifiedNum" resultType="java.math.BigDecimal">-->
 <!--        SELECT sum(inspect_qualified_num)-->

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProcurementContractMapper.xml

@@ -41,10 +41,10 @@
             and dpc.supplier_id = #{content.supplierId}
         </if>
         <if test="content.crtimeStart != null">
-            and dpc.crtime <![CDATA[ >= ]]> #{content.crtimeStart}
+            and dpc.create_time <![CDATA[ >= ]]> #{content.crtimeStart}
         </if>
         <if test="content.crtimeEnd != null">
-            and dpc.crtime <![CDATA[ <= ]]> #{content.crtimeEnd}
+            and dpc.create_time <![CDATA[ <= ]]> #{content.crtimeEnd}
         </if>
         <if test="content.areaIdList != null and content.areaIdList.size() > 0">
             and ac.area_id in
@@ -52,7 +52,7 @@
                 #{areaId}
             </foreach>
         </if>
-        order by dpc.crtime desc
+        order by dpc.create_time desc
     </select>
 
     <select id="getDetailListByContractId" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpContractDetailVO">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpProductionPlanMapper.xml

@@ -107,7 +107,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY a.crtime DESC
+        ORDER BY a.create_time DESC
     </select>
     <select id="materialCount" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpProductionPlanMaterialCountVO">
         SELECT mm.material_name,

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpPurPlanDetailMapper.xml

@@ -23,7 +23,7 @@
                dppd.inventory_num,
                dppd.unit_price,
                dppd.purchasing_budget_price,
-               ( SELECT single_price FROM drp_order_goods_detail dogd where dogd.material_id =  dppd.material_id  order by crtime desc limit 1) AS lastPurMaterialPrice,
+               ( SELECT single_price FROM drp_order_goods_detail dogd where dogd.material_id =  dppd.material_id  order by create_time desc limit 1) AS lastPurMaterialPrice,
                 ast.stall_name,
                 ast.stall_id,
                dms1.supplier_id,

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpPurchaseInquiryDetailMapper.xml

@@ -40,7 +40,7 @@
         a.unit_id,
         c.unit_name,
         b.image_url,
-        dd.guide_price,dd.crtime
+        dd.guide_price,dd.create_time
         from drp_inquiry_detail a left join menu_material b on b.material_id = a.material_id
         left join drp_unit c on c.unit_id = a.unit_id
         left join menu_material_category d on d.category_id = b.category_id
@@ -48,17 +48,17 @@
         SELECT
         dmgp.material_id,
         dmgp.guide_price,
-        dmgp.crtime
+        dmgp.create_time
         FROM
         drp_material_guide_price dmgp
         JOIN (
         SELECT
         material_id,
-        MAX(crtime) AS max_crtime
+        MAX(create_time) AS max_crtime
         FROM
         drp_material_guide_price
         GROUP BY material_id
-        ) max_times ON dmgp.material_id = max_times.material_id AND dmgp.crtime = max_times.max_crtime
+        ) max_times ON dmgp.material_id = max_times.material_id AND dmgp.create_time = max_times.max_crtime
         ) as dd ON a.material_id = dd.material_id
         WHERE
         a.inquiry_id = #{content.inquiryId}

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpPurchaseInquiryMapper.xml

@@ -103,7 +103,7 @@
             </if>
         </if>
 
-        order by a.crtime desc
+        order by a.create_time desc
     </select>
 
     <select id="selectByQuoteDTO" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpQuotePageVO">
@@ -147,7 +147,7 @@
             or a.title like concat('%',#{content.keyword},'%')
             )
         </if>
-        order by a.crtime desc
+        order by a.create_time desc
     </select>
 
     <select id="selectExcelInquiry" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpExcelInquiryVO">
@@ -163,7 +163,7 @@
                a.supplier_id,
                c.supplier_name,
                a.bid_time,
-               a.crtime
+               a.create_time
         from drp_inquiry a
                  left join drp_supplier c on c.supplier_id = a.supplier_id
         where a.inquiry_id = #{inquiryId}

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpPurchaseInquirySupplierMapper.xml

@@ -76,8 +76,8 @@
         <foreach collection="bidStatusList" item="bidStatus" separator="," open="(" close=")">
             #{bidStatus}
         </foreach>
-        AND b.crtime <![CDATA[ >= ]]>  CONCAT(#{content.startTime},' 0:00:00')
+        AND b.create_time <![CDATA[ >= ]]>  CONCAT(#{content.startTime},' 0:00:00')
-        AND b.crtime <![CDATA[ <= ]]>  CONCAT(#{content.endTime},' 23:59:59')
+        AND b.create_time <![CDATA[ <= ]]>  CONCAT(#{content.endTime},' 23:59:59')
         <if test="supplierAuthority != null">
             AND a.supplier_id = #{supplierAuthority}
         </if>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply.purchase/DrpPurchaseMaterialWinBidRecordsMapper.xml

@@ -74,10 +74,10 @@
             </if>
         </if>
         <if test="content.startTime != null">
-            and dmlp.crtime >= #{content.startTime}
+            and dmlp.create_time >= #{content.startTime}
         </if>
         <if test="content.endTime != null">
-            and dmlp.crtime  <![CDATA[ <= ]]> #{content.endTime}
+            and dmlp.create_time  <![CDATA[ <= ]]> #{content.endTime}
         </if>
 
     </select>
@@ -98,7 +98,7 @@
         <if test="materialInquiryId != null">
          and a.material_inquiry_id=  #{materialInquiryId}
         </if>
-        order by a.crtime desc
+        order by a.create_time desc
     </select>
     <select id="listSupplierPriceByMaterialId"
             resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpMaterialBidRecordsSupplierVO">
@@ -133,7 +133,7 @@
         a.material_id,
         b.unit_id,
         a.win_price,
-        ROW_NUMBER() OVER (PARTITION BY a.material_id ORDER BY a.crtime DESC) AS rn
+        ROW_NUMBER() OVER (PARTITION BY a.material_id ORDER BY a.create_time DESC) AS rn
         FROM
         drp_material_win_bid_records a
         LEFT JOIN menu_material b ON a.material_id = b.material_id
@@ -159,7 +159,7 @@
         FROM drp_material_win_bid_records a
         LEFT JOIN drp_supplier b ON b.supplier_id = a.win_supplier_id
         WHERE a.material_id = #{materialId}
-        order by a.crtime desc
+        order by a.create_time desc
         limit 1
     </select>
     <select id="listSupplierPriceByMaterialIdList" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpMaterialBidRecordsSupplierVO">
@@ -183,7 +183,7 @@
         a.bid_validity_start_time,
         a.bid_validity_end_time,
         a.material_inquiry_id,
-        ROW_NUMBER() OVER ( PARTITION BY a.material_id ORDER BY a.crtime DESC ) AS row_num
+        ROW_NUMBER() OVER ( PARTITION BY a.material_id ORDER BY a.create_time DESC ) AS row_num
         FROM
         drp_material_win_bid_records a
         LEFT JOIN drp_supplier b ON b.supplier_id = a.win_supplier_id
@@ -197,7 +197,7 @@
     </select>
     <select id="getLastOrderGoodsPrice"
             resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpLastOrderGoodsVO">
-        select dogd.single_price as lastOrderGoodsPrice, dog.crtime as lastOrderGoodsDate,
+        select dogd.single_price as lastOrderGoodsPrice, dog.create_time as lastOrderGoodsDate,
         dog.supplier_id as lastOrderGoodsSupplierId, ds.supplier_name as lastOrderGoodsSupplierName
         from drp_order_goods_detail dogd
         left join drp_order_goods dog on dogd.order_goods_id = dog.order_goods_id
@@ -206,7 +206,7 @@
         and dog.order_status = 2
         and dog.del_flag = 0
         and dog.approve_status = 3
-        order by dog.crtime desc
+        order by dog.create_time desc
         limit 1
     </select>
 
@@ -217,7 +217,7 @@
         where dmpd.material_id = #{materialId} and dmpd.unit_id = #{unitId}
         and dmp.del_flag = 0
         and dmp.commit_status = 2
-        order by dmp.crtime desc
+        order by dmp.create_time desc
         limit 3
     </select>
 
@@ -277,13 +277,13 @@
     <select id="getLastOrderGoodsPriceList" resultType="com.bonus.canteen.core.supply.purchase.domain.vo.DrpLastOrderGoodsVO">
         select * from (
         select dogd.single_price                                                             as lastOrderGoodsPrice,
-               dog.crtime                                                                    as lastOrderGoodsDate,
+               dog.create_time                                                                    as lastOrderGoodsDate,
                dog.supplier_id                                                               as lastOrderGoodsSupplierId,
                ds.supplier_name                                                              as lastOrderGoodsSupplierName,
                dogd.order_goods_id                                                           as orderGoodsId,
                 dogd.material_id                                                              as materialId,
                 dogd.unit_id                                                                  as unitId,
-               ROW_NUMBER() OVER ( PARTITION BY dogd.material_id ORDER BY dogd.crtime DESC ) AS rn
+               ROW_NUMBER() OVER ( PARTITION BY dogd.material_id ORDER BY dogd.create_time DESC ) AS rn
         from drp_order_goods_detail dogd
                  left join drp_order_goods dog on dogd.order_goods_id = dog.order_goods_id
                  left join drp_supplier ds on dog.supplier_id = ds.supplier_id
@@ -311,7 +311,7 @@
                dmp.harvest_source,
                dmpd.material_id                                                             as materialId,
                dmpd.unit_id                                                                 as unitId,
-               ROW_NUMBER() OVER ( PARTITION BY dmpd.material_id ORDER BY dmp.crtime DESC ) AS rn
+               ROW_NUMBER() OVER ( PARTITION BY dmpd.material_id ORDER BY dmp.create_time DESC ) AS rn
         from drp_market_price_detail dmpd
                  left join drp_market_price dmp on dmpd.harvest_id = dmp.harvest_id
                  left join alloc_area ac on dmp.area_id = ac.area_id