Merge remote-tracking branch 'origin/master'

luqingyang

2023-11-02 93dd846b5023cc268b06e0a8e0fb6a04a4ff5fde

Merge remote-tracking branch 'origin/master'

 consum-base/doc/¸üÐÂÕýʽ»·¾³ÐèÒªÌí¼Ó.sql

@@ -1,15 +1,16 @@
-- åˆ›å»ºå­˜å‚¨è¿‡ç¨‹å¼€å§‹-----------
DELIMITER //
CREATE PROCEDURE `InsertL_WH_GOODS` (IN p_WAREHOUSE_FLOW_ID BIGINT,IN p_WAREHOUSE_ID BIGINT,IN p_WH_GOODS_RECORD_ID BIGINT,IN p_RECORD_TYPE SMALLINT,IN p_WAREHOUSE_NAME VARCHAR (100),IN p_COST_TYPE SMALLINT,IN p_BASE_GOODS_TEMPLATE_ID BIGINT,IN p_GOODS_TEMPLATE_NAME VARCHAR (200),IN p_BASE_GOODS_MODELS_ID BIGINT,IN p_BASE_GOODS_MODELS_NAME VARCHAR (200),IN p_SUPPLIER VARCHAR (200),IN p_BUY_TYPE SMALLINT,IN p_UNIT VARCHAR (10),IN p_PRICE BIGINT,IN p_PROCURE_DATE BIGINT,IN p_STATES INT,IN p_DEAL_TIME BIGINT,IN p_times INT) BEGIN DECLARE i INT DEFAULT 1; DECLARE v_WH_GOODS_ID BIGINT; DECLARE CONTINUE
HANDLER FOR SQLEXCEPTION BEGIN-- An error occurred, rollback the transaction
ROLLBACK; END;-- Start the transaction
CREATE PROCEDURE `InsertL_WH_GOODS` (IN p_WAREHOUSE_FLOW_ID BIGINT,IN p_WAREHOUSE_TYPE SMALLINT,IN p_WAREHOUSE_ID BIGINT,IN p_WH_GOODS_RECORD_ID BIGINT,IN p_RECORD_TYPE SMALLINT,IN p_WAREHOUSE_NAME VARCHAR (100),IN p_COST_TYPE SMALLINT,IN p_BASE_GOODS_TEMPLATE_ID BIGINT,IN p_GOODS_TEMPLATE_NAME VARCHAR (200),IN p_BASE_GOODS_MODELS_ID BIGINT,IN p_BASE_GOODS_MODELS_NAME VARCHAR (200),IN p_SUPPLIER VARCHAR (200),IN p_BUY_TYPE SMALLINT,IN p_UNIT VARCHAR (10),IN p_PRICE BIGINT,IN p_PROCURE_DATE BIGINT,IN p_STATES INT,IN p_DEAL_TIME BIGINT,IN p_times INT) BEGIN DECLARE i INT DEFAULT 1; DECLARE v_WH_GOODS_ID BIGINT; DECLARE CONTINUE
    HANDLER FOR SQLEXCEPTION BEGIN-- An error occurred, rollback the transaction
    ROLLBACK; END;-- Start the transaction
START TRANSACTION; WHILE i<=p_times
DO
INSERT INTO L_WH_GOODS (WAREHOUSE_ID,WAREHOUSE_NAME,COST_TYPE,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,SUPPLIER,BUY_TYPE,UNIT,PRICE,PROCURE_DATE,STATES) VALUES (p_WAREHOUSE_ID,p_WAREHOUSE_NAME,p_COST_TYPE,p_BASE_GOODS_TEMPLATE_ID,p_GOODS_TEMPLATE_NAME,p_BASE_GOODS_MODELS_ID,p_BASE_GOODS_MODELS_NAME,p_SUPPLIER,p_BUY_TYPE,p_UNIT,p_PRICE,p_PROCURE_DATE,p_STATES);
SET v_WH_GOODS_ID=LAST_INSERT_ID();-- æ’入后获取ID并存入L_WH_GOODS_RECORD_DETAILS表
INSERT INTO L_WH_GOODS_RECORD_DETAILS (WH_GOODS_RECORD_ID,WH_GOODS_ID,THIS_TYPE) VALUES (p_WH_GOODS_RECORD_ID,v_WH_GOODS_ID,p_RECORD_TYPE);-- æ’入到L_GOODS_WH_RECORD表
INSERT INTO L_GOODS_WH_RECORD (WAREHOUSE_FLOW_ID,WH_GOODS_ID,WAREHOUSE_ID,DEAL_TIME) VALUES (p_WAREHOUSE_FLOW_ID,v_WH_GOODS_ID,p_WAREHOUSE_ID,p_DEAL_TIME);
SET i=i+1; END WHILE;-- If no errors, commit the transaction
    DO
        INSERT INTO L_WH_GOODS (WAREHOUSE_TYPE,WAREHOUSE_ID,WAREHOUSE_NAME,COST_TYPE,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,SUPPLIER,BUY_TYPE,UNIT,PRICE,PROCURE_DATE,STATES) VALUES (p_WAREHOUSE_TYPE,p_WAREHOUSE_ID,p_WAREHOUSE_NAME,p_COST_TYPE,p_BASE_GOODS_TEMPLATE_ID,p_GOODS_TEMPLATE_NAME,p_BASE_GOODS_MODELS_ID,p_BASE_GOODS_MODELS_NAME,p_SUPPLIER,p_BUY_TYPE,p_UNIT,p_PRICE,p_PROCURE_DATE,p_STATES);
        SET v_WH_GOODS_ID=LAST_INSERT_ID();-- æ’入后获取ID并存入L_WH_GOODS_RECORD_DETAILS表
        INSERT INTO L_WH_GOODS_RECORD_DETAILS (WH_GOODS_RECORD_ID,WH_GOODS_ID,THIS_TYPE) VALUES (p_WH_GOODS_RECORD_ID,v_WH_GOODS_ID,p_RECORD_TYPE);-- æ’入到L_GOODS_WH_RECORD表
        UPDATE L_GOODS_WH_RECORD SET LAST_RECORD=0 WHERE WH_GOODS_ID=v_WH_GOODS_ID AND WAREHOUSE_ID=p_WAREHOUSE_ID AND WAREHOUSE_TYPE=p_WAREHOUSE_TYPE AND LAST_RECORD=1;
        INSERT INTO L_GOODS_WH_RECORD (WAREHOUSE_FLOW_ID,WH_GOODS_ID,WAREHOUSE_TYPE,WAREHOUSE_ID,DEAL_TIME,LAST_RECORD) VALUES (p_WAREHOUSE_FLOW_ID,v_WH_GOODS_ID,p_WAREHOUSE_TYPE,p_WAREHOUSE_ID,p_DEAL_TIME,1);
        SET i=i+1; END WHILE;-- If no errors, commit the transaction
COMMIT; END
-- åˆ›å»ºå­˜å‚¨è¿‡ç¨‹ç»“束  -----------


 consum-base/doc/ÏîÄ¿×ÊÁÏ/ºÓÄÏÓÊÕþµÍÖµÒ׺ÄÆ·V20231023.pdm

Diff too large

 consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java

New file
@@ -0,0 +1,36 @@
package com.consum.base.controller;

import com.consum.base.BaseController;
import com.consum.base.service.LOrgSupplierServiceImpl;
import com.iplatform.model.po.S_user_core;
import com.walker.web.ResponseValue;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @ClassName LOrgSupplierController
 * @Author cy
 * @Date 2023/11/2
 * @Description
 * @Version 1.0
 **/
@RestController
@RequestMapping("/pc/orgSupplier")
public class LOrgSupplierController extends BaseController {

    @Resource
    private LOrgSupplierServiceImpl lOrgSupplierService;

    @GetMapping("/getSupplier")
    public ResponseValue queryFormProcureList(String supplier) {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        return ResponseValue.success(lOrgSupplierService.selectSupplier(this.getSysInfo().getTenantId(), supplier));
    }
}


 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -21,9 +21,7 @@

import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @ClassName LWhFormProcureController
@@ -53,6 +51,8 @@
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    @Resource
    private LWhProcureModelService lWhProcureModelService;
    @Resource
    private LOrgSupplierServiceImpl lOrgSupplierService;

    /**
     * @Description æ–°å¢ž
@@ -64,6 +64,9 @@
            return ResponseValue.error("仓库ID不能为空");
        }
        BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
        FinSysTenantUser sysTenantUser = this.getSysInfo();
        String tenantId = sysTenantUser.getTenantId();
        String tenantName = sysTenantUser.getTenantName();
        // åªèƒ½æ·»åŠ æœ¬æœºæž„仓库的进货单
        //??????
        //
@@ -81,6 +84,8 @@
        }
        long procureTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());

        Set<String> supplierList = new HashSet<>();

        ArrayList<LWhFormProcureGoods> procureGoodList = new ArrayList<>();
        ArrayList<LWhProcureModel> whProcureModeLlist = new ArrayList<>();

@@ -89,6 +94,12 @@
            Long baseCategoryId = procureGoodT.getBaseCategoryId();
            Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
            String supplier = procureGoodT.getSupplier();
            // åˆ¤æ–­å½“前供应商是否已存在
            if (!supplierList.contains(supplier) && !lOrgSupplierService.supplierIsContain(tenantId, supplier)) {
                supplierList.add(supplier);
            }


            List<LWhProcureModelParams> models = procureGoodT.getModels();
            if (CollectionUtils.isEmpty(models)) {
                return ResponseValue.error("采购单不能为空");
@@ -120,6 +131,7 @@
                if (tempGoodsInfo == null) {
                    return ResponseValue.error("采购的价型号未找到");
                }
                String modelName = (String) tempGoodsInfo.get("modelname");
                // æŸ¥è¯¢åž‹å·åº“å­˜
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
                LWhProcureModel model = new LWhProcureModel();
@@ -128,6 +140,7 @@
                model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
                model.setBusinessId(whFormProcureId);
                model.setBaseGoodsModelsId(baseGoodsModelsId);
                model.setBaseGoodsModelsName(modelName);
                model.setPrice(price);
                model.setCounts(counts);
                model.setWorehouseCount(goodsModelNum);
@@ -154,7 +167,18 @@
        lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
        lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
        int result = lWhFormProcureService.insert(lWhFormProcure);
        if (result > 0) return ResponseValue.success(1);

        supplierList.forEach(supplier -> {
            LOrgSupplier lOrgSupplier = new LOrgSupplier();
            lOrgSupplier.setId(NumberGenerator.getLongSequenceNumber());
            lOrgSupplier.setAgencyId(tenantId);
            lOrgSupplier.setAgencyName(tenantName);
            lOrgSupplier.setSupplier(supplier);
            lOrgSupplierService.insert(lOrgSupplier);
        });
        if (result > 0) {
            return ResponseValue.success(1);
        }
        return ResponseValue.error("新增失败！");
    }


 consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java

New file
@@ -0,0 +1,51 @@
package com.consum.base.service;

import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName LOrgSupplierServiceImpl
 * @Author cy
 * @Date 2023/11/1
 * @Description
 * @Version 1.0
 **/
@Service
@Slf4j
public class LOrgSupplierServiceImpl extends BaseServiceImpl {
    private static String SUPPLIER_IS_CONTAIN = "SELECT*FROM L_ORG_SUPPLIER WHERE 1=1";

    /**
     * åˆ¤æ–­ä¾›åº”商是否存在
     *
     * @param agencyId
     * @param supplier
     * @return
     */

    public List<Map<String, Object>> selectSupplier(String agencyId, String supplier) {
        StringBuilder sql = new StringBuilder(SUPPLIER_IS_CONTAIN);
        Map<String, Object> paramts = new HashMap<>();
        if (agencyId != null) {
            sql.append(" and AGENCY_ID=:agencyId");
            paramts.put("agencyId", agencyId);
        }
        if (StringUtils.isNotEmpty(supplier)) {
            sql.append(" and supplier=:supplier");
            paramts.put("supplier", supplier);
        }
        return select(sql.append(" limit 1").toString(), paramts);
    }

    public boolean supplierIsContain(String agencyId, String supplier) {
        List<Map<String, Object>> selectSupplier = selectSupplier(agencyId, supplier);
        return !CollectionUtils.isEmpty(selectSupplier);
    }
}

 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java

@@ -32,12 +32,12 @@
    private LWarehouseFlowService lWarehouseFlowService;
    private LWhGoodsService lWhGoodsService;
    private LWhGoodsRecordService lWhGoodsRecordService;
    private LWhFormTransferService lWhFormTransferService;
    private LWhFormTransferServiceImpl lWhFormTransferService;
    private LWhFormOutputCoreService lWhFormOutputCoreService;
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;

    @Autowired
    public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferService lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
    public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferServiceImpl lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
        this.jdbcTemplate = jdbcTemplate;
        this.lWarehouseFlowService = lWarehouseFlowService;
        this.baseGoodsTemplateService = baseGoodsTemplateService;
@@ -122,7 +122,7 @@
            Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
            synchronized (warehouseModelLockObj) {
                // èŽ·å¾—锁后查询该型号的期初数量
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType,warehouseId, baseGoodsModelsId, (short) 1, null);
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, (short) 1, null);
                whGoodsRecord.setInitialCount(goodsModelNum);
                whGoodsRecord.setThisCount(modelCount);
                whGoodsRecord.setEndCount(goodsModelNum + modelCount);
@@ -136,7 +136,7 @@
                    Long price = item.getPrice();
                    //物品个数
                    Integer counts = item.getCounts();
                    sameGoodsInsertMore(warehouseFlowId, warehouseId, whGoodsRecordId, (short) 1, warehouseName,
                    sameGoodsInsertMore(warehouseFlowId, warehouseType, warehouseId, whGoodsRecordId, (short) 1, warehouseName,
                            classification, tempGoodsId, goodsName, baseGoodsModelsId, modelName,
                            supplier, buyType, goodsUnit, price, procureTime, 1, dealTime, counts);
                });
@@ -167,13 +167,14 @@
     * @param pStates              çŠ¶æ€
     * @param pTimes               æ’入条数
     */
    public void sameGoodsInsertMore(long pWarehouseFlowId, long pWarehouseId, long pWhGoodsRecordId, short pRecordType, String pWarehouseName, short pCostType,
    public void sameGoodsInsertMore(long pWarehouseFlowId, Integer warehouseType , long pWarehouseId, long pWhGoodsRecordId, short pRecordType, String pWarehouseName, short pCostType,
                                    long pBaseGoodsTemplateId, String pGoodsTemplateName, long pBaseGoodsModelsId,
                                    String pBaseGoodsModelsName, String pSupplier, short pBuyType,
                                    String pUnit, long pPrice, long pProcureDate,
                                    int pStates, long pDealTime, int pTimes) {
        SqlParameterSource in = new MapSqlParameterSource()
                .addValue("p_WAREHOUSE_FLOW_ID", pWarehouseFlowId)
                .addValue("p_WAREHOUSE_TYPE", warehouseType)
                .addValue("p_WAREHOUSE_ID", pWarehouseId)
                .addValue("p_WH_GOODS_RECORD_ID", pWhGoodsRecordId)
                .addValue("p_RECORD_TYPE", pRecordType)

 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java

@@ -33,7 +33,7 @@
    private LWhGoodsService lWhGoodsService;
    private CodeGeneratorService codeGeneratorService;
    private LWhProcureModelService lWhProcureModelService;
    private LWhFormTransferService lWhFormTransferService;
//    private LWhFormTransferServiceImpl lWhFormTransferService;
    private LWhFormOutputService lWhFormOutputService;
    private LWarehouseFlowService lWarehouseFlowService;
    private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
@@ -44,7 +44,7 @@
                                    LWhGoodsService lWhGoodsService,
                                    CodeGeneratorService codeGeneratorService,
                                    LWhProcureModelService lWhProcureModelService,
                                    LWhFormTransferService lWhFormTransferService,
//                                    LWhFormTransferServiceImpl lWhFormTransferService,
                                    LWhFormOutputService lWhFormOutputService,
                                    LWarehouseFlowService lWarehouseFlowService,
                                    LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
@@ -53,7 +53,7 @@
        this.lWhGoodsService = lWhGoodsService;
        this.codeGeneratorService = codeGeneratorService;
        this.lWhProcureModelService = lWhProcureModelService;
        this.lWhFormTransferService = lWhFormTransferService;
//        this.lWhFormTransferService = lWhFormTransferService;
        this.lWhFormOutputService = lWhFormOutputService;
        this.lWarehouseFlowService = lWarehouseFlowService;
        this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
@@ -73,7 +73,7 @@
            return null;
        }
        LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
        lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
        lWhFormTransfer = lWhFormOutputService.get(lWhFormTransfer);
        if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 0) {
            log.error("调拨失败！请检查调拨单状态");
            return null;

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java

@@ -26,7 +26,7 @@
@Service
@Slf4j
public class LWhFormScrappedCoreService {
    private LWhFormScrappedService lWhFormScrappedService;
    private LWhFormScrappedServiceImpl lWhFormScrappedService;
    private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    private LWhGoodsService lWhGoodsService;
@@ -35,7 +35,7 @@
    private LWarehouseFlowService lWarehouseFlowService;

    @Autowired
    public LWhFormScrappedCoreService(LWhFormScrappedService lWhFormScrappedService,
    public LWhFormScrappedCoreService(LWhFormScrappedServiceImpl lWhFormScrappedService,
                                      LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
                                      BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
                                      LWhGoodsService lWhGoodsService,

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedService.java

File was deleted

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

@@ -19,7 +19,7 @@
@Slf4j
public class LWhFormTransferCoreService {
    @Resource
    private LWhFormTransferService lWhFormTransferService;
    private LWhFormTransferServiceImpl lWhFormTransferService;
    @Resource
    private LWhFormOutputCoreService lWhFormOutputCoreService;


 consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java

File was deleted

 consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java

@@ -32,6 +32,10 @@
    @JsonIgnore
    protected boolean isset_transBusinessId = false;

    private Long procureModelUserRecordId = null;
    @JsonIgnore
    protected boolean isset_procureModelUserRecordId = false;

    private Long nowUserPhone = null;
    @JsonIgnore
    protected boolean isset_nowUserPhone = false;
@@ -133,6 +137,20 @@
        return this.transBusinessId == null;
    }

    public Long getProcureModelUserRecordId() {
        return this.procureModelUserRecordId;
    }

    public void setProcureModelUserRecordId(Long procureModelUserRecordId) {
        this.procureModelUserRecordId = procureModelUserRecordId;
        this.isset_procureModelUserRecordId = true;
    }

    @JsonIgnore
    public boolean isEmptyProcureModelUserRecordId() {
        return this.procureModelUserRecordId == null;
    }

    public Long getNowUserPhone() {
        return this.nowUserPhone;
    }
@@ -227,6 +245,7 @@
                .append("whGoodsId=").append(this.whGoodsId)
                .append("recordType=").append(this.recordType)
                .append("transBusinessId=").append(this.transBusinessId)
                .append("procureModelUserRecordId=").append(this.procureModelUserRecordId)
                .append("nowUserPhone=").append(this.nowUserPhone)
                .append("nowUserName=").append(this.nowUserName)
                .append("operatorId=").append(this.operatorId)
@@ -259,6 +278,9 @@
        if (this.isset_transBusinessId) {
            l_goods_user_record.setTransBusinessId(this.getTransBusinessId());
        }
        if (this.isset_procureModelUserRecordId) {
            l_goods_user_record.setProcureModelUserRecordId(this.getProcureModelUserRecordId());
        }
        if (this.isset_nowUserPhone) {
            l_goods_user_record.setNowUserPhone(this.getNowUserPhone());
        }

 consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java

@@ -31,6 +31,7 @@
    public static final String WhGoodsId = "wh_goods_id";
    public static final String RecordType = "record_type";
    public static final String TransBusinessId = "trans_business_id";
    public static final String ProcureModelUserRecordId = "procure_model_user_record_id";
    public static final String NowUserPhone = "now_user_phone";
    public static final String NowUserName = "now_user_name";
    public static final String OperatorId = "operator_id";
@@ -58,6 +59,9 @@
        }
        if (lGoodsUserRecord.isset_transBusinessId) {
            this.setTransBusinessId(lGoodsUserRecord.getTransBusinessId());
        }
        if (lGoodsUserRecord.isset_procureModelUserRecordId) {
            this.setProcureModelUserRecordId(lGoodsUserRecord.getProcureModelUserRecordId());
        }
        if (lGoodsUserRecord.isset_nowUserPhone) {
            this.setNowUserPhone(lGoodsUserRecord.getNowUserPhone());
@@ -123,6 +127,7 @@
        ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ib.set(RecordType, this.getRecordType(), this.isset_recordType);
        ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ib.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ib.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ib.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -141,6 +146,7 @@
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(RecordType, this.getRecordType(), this.isset_recordType);
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -160,6 +166,7 @@
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(RecordType, this.getRecordType(), this.isset_recordType);
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -178,6 +185,7 @@
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(RecordType, this.getRecordType(), this.isset_recordType);
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -231,7 +239,7 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time, last_record from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, procure_model_user_record_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time, last_record from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -239,7 +247,7 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time, last_record from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, procure_model_user_record_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time, last_record from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -300,6 +308,14 @@
                l_goods_user_record.setTransBusinessId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.ProcureModelUserRecordId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_goods_user_record.setProcureModelUserRecordId(null);
            } else {
                l_goods_user_record.setProcureModelUserRecordId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.NowUserPhone);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {

 consum-model-pojo/src/main/java/com/consum/model/po/LOrgSupplier.java

New file
@@ -0,0 +1,150 @@

package com.consum.model.po;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.walker.jdbc.BasePo;

/**
 * è¡¨å:L_ORG_SUPPLIER *
 * @author genrator
 */
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class LOrgSupplier extends BasePo<LOrgSupplier> {
    // åºåˆ—化版本号
    private static final long serialVersionUID = 1L;

    // ä¸»é”®
    private Long id = null;
    @JsonIgnore
    protected boolean isset_id = false;

    // å±žæ€§åˆ—表
    private String agencyId = null;
    @JsonIgnore
    protected boolean isset_agencyId = false;

    private String agencyName = null;
    @JsonIgnore
    protected boolean isset_agencyName = false;

    private String supplier = null;
    @JsonIgnore
    protected boolean isset_supplier = false;

    /**
     * é»˜è®¤æž„造函数
     */
    public LOrgSupplier() {
    }

    /**
     * æ ¹æ®ä¸»é”®æž„造对象
     */
    public LOrgSupplier(Long id) {
        this.setId(id);
    }

    /**
     * è®¾ç½®ä¸»é”®å€¼
     */
    @Override
    public void setPkValue(Object value) {
        this.setId((Long) value);
    }

    public Long getId() {
        return this.id;
    }

    public void setId(Long id) {
        this.id = id;
        this.isset_id = true;
    }

    @JsonIgnore
    public boolean isEmptyId() {
        return this.id == null;
    }

    public String getAgencyId() {
        return this.agencyId;
    }

    public void setAgencyId(String agencyId) {
        this.agencyId = agencyId;
        this.isset_agencyId = true;
    }

    @JsonIgnore
    public boolean isEmptyAgencyId() {
        return this.agencyId == null || this.agencyId.length() == 0;
    }

    public String getAgencyName() {
        return this.agencyName;
    }

    public void setAgencyName(String agencyName) {
        this.agencyName = agencyName;
        this.isset_agencyName = true;
    }

    @JsonIgnore
    public boolean isEmptyAgencyName() {
        return this.agencyName == null || this.agencyName.length() == 0;
    }

    public String getSupplier() {
        return this.supplier;
    }

    public void setSupplier(String supplier) {
        this.supplier = supplier;
        this.isset_supplier = true;
    }

    @JsonIgnore
    public boolean isEmptySupplier() {
        return this.supplier == null || this.supplier.length() == 0;
    }

    /**
     * é‡å†™ toString() æ–¹æ³•
     */
    @Override
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("agencyId=").append(this.agencyId)
                .append("agencyName=").append(this.agencyName)
                .append("supplier=").append(this.supplier)
                .toString();
    }

    /**
     * å…‹éš†
     */
    public LOrgSupplier $clone() {
        LOrgSupplier l_org_supplier = new LOrgSupplier();

        // æ•°æ®åº“名称
        //l_org_supplier.setDatabaseName_(this.getDatabaseName_());

        // ä¸»é”®
        if (this.isset_id) {
            l_org_supplier.setId(this.getId());
        }
        // æ™®é€šå±žæ€§
        if (this.isset_agencyId) {
            l_org_supplier.setAgencyId(this.getAgencyId());
        }
        if (this.isset_agencyName) {
            l_org_supplier.setAgencyName(this.getAgencyName());
        }
        if (this.isset_supplier) {
            l_org_supplier.setSupplier(this.getSupplier());
        }
        return l_org_supplier;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/LOrgSupplier_mapper.java

New file
@@ -0,0 +1,243 @@
package com.consum.model.po;

import com.walker.jdbc.BaseMapper;
import com.walker.jdbc.ResultSetUtils;
import com.walker.jdbc.SqlAndParameters;
import com.walker.jdbc.sqlgen.DeleteBuilder;
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
import org.springframework.jdbc.core.RowMapper;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;

/**
 * è¡¨å:L_ORG_SUPPLIER *
 * @author genrator
 */
public class LOrgSupplier_mapper extends LOrgSupplier implements BaseMapper<LOrgSupplier> {
    // åºåˆ—化版本号
    private static final long serialVersionUID = 1L;

    public static final RowMapper<LOrgSupplier> ROW_MAPPER = new LOrgSupplierRowMapper();

    // ä¸»é”®
    public static final String Id = "id";
    // æ™®é€šå±žæ€§
    public static final String AgencyId = "agency_id";
    public static final String AgencyName = "agency_name";
    public static final String Supplier = "supplier";

    /**
     * é»˜è®¤æž„造函数
     */
    public LOrgSupplier_mapper(LOrgSupplier lOrgSupplier) {
        if (lOrgSupplier == null) {
            throw new IllegalArgumentException("po参数不允许为空！");
        }
        //主键
        if (lOrgSupplier.isset_id) {
            this.setId(lOrgSupplier.getId());
        }
        //普通属性
        if (lOrgSupplier.isset_agencyId) {
            this.setAgencyId(lOrgSupplier.getAgencyId());
        }
        if (lOrgSupplier.isset_agencyName) {
            this.setAgencyName(lOrgSupplier.getAgencyName());
        }
        if (lOrgSupplier.isset_supplier) {
            this.setSupplier(lOrgSupplier.getSupplier());
        }
        // åŽ»æŽ‰ï¼Œ2022-09-07
        // this.setDatabaseName_(l_org_supplier.getDatabaseName_());
    }

    /**
     * èŽ·å–表名
     */
    @Override
    public String getTableName_() {
        String tableName = "l_org_supplier";
        /**
        if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
            return this.getDatabaseName_() + "." + tableName;
        } else {
            return tableName;
        }
        */
        return tableName;
    }

    /**
     * èŽ·å–主键名称
     */
    @Override
    public String getPkName_() {
        return Id;
    }

    /**
     * èŽ·å–主键值
     */
    @Override
    public Object getPkValue_() {
        return this.getId();
    }

    /**
     * èŽ·å–插入语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getInsertSql_() {
        InsertBuilder ib = new InsertBuilder(this.getTableName_());
        ib.set(Id, this.getId());
        ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
        ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
        ib.set(Supplier, this.getSupplier(), this.isset_supplier);
        return ib.genMapSql();
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
        ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
        ub.set(Supplier, this.getSupplier(), this.isset_supplier);
        ub.where(this.getPkName_(), this.getPkValue_());
        return ub.genMapSql();
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
        ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
        ub.set(Supplier, this.getSupplier(), this.isset_supplier);
        return ub.genMapSql(where, parameters);
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
        ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
        ub.set(Supplier, this.getSupplier(), this.isset_supplier);
        return ub.genArraySql(where, parameters);
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getDeleteSql_() {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        db.where(this.getPkName_(), this.getPkValue_());
        return db.genMapSql();
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getDeleteSql_(String where, Map<String, Object> parameters) {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        return db.genMapSql(where, parameters);
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getDeleteSql_(String where, Object[] parameters) {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        return db.genArraySql(where, parameters);
    }

    /**
     * èŽ·å–单行查询语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSingleSql_() {
        SelectBuilder sb = new SelectBuilder(this.getTableName_());
        sb.where(this.getPkName_(), this.getPkValue_());
        return sb.genMapSql();
    }


    /**
     * èŽ·å–查询语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, agency_id, agency_name, supplier from " + this.getTableName_() + " " + where, parameters);
    }

    /**
     * èŽ·å–查询语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, agency_id, agency_name, supplier from " + this.getTableName_() + " " + where, parameters);
    }

    /**
     * å°†resultset的一行转化为po
     */
    @Override
    public LOrgSupplier mapRow(ResultSet rs, int i) throws SQLException {
        return ROW_MAPPER.mapRow(rs, i);
    }

    /**
     * å…‹éš†
     */
    public LOrgSupplier toLOrgSupplier() {
        return super.$clone();
    }
}

/**
 * l_org_supplier RowMapper
 *
 * @author genrator
 */
class LOrgSupplierRowMapper implements RowMapper<LOrgSupplier> {

    @Override
    public LOrgSupplier mapRow(ResultSet rs, int i) throws SQLException {
        ResultSetUtils resultSetUtils = new ResultSetUtils();
        LOrgSupplier l_org_supplier = new LOrgSupplier();
        Integer columnIndex;
        //主键
        columnIndex = resultSetUtils.findColumn(rs, LOrgSupplier_mapper.Id);
        if (columnIndex > 0) {
            l_org_supplier.setId(rs.getLong(columnIndex));
        }
        //普通属性
        columnIndex = resultSetUtils.findColumn(rs, LOrgSupplier_mapper.AgencyId);
        if (columnIndex > 0) {
            l_org_supplier.setAgencyId(rs.getString(columnIndex));
        }
        columnIndex = resultSetUtils.findColumn(rs, LOrgSupplier_mapper.AgencyName);
        if (columnIndex > 0) {
            l_org_supplier.setAgencyName(rs.getString(columnIndex));
        }
        columnIndex = resultSetUtils.findColumn(rs, LOrgSupplier_mapper.Supplier);
        if (columnIndex > 0) {
            l_org_supplier.setSupplier(rs.getString(columnIndex));
        }
        return l_org_supplier;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUser.java

New file
@@ -0,0 +1,238 @@

package com.consum.model.po;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.walker.jdbc.BasePo;

/**
 * è¡¨å:L_WH_PROCURE_MODEL_USER *
 * @author genrator
 */
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class LWhProcureModelUser extends BasePo<LWhProcureModelUser> {
    // åºåˆ—化版本号
    private static final long serialVersionUID = 1L;

    // ä¸»é”®
    private Long id = null;
    @JsonIgnore
    protected boolean isset_id = false;

    // å±žæ€§åˆ—表
    private Long transBusinessId = null;
    @JsonIgnore
    protected boolean isset_transBusinessId = false;

    private Long procureModelUserRecordId = null;
    @JsonIgnore
    protected boolean isset_procureModelUserRecordId = false;

    private Long whProcureModelId = null;
    @JsonIgnore
    protected boolean isset_whProcureModelId = false;

    private Long baseGoodsModelsId = null;
    @JsonIgnore
    protected boolean isset_baseGoodsModelsId = false;

    private Long nowUserPhone = null;
    @JsonIgnore
    protected boolean isset_nowUserPhone = false;

    private String nowUserName = null;
    @JsonIgnore
    protected boolean isset_nowUserName = false;

    private Integer goodsNum = null;
    @JsonIgnore
    protected boolean isset_goodsNum = false;

    /**
     * é»˜è®¤æž„造函数
     */
    public LWhProcureModelUser() {
    }

    /**
     * æ ¹æ®ä¸»é”®æž„造对象
     */
    public LWhProcureModelUser(Long id) {
        this.setId(id);
    }

    /**
     * è®¾ç½®ä¸»é”®å€¼
     */
    @Override
    public void setPkValue(Object value) {
        this.setId((Long) value);
    }

    public Long getId() {
        return this.id;
    }

    public void setId(Long id) {
        this.id = id;
        this.isset_id = true;
    }

    @JsonIgnore
    public boolean isEmptyId() {
        return this.id == null;
    }

    public Long getTransBusinessId() {
        return this.transBusinessId;
    }

    public void setTransBusinessId(Long transBusinessId) {
        this.transBusinessId = transBusinessId;
        this.isset_transBusinessId = true;
    }

    @JsonIgnore
    public boolean isEmptyTransBusinessId() {
        return this.transBusinessId == null;
    }

    public Long getProcureModelUserRecordId() {
        return this.procureModelUserRecordId;
    }

    public void setProcureModelUserRecordId(Long procureModelUserRecordId) {
        this.procureModelUserRecordId = procureModelUserRecordId;
        this.isset_procureModelUserRecordId = true;
    }

    @JsonIgnore
    public boolean isEmptyProcureModelUserRecordId() {
        return this.procureModelUserRecordId == null;
    }

    public Long getWhProcureModelId() {
        return this.whProcureModelId;
    }

    public void setWhProcureModelId(Long whProcureModelId) {
        this.whProcureModelId = whProcureModelId;
        this.isset_whProcureModelId = true;
    }

    @JsonIgnore
    public boolean isEmptyWhProcureModelId() {
        return this.whProcureModelId == null;
    }

    public Long getBaseGoodsModelsId() {
        return this.baseGoodsModelsId;
    }

    public void setBaseGoodsModelsId(Long baseGoodsModelsId) {
        this.baseGoodsModelsId = baseGoodsModelsId;
        this.isset_baseGoodsModelsId = true;
    }

    @JsonIgnore
    public boolean isEmptyBaseGoodsModelsId() {
        return this.baseGoodsModelsId == null;
    }

    public Long getNowUserPhone() {
        return this.nowUserPhone;
    }

    public void setNowUserPhone(Long nowUserPhone) {
        this.nowUserPhone = nowUserPhone;
        this.isset_nowUserPhone = true;
    }

    @JsonIgnore
    public boolean isEmptyNowUserPhone() {
        return this.nowUserPhone == null;
    }

    public String getNowUserName() {
        return this.nowUserName;
    }

    public void setNowUserName(String nowUserName) {
        this.nowUserName = nowUserName;
        this.isset_nowUserName = true;
    }

    @JsonIgnore
    public boolean isEmptyNowUserName() {
        return this.nowUserName == null || this.nowUserName.length() == 0;
    }

    public Integer getGoodsNum() {
        return this.goodsNum;
    }

    public void setGoodsNum(Integer goodsNum) {
        this.goodsNum = goodsNum;
        this.isset_goodsNum = true;
    }

    @JsonIgnore
    public boolean isEmptyGoodsNum() {
        return this.goodsNum == null;
    }

    /**
     * é‡å†™ toString() æ–¹æ³•
     */
    @Override
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("transBusinessId=").append(this.transBusinessId)
                .append("procureModelUserRecordId=").append(this.procureModelUserRecordId)
                .append("whProcureModelId=").append(this.whProcureModelId)
                .append("baseGoodsModelsId=").append(this.baseGoodsModelsId)
                .append("nowUserPhone=").append(this.nowUserPhone)
                .append("nowUserName=").append(this.nowUserName)
                .append("goodsNum=").append(this.goodsNum)
                .toString();
    }

    /**
     * å…‹éš†
     */
    public LWhProcureModelUser $clone() {
        LWhProcureModelUser l_wh_procure_model_user = new LWhProcureModelUser();

        // æ•°æ®åº“名称
        //l_wh_procure_model_user.setDatabaseName_(this.getDatabaseName_());

        // ä¸»é”®
        if (this.isset_id) {
            l_wh_procure_model_user.setId(this.getId());
        }
        // æ™®é€šå±žæ€§
        if (this.isset_transBusinessId) {
            l_wh_procure_model_user.setTransBusinessId(this.getTransBusinessId());
        }
        if (this.isset_procureModelUserRecordId) {
            l_wh_procure_model_user.setProcureModelUserRecordId(this.getProcureModelUserRecordId());
        }
        if (this.isset_whProcureModelId) {
            l_wh_procure_model_user.setWhProcureModelId(this.getWhProcureModelId());
        }
        if (this.isset_baseGoodsModelsId) {
            l_wh_procure_model_user.setBaseGoodsModelsId(this.getBaseGoodsModelsId());
        }
        if (this.isset_nowUserPhone) {
            l_wh_procure_model_user.setNowUserPhone(this.getNowUserPhone());
        }
        if (this.isset_nowUserName) {
            l_wh_procure_model_user.setNowUserName(this.getNowUserName());
        }
        if (this.isset_goodsNum) {
            l_wh_procure_model_user.setGoodsNum(this.getGoodsNum());
        }
        return l_wh_procure_model_user;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUser_mapper.java

New file
@@ -0,0 +1,317 @@
package com.consum.model.po;

import com.walker.jdbc.BaseMapper;
import com.walker.jdbc.ResultSetUtils;
import com.walker.jdbc.SqlAndParameters;
import com.walker.jdbc.sqlgen.DeleteBuilder;
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
import com.walker.jdbc.util.StringUtils;

import org.springframework.jdbc.core.RowMapper;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;

/**
 * è¡¨å:L_WH_PROCURE_MODEL_USER *
 * @author genrator
 */
public class LWhProcureModelUser_mapper extends LWhProcureModelUser implements BaseMapper<LWhProcureModelUser> {
    // åºåˆ—化版本号
    private static final long serialVersionUID = 1L;

    public static final RowMapper<LWhProcureModelUser> ROW_MAPPER = new LWhProcureModelUserRowMapper();

    // ä¸»é”®
    public static final String Id = "id";
    // æ™®é€šå±žæ€§
    public static final String TransBusinessId = "trans_business_id";
    public static final String ProcureModelUserRecordId = "procure_model_user_record_id";
    public static final String WhProcureModelId = "wh_procure_model_id";
    public static final String BaseGoodsModelsId = "base_goods_models_id";
    public static final String NowUserPhone = "now_user_phone";
    public static final String NowUserName = "now_user_name";
    public static final String GoodsNum = "goods_num";

    /**
     * é»˜è®¤æž„造函数
     */
    public LWhProcureModelUser_mapper(LWhProcureModelUser lWhProcureModelUser) {
        if (lWhProcureModelUser == null) {
            throw new IllegalArgumentException("po参数不允许为空！");
        }
        //主键
        if (lWhProcureModelUser.isset_id) {
            this.setId(lWhProcureModelUser.getId());
        }
        //普通属性
        if (lWhProcureModelUser.isset_transBusinessId) {
            this.setTransBusinessId(lWhProcureModelUser.getTransBusinessId());
        }
        if (lWhProcureModelUser.isset_procureModelUserRecordId) {
            this.setProcureModelUserRecordId(lWhProcureModelUser.getProcureModelUserRecordId());
        }
        if (lWhProcureModelUser.isset_whProcureModelId) {
            this.setWhProcureModelId(lWhProcureModelUser.getWhProcureModelId());
        }
        if (lWhProcureModelUser.isset_baseGoodsModelsId) {
            this.setBaseGoodsModelsId(lWhProcureModelUser.getBaseGoodsModelsId());
        }
        if (lWhProcureModelUser.isset_nowUserPhone) {
            this.setNowUserPhone(lWhProcureModelUser.getNowUserPhone());
        }
        if (lWhProcureModelUser.isset_nowUserName) {
            this.setNowUserName(lWhProcureModelUser.getNowUserName());
        }
        if (lWhProcureModelUser.isset_goodsNum) {
            this.setGoodsNum(lWhProcureModelUser.getGoodsNum());
        }
        // åŽ»æŽ‰ï¼Œ2022-09-07
        // this.setDatabaseName_(l_wh_procure_model_user.getDatabaseName_());
    }

    /**
     * èŽ·å–表名
     */
    @Override
    public String getTableName_() {
        String tableName = "l_wh_procure_model_user";
        /**
        if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
            return this.getDatabaseName_() + "." + tableName;
        } else {
            return tableName;
        }
        */
        return tableName;
    }

    /**
     * èŽ·å–主键名称
     */
    @Override
    public String getPkName_() {
        return Id;
    }

    /**
     * èŽ·å–主键值
     */
    @Override
    public Object getPkValue_() {
        return this.getId();
    }

    /**
     * èŽ·å–插入语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getInsertSql_() {
        InsertBuilder ib = new InsertBuilder(this.getTableName_());
        ib.set(Id, this.getId());
        ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ib.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ib.set(WhProcureModelId, this.getWhProcureModelId(), this.isset_whProcureModelId);
        ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
        ib.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ib.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ib.set(GoodsNum, this.getGoodsNum(), this.isset_goodsNum);
        return ib.genMapSql();
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(WhProcureModelId, this.getWhProcureModelId(), this.isset_whProcureModelId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(GoodsNum, this.getGoodsNum(), this.isset_goodsNum);
        ub.where(this.getPkName_(), this.getPkValue_());
        return ub.genMapSql();
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(WhProcureModelId, this.getWhProcureModelId(), this.isset_whProcureModelId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(GoodsNum, this.getGoodsNum(), this.isset_goodsNum);
        return ub.genMapSql(where, parameters);
    }

    /**
     * èŽ·å–更新语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
        ub.set(ProcureModelUserRecordId, this.getProcureModelUserRecordId(), this.isset_procureModelUserRecordId);
        ub.set(WhProcureModelId, this.getWhProcureModelId(), this.isset_whProcureModelId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
        ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
        ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
        ub.set(GoodsNum, this.getGoodsNum(), this.isset_goodsNum);
        return ub.genArraySql(where, parameters);
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getDeleteSql_() {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        db.where(this.getPkName_(), this.getPkValue_());
        return db.genMapSql();
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getDeleteSql_(String where, Map<String, Object> parameters) {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        return db.genMapSql(where, parameters);
    }

    /**
     * èŽ·å–删除语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getDeleteSql_(String where, Object[] parameters) {
        DeleteBuilder db = new DeleteBuilder(this.getTableName_());
        return db.genArraySql(where, parameters);
    }

    /**
     * èŽ·å–单行查询语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSingleSql_() {
        SelectBuilder sb = new SelectBuilder(this.getTableName_());
        sb.where(this.getPkName_(), this.getPkValue_());
        return sb.genMapSql();
    }


    /**
     * èŽ·å–查询语句和参数
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, trans_business_id, procure_model_user_record_id, wh_procure_model_id, base_goods_models_id, now_user_phone, now_user_name, goods_num from " + this.getTableName_() + " " + where, parameters);
    }

    /**
     * èŽ·å–查询语句和参数
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, trans_business_id, procure_model_user_record_id, wh_procure_model_id, base_goods_models_id, now_user_phone, now_user_name, goods_num from " + this.getTableName_() + " " + where, parameters);
    }

    /**
     * å°†resultset的一行转化为po
     */
    @Override
    public LWhProcureModelUser mapRow(ResultSet rs, int i) throws SQLException {
        return ROW_MAPPER.mapRow(rs, i);
    }

    /**
     * å…‹éš†
     */
    public LWhProcureModelUser toLWhProcureModelUser() {
        return super.$clone();
    }
}

/**
 * l_wh_procure_model_user RowMapper
 *
 * @author genrator
 */
class LWhProcureModelUserRowMapper implements RowMapper<LWhProcureModelUser> {

    @Override
    public LWhProcureModelUser mapRow(ResultSet rs, int i) throws SQLException {
        ResultSetUtils resultSetUtils = new ResultSetUtils();
        LWhProcureModelUser l_wh_procure_model_user = new LWhProcureModelUser();
        Integer columnIndex;
        //主键
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.Id);
        if (columnIndex > 0) {
            l_wh_procure_model_user.setId(rs.getLong(columnIndex));
        }
        //普通属性
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.TransBusinessId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setTransBusinessId(null);
            } else {
                l_wh_procure_model_user.setTransBusinessId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.ProcureModelUserRecordId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setProcureModelUserRecordId(null);
            } else {
                l_wh_procure_model_user.setProcureModelUserRecordId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.WhProcureModelId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setWhProcureModelId(null);
            } else {
                l_wh_procure_model_user.setWhProcureModelId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.BaseGoodsModelsId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setBaseGoodsModelsId(null);
            } else {
                l_wh_procure_model_user.setBaseGoodsModelsId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.NowUserPhone);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setNowUserPhone(null);
            } else {
                l_wh_procure_model_user.setNowUserPhone(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.NowUserName);
        if (columnIndex > 0) {
            l_wh_procure_model_user.setNowUserName(rs.getString(columnIndex));
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUser_mapper.GoodsNum);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_procure_model_user.setGoodsNum(null);
            } else {
                l_wh_procure_model_user.setGoodsNum(rs.getInt(columnIndex));
            }
        }
        return l_wh_procure_model_user;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/WhWarning.java

@@ -20,6 +20,10 @@
    protected boolean isset_id = false;

    // å±žæ€§åˆ—表
    private Integer warehouseType = null;
    @JsonIgnore
    protected boolean isset_warehouseType = false;

    private Long baseWarehouseId = null;
    @JsonIgnore
    protected boolean isset_baseWarehouseId = false;
@@ -125,6 +129,20 @@
    @JsonIgnore
    public boolean isEmptyId() {
        return this.id == null;
    }

    public Integer getWarehouseType() {
        return this.warehouseType;
    }

    public void setWarehouseType(Integer warehouseType) {
        this.warehouseType = warehouseType;
        this.isset_warehouseType = true;
    }

    @JsonIgnore
    public boolean isEmptyWarehouseType() {
        return this.warehouseType == null;
    }

    public Long getBaseWarehouseId() {
@@ -386,6 +404,7 @@
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("warehouseType=").append(this.warehouseType)
                .append("baseWarehouseId=").append(this.baseWarehouseId)
                .append("baseWarehouseName=").append(this.baseWarehouseName)
                .append("baseGoodsTemplateId=").append(this.baseGoodsTemplateId)
@@ -421,6 +440,9 @@
            wh_warning.setId(this.getId());
        }
        // æ™®é€šå±žæ€§
        if (this.isset_warehouseType) {
            wh_warning.setWarehouseType(this.getWarehouseType());
        }
        if (this.isset_baseWarehouseId) {
            wh_warning.setBaseWarehouseId(this.getBaseWarehouseId());
        }

 consum-model-pojo/src/main/java/com/consum/model/po/WhWarningConfig.java

@@ -20,6 +20,10 @@
    protected boolean isset_id = false;

    // å±žæ€§åˆ—表
    private Integer warehouseType = null;
    @JsonIgnore
    protected boolean isset_warehouseType = false;

    private Long baseWarehouseId = null;
    @JsonIgnore
    protected boolean isset_baseWarehouseId = false;
@@ -77,6 +81,20 @@
    @JsonIgnore
    public boolean isEmptyId() {
        return this.id == null;
    }

    public Integer getWarehouseType() {
        return this.warehouseType;
    }

    public void setWarehouseType(Integer warehouseType) {
        this.warehouseType = warehouseType;
        this.isset_warehouseType = true;
    }

    @JsonIgnore
    public boolean isEmptyWarehouseType() {
        return this.warehouseType == null;
    }

    public Long getBaseWarehouseId() {
@@ -170,6 +188,7 @@
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("warehouseType=").append(this.warehouseType)
                .append("baseWarehouseId=").append(this.baseWarehouseId)
                .append("baseGoodsTemplateId=").append(this.baseGoodsTemplateId)
                .append("baseGoodsModelsId=").append(this.baseGoodsModelsId)
@@ -193,6 +212,9 @@
            wh_warning_config.setId(this.getId());
        }
        // æ™®é€šå±žæ€§
        if (this.isset_warehouseType) {
            wh_warning_config.setWarehouseType(this.getWarehouseType());
        }
        if (this.isset_baseWarehouseId) {
            wh_warning_config.setBaseWarehouseId(this.getBaseWarehouseId());
        }

 consum-model-pojo/src/main/java/com/consum/model/po/WhWarningConfig_mapper.java

@@ -28,6 +28,7 @@
    // ä¸»é”®
    public static final String Id = "id";
    // æ™®é€šå±žæ€§
    public static final String WarehouseType = "warehouse_type";
    public static final String BaseWarehouseId = "base_warehouse_id";
    public static final String BaseGoodsTemplateId = "base_goods_template_id";
    public static final String BaseGoodsModelsId = "base_goods_models_id";
@@ -47,6 +48,9 @@
            this.setId(whWarningConfig.getId());
        }
        //普通属性
        if (whWarningConfig.isset_warehouseType) {
            this.setWarehouseType(whWarningConfig.getWarehouseType());
        }
        if (whWarningConfig.isset_baseWarehouseId) {
            this.setBaseWarehouseId(whWarningConfig.getBaseWarehouseId());
        }
@@ -108,6 +112,7 @@
    public SqlAndParameters<Map<String, Object>> getInsertSql_() {
        InsertBuilder ib = new InsertBuilder(this.getTableName_());
        ib.set(Id, this.getId());
        ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ib.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -123,6 +128,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -139,6 +145,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -154,6 +161,7 @@
    @Override
    public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -207,7 +215,7 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -215,7 +223,7 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -252,6 +260,14 @@
            wh_warning_config.setId(rs.getLong(columnIndex));
        }
        //普通属性
        columnIndex = resultSetUtils.findColumn(rs, WhWarningConfig_mapper.WarehouseType);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                wh_warning_config.setWarehouseType(null);
            } else {
                wh_warning_config.setWarehouseType(rs.getInt(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, WhWarningConfig_mapper.BaseWarehouseId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {

 consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_mapper.java

@@ -28,6 +28,7 @@
    // ä¸»é”®
    public static final String Id = "id";
    // æ™®é€šå±žæ€§
    public static final String WarehouseType = "warehouse_type";
    public static final String BaseWarehouseId = "base_warehouse_id";
    public static final String BaseWarehouseName = "base_warehouse_name";
    public static final String BaseGoodsTemplateId = "base_goods_template_id";
@@ -59,6 +60,9 @@
            this.setId(whWarning.getId());
        }
        //普通属性
        if (whWarning.isset_warehouseType) {
            this.setWarehouseType(whWarning.getWarehouseType());
        }
        if (whWarning.isset_baseWarehouseId) {
            this.setBaseWarehouseId(whWarning.getBaseWarehouseId());
        }
@@ -156,6 +160,7 @@
    public SqlAndParameters<Map<String, Object>> getInsertSql_() {
        InsertBuilder ib = new InsertBuilder(this.getTableName_());
        ib.set(Id, this.getId());
        ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ib.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ib.set(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
        ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -183,6 +188,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -211,6 +217,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -238,6 +245,7 @@
    @Override
    public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -303,7 +311,7 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -311,7 +319,7 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -348,6 +356,14 @@
            wh_warning.setId(rs.getLong(columnIndex));
        }
        //普通属性
        columnIndex = resultSetUtils.findColumn(rs, WhWarning_mapper.WarehouseType);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                wh_warning.setWarehouseType(null);
            } else {
                wh_warning.setWarehouseType(rs.getInt(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, WhWarning_mapper.BaseWarehouseId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {