consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -51,7 +51,7 @@ * @Date 2023/10/27 */ @ApiOperation(value = "新增出库单", notes = "新增出库单") // @ApiImplicitParam(name = "param", value = "出库单实体", required = true, dataType = "LWhFormOutputInsertParam") // @ApiImplicitParam(name = "param", value = "出库单实体", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body") @PostMapping("/add") public ResponseValue add() { LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class); @@ -70,7 +70,7 @@ * @Description 列表查询 */ @ApiOperation(value = "列表查询", notes = "列表查询") @ApiImplicitParam(name = "param", value = "出库单实体", required = true, dataType = "LWhFormOutputParam") @ApiImplicitParam(name = "param", value = "出库单实体", required = true, dataType = "LWhFormOutputParam", paramType = "query") @GetMapping("/list") public ResponseValue queryFormOutputList() { LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class); consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputVO.java
New file @@ -0,0 +1,52 @@ package com.consum.base.pojo.response; import com.consum.model.po.LWhProcureModel; import io.swagger.annotations.ApiModel; import java.util.List; import lombok.Data; /** * @author asus * @version 1.0 * @description: TODO * @date 2023/11/13 16:45 */ @Data @ApiModel public class LWhFormOutputVO { // 主键 private Long id; // 单号 private String businessFormCode; // 出库仓库id private Long warehouseId; // 出库仓库name private String warehouseName; // 机构id private Long agencyId; // 机构名称 private String agencyName; // 操作人id private Long operatorId; // 操作人名称 private String operatorName; // 处理时间 private Long dealTime; // 出库手续 private Long doc; private List<FromProcureTemplateInfoVO> fromProcureTemplateInfoList; private List<LWhProcureModel> models; } consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java
@@ -7,10 +7,12 @@ /** * 表名:L_WH_PROCURE_MODEL * * * @author genrator */ @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class LWhProcureModel extends BasePo<LWhProcureModel> { // 序列化版本号 private static final long serialVersionUID = 1L; @@ -55,6 +57,10 @@ private String supplier = null; @JsonIgnore protected boolean isset_supplier = false; private Long totalAmount; @JsonIgnore protected boolean isset_totalAmount = false; /** * 默认构造函数 @@ -217,23 +223,37 @@ return this.supplier == null || this.supplier.length() == 0; } public Long getTotalAmount() { return totalAmount; } public void setTotalAmount(Long totalAmount) { this.totalAmount = totalAmount; this.isset_totalAmount = true; } @JsonIgnore public boolean isEmptyTotalAmount() { return this.totalAmount == null; } /** * 重写 toString() 方法 */ @Override public String toString() { return new StringBuilder() .append("id=").append(this.id) .append("fromProcureGoodsId=").append(this.fromProcureGoodsId) .append("businessType=").append(this.businessType) .append("businessId=").append(this.businessId) .append("baseGoodsModelsId=").append(this.baseGoodsModelsId) .append("baseGoodsModelsName=").append(this.baseGoodsModelsName) .append("price=").append(this.price) .append("counts=").append(this.counts) .append("worehouseCount=").append(this.worehouseCount) .append("supplier=").append(this.supplier) .toString(); .append("id=").append(this.id) .append("fromProcureGoodsId=").append(this.fromProcureGoodsId) .append("businessType=").append(this.businessType) .append("businessId=").append(this.businessId) .append("baseGoodsModelsId=").append(this.baseGoodsModelsId) .append("baseGoodsModelsName=").append(this.baseGoodsModelsName) .append("price=").append(this.price) .append("counts=").append(this.counts) .append("worehouseCount=").append(this.worehouseCount) .append("supplier=").append(this.supplier) .toString(); } /** @@ -277,6 +297,9 @@ if (this.isset_supplier) { l_wh_procure_model.setSupplier(this.getSupplier()); } if (this.isset_totalAmount) { l_wh_procure_model.setTotalAmount(this.getTotalAmount()); } return l_wh_procure_model; } } consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel_mapper.java
@@ -7,13 +7,10 @@ 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; import org.springframework.jdbc.core.RowMapper; /** * 表名:L_WH_PROCURE_MODEL * @@ -37,6 +34,7 @@ public static final String Counts = "counts"; public static final String WorehouseCount = "worehouse_count"; public static final String Supplier = "supplier"; public static final String TotalAmount = "total_amount"; /** * 默认构造函数 @@ -76,6 +74,9 @@ } if (lWhProcureModel.isset_supplier) { this.setSupplier(lWhProcureModel.getSupplier()); } if (lWhProcureModel.isset_totalAmount) { this.setTotalAmount(lWhProcureModel.getTotalAmount()); } // 去掉，2022-09-07 // this.setDatabaseName_(l_wh_procure_model.getDatabaseName_()); @@ -129,6 +130,7 @@ ib.set(Counts, this.getCounts(), this.isset_counts); ib.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); ib.set(Supplier, this.getSupplier(), this.isset_supplier); ib.set(TotalAmount, this.getTotalAmount(), this.isset_totalAmount); return ib.genMapSql(); } @@ -147,6 +149,7 @@ ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); ub.set(Supplier, this.getSupplier(), this.isset_supplier); ub.set(TotalAmount, this.getTotalAmount(), this.isset_totalAmount); ub.where(this.getPkName_(), this.getPkValue_()); return ub.genMapSql(); } @@ -166,6 +169,7 @@ ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); ub.set(Supplier, this.getSupplier(), this.isset_supplier); ub.set(TotalAmount, this.getTotalAmount(), this.isset_totalAmount); return ub.genMapSql(where, parameters); } @@ -184,6 +188,7 @@ ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); ub.set(Supplier, this.getSupplier(), this.isset_supplier); ub.set(TotalAmount, this.getTotalAmount(), this.isset_totalAmount); return ub.genArraySql(where, parameters); } @@ -231,7 +236,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, price, counts, worehouse_count, supplier, total_amount from " + this.getTableName_() + " " + where, parameters); } /** @@ -239,7 +244,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, price, counts, worehouse_count, supplier, total_amount from " + this.getTableName_() + " " + where, parameters); } /** @@ -340,6 +345,14 @@ if (columnIndex > 0) { l_wh_procure_model.setSupplier(rs.getString(columnIndex)); } columnIndex = resultSetUtils.findColumn(rs, LWhProcureModel_mapper.TotalAmount); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_procure_model.setTotalAmount(null); } else { l_wh_procure_model.setTotalAmount(rs.getLong(columnIndex)); } } return l_wh_procure_model; } }
