From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001 From: 黎星凯 <13949086503@163.com> Date: 星期六, 11 五月 2024 17:26:02 +0800 Subject: [PATCH] 20240511修改: 分发单优化, 分类,物品,分发单明细,采购单明细数据导入 --- consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java index a115a9f..be3829b 100644 --- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java +++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java @@ -26,6 +26,7 @@ // 涓婚敭 public static final String Id = "id"; // 鏅�氬睘鎬� + public static final String WarehouseType = "warehouse_type"; public static final String WarehouseId = "warehouse_id"; public static final String WarehouseFlowId = "warehouse_flow_id"; public static final String InitialCount = "initial_count"; @@ -37,6 +38,7 @@ public static final String BaseGoodsModelsId = "base_goods_models_id"; public static final String BaseGoodsModelsName = "base_goods_models_name"; public static final String DealTime = "deal_time"; + public static final String TotalPrice = "total_price"; /** * 榛樿鏋勯�犲嚱鏁� @@ -50,6 +52,9 @@ this.setId(lWhGoodsRecord.getId()); } //鏅�氬睘鎬� + if (lWhGoodsRecord.isset_warehouseType) { + this.setWarehouseType(lWhGoodsRecord.getWarehouseType()); + } if (lWhGoodsRecord.isset_warehouseId) { this.setWarehouseId(lWhGoodsRecord.getWarehouseId()); } @@ -82,6 +87,9 @@ } if (lWhGoodsRecord.isset_dealTime) { this.setDealTime(lWhGoodsRecord.getDealTime()); + } + if (lWhGoodsRecord.isset_totalPrice) { + this.setTotalPrice(lWhGoodsRecord.getTotalPrice()); } // 鍘绘帀锛�2022-09-07 // this.setDatabaseName_(l_wh_goods_record.getDatabaseName_()); @@ -126,6 +134,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(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ib.set(InitialCount, this.getInitialCount(), this.isset_initialCount); @@ -137,6 +146,7 @@ ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ib.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ib.set(DealTime, this.getDealTime(), this.isset_dealTime); + ib.set(TotalPrice, this.getTotalPrice(), this.isset_totalPrice); return ib.genMapSql(); } @@ -146,6 +156,7 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_() { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); + ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); @@ -157,6 +168,7 @@ ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); + ub.set(TotalPrice, this.getTotalPrice(), this.isset_totalPrice); ub.where(this.getPkName_(), this.getPkValue_()); return ub.genMapSql(); } @@ -167,6 +179,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(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); @@ -178,6 +191,7 @@ ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); + ub.set(TotalPrice, this.getTotalPrice(), this.isset_totalPrice); return ub.genMapSql(where, parameters); } @@ -187,6 +201,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(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); @@ -198,6 +213,7 @@ ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); + ub.set(TotalPrice, this.getTotalPrice(), this.isset_totalPrice); return ub.genArraySql(where, parameters); } @@ -245,7 +261,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { - return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time, total_price from " + this.getTableName_() + " " + where, parameters); } /** @@ -253,7 +269,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { - return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time, total_price from " + this.getTableName_() + " " + where, parameters); } /** @@ -290,6 +306,14 @@ l_wh_goods_record.setId(rs.getLong(columnIndex)); } //鏅�氬睘鎬� + columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseType); + if (columnIndex > 0) { + if (rs.getBigDecimal(columnIndex) == null) { + l_wh_goods_record.setWarehouseType(null); + } else { + l_wh_goods_record.setWarehouseType(rs.getInt(columnIndex)); + } + } columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { @@ -370,6 +394,14 @@ l_wh_goods_record.setDealTime(rs.getLong(columnIndex)); } } + columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.TotalPrice); + if (columnIndex > 0) { + if (rs.getBigDecimal(columnIndex) == null) { + l_wh_goods_record.setTotalPrice(null); + } else { + l_wh_goods_record.setTotalPrice(rs.getLong(columnIndex)); + } + } return l_wh_goods_record; } } -- Gitblit v1.9.1