客户、供应商基础增删查改导出接口编写

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/org/OrgController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,12 +45,12 @@ public class OrgController extends BaseController {
     /**
      * 查询客户/供应商列表
      */
-    @PreAuthorize("@ss.hasPermi('docAsn:docAsn:list')")
+    @PreAuthorize("@ss.hasPermi('base:customer:list')")
     @GetMapping("/list")
     public TableDataInfo list(OrgDTO orgDTO) {
-        startPage();
+        PageUtils.pageStart();
         List<OrgDTO> orgList = orgSevice.getOrgDTOList(orgDTO);
-        return getDataTable(orgList);
+        return PageUtils.getDataTable(orgList);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/bean/entity/WarewmsExtEntity.java

@@ -19,16 +19,16 @@ public class WarewmsExtEntity extends WarewmsEntity {
     @TableId
     private String id;
 
-    @TableField(value = "create_by",fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     private String creator;
 
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     private Date createDate;
 
-    @TableField(value = "update_by",fill = FieldFill.INSERT_UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updater;
 
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateDate;
 
     private String remark;

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -1,17 +1,24 @@
 package com.ruoyi.common.utils;
 
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.utils.sql.SqlUtil;
 
+import java.util.List;
+
 /**
  * 分页工具类
- * 
+ *
  * @author ruoyi
  */
 public class PageUtils extends PageHelper
 {
+    private static Page page;
+
     /**
      * 设置请求分页数据
      */
@@ -27,4 +34,30 @@ public class PageUtils extends PageHelper
             PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
         }
     }
+
+/****************************************************************/
+    /**
+     * 设置请求分页数据
+     */
+    public static void pageStart() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        /*pageDomain.setPageSize(pageSize);
+        pageDomain.setPageNum(pageNum);*/
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            Boolean reasonable = pageDomain.getReasonable();
+            page = PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+        }
+    }
+
+    public static TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/dto/OrgDTO.java

@@ -20,7 +20,7 @@ public class OrgDTO extends WarewmsExtDTO {
     private String orgName;
 
     /**
-     * 客户/供应商状态 1-启动 0-停用
+     * 客户/供应商状态 0-启动 1-停用
      */
     private String orgStatus;
 

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/entity/OrgEntity.java

@@ -17,59 +17,49 @@ public class OrgEntity extends WarewmsExtEntity {
     /**
      * 客户/供应商编码
      */
-    @TableField(value = "org_code")
     private String orgCode;
 
     /**
      * 客户/供应商全称
      */
-    @TableField(value = "org_name")
     private String orgName;
 
     /**
      * 客户/供应商状态 1-启动 0-停用
      */
-    @TableField(value = "org_status")
     private String orgStatus;
 
     /**
      * 通信地址
      */
-    @TableField(value = "org_address")
     private String orgAddress;
 
     /**
      * 联系人
      */
-    @TableField(value = "org_contacts")
     private String orgContacts;
 
 
     /**
      * 联系电话
      */
-    @TableField(value = "org_phone")
     private String orgPhoneNum;
 
     /**
      * 开户行
      */
-    @TableField(value = "org_deposit_bank")
     private String orgAccountsBank;
 
     /**
      * 企业统一代码
      */
-    @TableField(value = "org_unified_code")
     private String orgCreditCode;
 
-
     /**
      * 组织类型 00客户，10供应商
      *
      * @see com.ruoyi.base.constant.type.BizEnum.OrgType#getCode()
      */
-    @TableField(value = "org_servicer_type")
     private String orgType;
 
 

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/mapper/OrgMapper.java

@@ -4,7 +4,11 @@ import com.ruoyi.ams.bionutrition.org.bean.entity.OrgEntity;
 import com.ruoyi.framework.mapper.WarewmsMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface OrgMapper extends WarewmsMapper<OrgEntity> {
 
+    List<OrgEntity> selectOrgs(Map<String, Object> beanToMap);
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/service/impl/OrgServiceImpl.java

@@ -16,7 +16,9 @@ import com.ruoyi.common.utils.ConvertUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.service.impl.CrudServiceImpl;
 import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Arrays;
 import java.util.List;
@@ -26,10 +28,13 @@ import java.util.Objects;
 @Service
 public class OrgServiceImpl extends CrudServiceImpl<OrgMapper, OrgEntity, OrgDTO> implements IOrgSevice {
 
+    @Autowired
+    private OrgMapper orgMapper;
 
     @Override
     public List<OrgDTO> getOrgDTOList(OrgDTO orgDTO) {
         List<OrgEntity> orgEntities = baseDao.selectList(getWrapper(BeanUtil.beanToMap(orgDTO)));
+//        List<OrgEntity> orgEntities = orgMapper.selectOrgs(BeanUtil.beanToMap(orgDTO));
         return CollectionUtil.isNotEmpty(orgEntities)?
                 ConvertUtils.sourceToTarget(orgEntities, OrgDTO.class) : Lists.newArrayList();
     }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/sku/bean/dto/SkuDTO.java

@@ -0,0 +1,9 @@
+package com.ruoyi.ams.bionutrition.sku.bean.dto;
+
+import com.ruoyi.common.core.bean.dto.WarewmsExtDTO;
+import lombok.Data;
+
+@Data
+public class SkuDTO extends WarewmsExtDTO {
+    private static final long serialVersionUID = 1373693183188199736L;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/sku/bean/entity/SkuEntity.java

@@ -0,0 +1,13 @@
+package com.ruoyi.ams.bionutrition.sku.bean.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.bean.entity.WarewmsExtEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("base_sku")
+public class SkuEntity extends WarewmsExtEntity {
+    private static final long serialVersionUID = 6368465233645519789L;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/sku/mapper/SkuMapper.java

@@ -0,0 +1,10 @@
+package com.ruoyi.ams.bionutrition.sku.mapper;
+
+import com.ruoyi.ams.bionutrition.org.bean.entity.OrgEntity;
+import com.ruoyi.ams.bionutrition.sku.bean.entity.SkuEntity;
+import com.ruoyi.framework.mapper.WarewmsMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SkuMapper extends WarewmsMapper<SkuEntity> {
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/sku/service/ISkuService.java

@@ -0,0 +1,44 @@
+package com.ruoyi.ams.bionutrition.sku.service;
+
+import com.ruoyi.ams.bionutrition.sku.bean.dto.SkuDTO;
+import com.ruoyi.ams.bionutrition.sku.bean.entity.SkuEntity;
+import com.ruoyi.framework.service.CrudService;
+
+import java.util.List;
+
+public interface ISkuService extends CrudService<SkuEntity, SkuDTO> {
+
+    /**
+     * 获取物料列表
+     * @author
+     */
+    List<SkuDTO> getSkuDTOList(SkuDTO skuDTO);
+
+    /**
+     * 添加物料
+     * @param skuDTO
+     * @return
+     */
+    int insertSku(SkuDTO skuDTO);
+
+    /**
+     * 修改物料
+     * @param skuDTO
+     * @return
+     */
+    int updateSku(SkuDTO skuDTO);
+
+    /**
+     * 根据id查询物料
+     * @param id
+     * @return
+     */
+    SkuDTO selectSkuById(String id);
+
+    /**
+     * 根据id删除
+     * @param ids
+     * @return
+     */
+    int deleteSkuByIds(String[] ids);
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/sku/service/impl/SkuServiceImpl.java

@@ -0,0 +1,46 @@
+package com.ruoyi.ams.bionutrition.sku.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.ams.bionutrition.sku.bean.dto.SkuDTO;
+import com.ruoyi.ams.bionutrition.sku.bean.entity.SkuEntity;
+import com.ruoyi.ams.bionutrition.sku.mapper.SkuMapper;
+import com.ruoyi.ams.bionutrition.sku.service.ISkuService;
+import com.ruoyi.framework.service.impl.CrudServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SkuServiceImpl extends CrudServiceImpl<SkuMapper, SkuEntity, SkuDTO> implements ISkuService {
+
+    @Override
+    public List<SkuDTO> getSkuDTOList(SkuDTO skuDTO) {
+        return null;
+    }
+
+    @Override
+    public int insertSku(SkuDTO skuDTO) {
+        return 0;
+    }
+
+    @Override
+    public int updateSku(SkuDTO skuDTO) {
+        return 0;
+    }
+
+    @Override
+    public SkuDTO selectSkuById(String id) {
+        return null;
+    }
+
+    @Override
+    public int deleteSkuByIds(String[] ids) {
+        return 0;
+    }
+
+    @Override
+    public QueryWrapper<SkuEntity> getWrapper(Map<String, Object> params) {
+        return null;
+    }
+}

warewms-ams/src/main/resources/mapper/org/OrgMapper.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ams.bionutrition.org.mapper.OrgMapper">
+
+    <resultMap type="OrgEntity" id="OrgEntityResult">
+        <result property="id" column="id"/>
+        <result property="orgCode" column="org_code"/>
+        <result property="orgName" column="org_name"/>
+        <result property="orgStatus" column="org_status"/>
+        <result property="orgAddress" column="org_address"/>
+        <result property="orgContacts" column="org_contacts"/>
+        <result property="orgPhoneNum" column="org_phone_num"/>
+        <result property="orgAccountsBank" column="org_accounts_bank"/>
+        <result property="orgCreditCode" column="org_credit_code"/>
+        <result property="orgType" column="org_type"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectOrgEntityResultVo">
+        select  id,
+                org_code,
+                org_name,
+                org_status,
+                org_address,
+                org_contacts,
+                org_phone_num,
+                org_accounts_bank,
+                org_credit_code,
+                org_type,
+                creator,
+                create_date,
+                updater,
+                update_date,
+                remark from base_servicer
+    </sql>
+
+    <select id="selectOrgs" parameterType="OrgEntity" resultMap="OrgEntityResult">
+        <include refid="selectOrgEntityResultVo"/>
+        <where>
+            <if test="orgStatus != null and orgStatus != ''"> and org_status = #{orgStatus}</if>
+            <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
+            <if test="orgType != null  and orgType != ''"> and org_type = #{orgType}</if>
+        </where>
+    </select>
+
+</mapper>

warewms-base/src/main/java/com/ruoyi/base/domain/BaseSku.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 物料信息对象 base_sku
- * 
+ *
  * @author andy
  * @date 2022-02-21
  */
@@ -19,7 +19,7 @@ public class BaseSku extends BaseEntity
     /** 货主编号 */
     private String customerId;
 
-    /** 产品编号 */
+    /** 物料编码 */
     private String sku;
 
     /** 产品类型 */
@@ -192,408 +192,408 @@ public class BaseSku extends BaseEntity
     @Excel(name = "是否需要质检")
     private String qcCheck;
 
-    public void setCustomerId(String customerId) 
+    public void setCustomerId(String customerId)
     {
         this.customerId = customerId;
     }
 
-    public String getCustomerId() 
+    public String getCustomerId()
     {
         return customerId;
     }
-    public void setSku(String sku) 
+    public void setSku(String sku)
     {
         this.sku = sku;
     }
 
-    public String getSku() 
+    public String getSku()
     {
         return sku;
     }
-    public void setSkuType(String skuType) 
+    public void setSkuType(String skuType)
     {
         this.skuType = skuType;
     }
 
-    public String getSkuType() 
+    public String getSkuType()
     {
         return skuType;
     }
-    public void setSpecs(String specs) 
+    public void setSpecs(String specs)
     {
         this.specs = specs;
     }
 
-    public String getSpecs() 
+    public String getSpecs()
     {
         return specs;
     }
-    public void setModel(String model) 
+    public void setModel(String model)
     {
         this.model = model;
     }
 
-    public String getModel() 
+    public String getModel()
     {
         return model;
     }
-    public void setDesc1(String desc1) 
+    public void setDesc1(String desc1)
     {
         this.desc1 = desc1;
     }
 
-    public String getDesc1() 
+    public String getDesc1()
     {
         return desc1;
     }
-    public void setDesc2(String desc2) 
+    public void setDesc2(String desc2)
     {
         this.desc2 = desc2;
     }
 
-    public String getDesc2() 
+    public String getDesc2()
     {
         return desc2;
     }
-    public void setSelfCode1(String selfCode1) 
+    public void setSelfCode1(String selfCode1)
     {
         this.selfCode1 = selfCode1;
     }
 
-    public String getSelfCode1() 
+    public String getSelfCode1()
     {
         return selfCode1;
     }
-    public void setSelfCode2(String selfCode2) 
+    public void setSelfCode2(String selfCode2)
     {
         this.selfCode2 = selfCode2;
     }
 
-    public String getSelfCode2() 
+    public String getSelfCode2()
     {
         return selfCode2;
     }
-    public void setHazardFlag(String hazardFlag) 
+    public void setHazardFlag(String hazardFlag)
     {
         this.hazardFlag = hazardFlag;
     }
 
-    public String getHazardFlag() 
+    public String getHazardFlag()
     {
         return hazardFlag;
     }
-    public void setPackId(String packId) 
+    public void setPackId(String packId)
     {
         this.packId = packId;
     }
 
-    public String getPackId() 
+    public String getPackId()
     {
         return packId;
     }
-    public void setTare(BigDecimal tare) 
+    public void setTare(BigDecimal tare)
     {
         this.tare = tare;
     }
 
-    public BigDecimal getTare() 
+    public BigDecimal getTare()
     {
         return tare;
     }
-    public void setGrossweight(BigDecimal grossweight) 
+    public void setGrossweight(BigDecimal grossweight)
     {
         this.grossweight = grossweight;
     }
 
-    public BigDecimal getGrossweight() 
+    public BigDecimal getGrossweight()
     {
         return grossweight;
     }
-    public void setNetweight(BigDecimal netweight) 
+    public void setNetweight(BigDecimal netweight)
     {
         this.netweight = netweight;
     }
 
-    public BigDecimal getNetweight() 
+    public BigDecimal getNetweight()
     {
         return netweight;
     }
-    public void setActiveFlag(String activeFlag) 
+    public void setActiveFlag(String activeFlag)
     {
         this.activeFlag = activeFlag;
     }
 
-    public String getActiveFlag() 
+    public String getActiveFlag()
     {
         return activeFlag;
     }
-    public void setPutawayLocation(String putawayLocation) 
+    public void setPutawayLocation(String putawayLocation)
     {
         this.putawayLocation = putawayLocation;
     }
 
-    public String getPutawayLocation() 
+    public String getPutawayLocation()
     {
         return putawayLocation;
     }
-    public void setPutawayZone(String putawayZone) 
+    public void setPutawayZone(String putawayZone)
     {
         this.putawayZone = putawayZone;
     }
 
-    public String getPutawayZone() 
+    public String getPutawayZone()
     {
         return putawayZone;
     }
-    public void setPutawayRule(String putawayRule) 
+    public void setPutawayRule(String putawayRule)
     {
         this.putawayRule = putawayRule;
     }
 
-    public String getPutawayRule() 
+    public String getPutawayRule()
     {
         return putawayRule;
     }
-    public void setSkuHigh(BigDecimal skuHigh) 
+    public void setSkuHigh(BigDecimal skuHigh)
     {
         this.skuHigh = skuHigh;
     }
 
-    public BigDecimal getSkuHigh() 
+    public BigDecimal getSkuHigh()
     {
         return skuHigh;
     }
-    public void setSkuLength(BigDecimal skuLength) 
+    public void setSkuLength(BigDecimal skuLength)
     {
         this.skuLength = skuLength;
     }
 
-    public BigDecimal getSkuLength() 
+    public BigDecimal getSkuLength()
     {
         return skuLength;
     }
-    public void setSkuWidth(BigDecimal skuWidth) 
+    public void setSkuWidth(BigDecimal skuWidth)
     {
         this.skuWidth = skuWidth;
     }
 
-    public BigDecimal getSkuWidth() 
+    public BigDecimal getSkuWidth()
     {
         return skuWidth;
     }
-    public void setQtymax(BigDecimal qtymax) 
+    public void setQtymax(BigDecimal qtymax)
     {
         this.qtymax = qtymax;
     }
 
-    public BigDecimal getQtymax() 
+    public BigDecimal getQtymax()
     {
         return qtymax;
     }
-    public void setQtymin(BigDecimal qtymin) 
+    public void setQtymin(BigDecimal qtymin)
     {
         this.qtymin = qtymin;
     }
 
-    public BigDecimal getQtymin() 
+    public BigDecimal getQtymin()
     {
         return qtymin;
     }
-    public void setDefaultReceivingUom(String defaultReceivingUom) 
+    public void setDefaultReceivingUom(String defaultReceivingUom)
     {
         this.defaultReceivingUom = defaultReceivingUom;
     }
 
-    public String getDefaultReceivingUom() 
+    public String getDefaultReceivingUom()
     {
         return defaultReceivingUom;
     }
-    public void setDefaultShipmentUom(String defaultShipmentUom) 
+    public void setDefaultShipmentUom(String defaultShipmentUom)
     {
         this.defaultShipmentUom = defaultShipmentUom;
     }
 
-    public String getDefaultShipmentUom() 
+    public String getDefaultShipmentUom()
     {
         return defaultShipmentUom;
     }
-    public void setQcRule(String qcRule) 
+    public void setQcRule(String qcRule)
     {
         this.qcRule = qcRule;
     }
 
-    public String getQcRule() 
+    public String getQcRule()
     {
         return qcRule;
     }
-    public void setQcTime(BigDecimal qcTime) 
+    public void setQcTime(BigDecimal qcTime)
     {
         this.qcTime = qcTime;
     }
 
-    public BigDecimal getQcTime() 
+    public BigDecimal getQcTime()
     {
         return qcTime;
     }
-    public void setShelflife(Long shelflife) 
+    public void setShelflife(Long shelflife)
     {
         this.shelflife = shelflife;
     }
 
-    public Long getShelflife() 
+    public Long getShelflife()
     {
         return shelflife;
     }
-    public void setColdFlag(String coldFlag) 
+    public void setColdFlag(String coldFlag)
     {
         this.coldFlag = coldFlag;
     }
 
-    public String getColdFlag() 
+    public String getColdFlag()
     {
         return coldFlag;
     }
-    public void setSterilizationFlag(String sterilizationFlag) 
+    public void setSterilizationFlag(String sterilizationFlag)
     {
         this.sterilizationFlag = sterilizationFlag;
     }
 
-    public String getSterilizationFlag() 
+    public String getSterilizationFlag()
     {
         return sterilizationFlag;
     }
-    public void setCuringCycle(BigDecimal curingCycle) 
+    public void setCuringCycle(BigDecimal curingCycle)
     {
         this.curingCycle = curingCycle;
     }
 
-    public BigDecimal getCuringCycle() 
+    public BigDecimal getCuringCycle()
     {
         return curingCycle;
     }
-    public void setManufacturer(String manufacturer) 
+    public void setManufacturer(String manufacturer)
     {
         this.manufacturer = manufacturer;
     }
 
-    public String getManufacturer() 
+    public String getManufacturer()
     {
         return manufacturer;
     }
-    public void setUserdefine1(String userdefine1) 
+    public void setUserdefine1(String userdefine1)
     {
         this.userdefine1 = userdefine1;
     }
 
-    public String getUserdefine1() 
+    public String getUserdefine1()
     {
         return userdefine1;
     }
-    public void setUserdefine2(String userdefine2) 
+    public void setUserdefine2(String userdefine2)
     {
         this.userdefine2 = userdefine2;
     }
 
-    public String getUserdefine2() 
+    public String getUserdefine2()
     {
         return userdefine2;
     }
-    public void setUserdefine3(String userdefine3) 
+    public void setUserdefine3(String userdefine3)
     {
         this.userdefine3 = userdefine3;
     }
 
-    public String getUserdefine3() 
+    public String getUserdefine3()
     {
         return userdefine3;
     }
-    public void setUserdefine4(String userdefine4) 
+    public void setUserdefine4(String userdefine4)
     {
         this.userdefine4 = userdefine4;
     }
 
-    public String getUserdefine4() 
+    public String getUserdefine4()
     {
         return userdefine4;
     }
-    public void setUserdefine5(String userdefine5) 
+    public void setUserdefine5(String userdefine5)
     {
         this.userdefine5 = userdefine5;
     }
 
-    public String getUserdefine5() 
+    public String getUserdefine5()
     {
         return userdefine5;
     }
-    public void setUserdefine6(String userdefine6) 
+    public void setUserdefine6(String userdefine6)
     {
         this.userdefine6 = userdefine6;
     }
 
-    public String getUserdefine6() 
+    public String getUserdefine6()
     {
         return userdefine6;
     }
-    public void setUserdefine7(String userdefine7) 
+    public void setUserdefine7(String userdefine7)
     {
         this.userdefine7 = userdefine7;
     }
 
-    public String getUserdefine7() 
+    public String getUserdefine7()
     {
         return userdefine7;
     }
-    public void setUserdefine8(String userdefine8) 
+    public void setUserdefine8(String userdefine8)
     {
         this.userdefine8 = userdefine8;
     }
 
-    public String getUserdefine8() 
+    public String getUserdefine8()
     {
         return userdefine8;
     }
-    public void setUserdefine9(String userdefine9) 
+    public void setUserdefine9(String userdefine9)
     {
         this.userdefine9 = userdefine9;
     }
 
-    public String getUserdefine9() 
+    public String getUserdefine9()
     {
         return userdefine9;
     }
-    public void setUserdefine10(String userdefine10) 
+    public void setUserdefine10(String userdefine10)
     {
         this.userdefine10 = userdefine10;
     }
 
-    public String getUserdefine10() 
+    public String getUserdefine10()
     {
         return userdefine10;
     }
-    public void setExpirationDateCheck(String expirationDateCheck) 
+    public void setExpirationDateCheck(String expirationDateCheck)
     {
         this.expirationDateCheck = expirationDateCheck;
     }
 
-    public String getExpirationDateCheck() 
+    public String getExpirationDateCheck()
     {
         return expirationDateCheck;
     }
-    public void setOverchargeCheck(String overchargeCheck) 
+    public void setOverchargeCheck(String overchargeCheck)
     {
         this.overchargeCheck = overchargeCheck;
     }
 
-    public String getOverchargeCheck() 
+    public String getOverchargeCheck()
     {
         return overchargeCheck;
     }
-    public void setQcCheck(String qcCheck) 
+    public void setQcCheck(String qcCheck)
     {
         this.qcCheck = qcCheck;
     }
 
-    public String getQcCheck() 
+    public String getQcCheck()
     {
         return qcCheck;
     }