diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java
new file mode 100644
index 000000000..0f6820e23
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java
@@ -0,0 +1,139 @@
+package com.zhgd.xmgl.modules.concretemixstation.controller;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParams;
+
+import java.util.HashMap;
+
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+import com.zhgd.jeecg.common.api.vo.Result;
+import org.apache.commons.collections.MapUtils;
+
+import org.simpleframework.xml.core.Validate;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @Title: Controller
+ * @Description: 混凝土拌合站生产数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/xmgl/concreteMixStationData")
+@Slf4j
+@Api(tags = "混凝土拌合站生产数据相关Api")
+public class ConcreteMixStationDataController {
+	@Autowired
+	private IConcreteMixStationDataService concreteMixStationDataService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "分页列表查询混凝土拌合站生产数据信息", notes = "分页列表查询混凝土拌合站生产数据信息", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
+	})
+	@GetMapping(value = "/page")
+	public Result<IPage<ConcreteMixStationData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+		return Result.success(concreteMixStationDataService.queryPageList(paramMap));
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "列表查询混凝土拌合站生产数据信息", notes = "列表查询混凝土拌合站生产数据信息", httpMethod = "GET")
+	@GetMapping(value = "/list")
+	public Result<List<ConcreteMixStationData>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+		return Result.success(concreteMixStationDataService.queryList(paramMap));
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param concreteMixStationData
+	 * @return
+	 */
+	@ApiOperation(value = "添加混凝土拌合站生产数据信息", notes = "添加混凝土拌合站生产数据信息", httpMethod = "POST")
+	@PostMapping(value = "/add")
+	public Result<ConcreteMixStationData> add(@RequestBody @Validate ConcreteMixStationData concreteMixStationData) {
+		concreteMixStationDataService.add(concreteMixStationData);
+		return Result.ok();
+	}
+
+	/**
+	 * 编辑
+	 *
+	 * @param concreteMixStationData
+	 * @return
+	 */
+	@ApiOperation(value = "编辑混凝土拌合站生产数据信息", notes = "编辑混凝土拌合站生产数据信息", httpMethod = "POST")
+	@PostMapping(value = "/edit")
+	public Result<ConcreteMixStationData> edit(@RequestBody ConcreteMixStationData concreteMixStationData) {
+		concreteMixStationDataService.edit(concreteMixStationData);
+		return Result.ok();
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "删除混凝土拌合站生产数据信息", notes = "删除混凝土拌合站生产数据信息", httpMethod = "POST")
+	@ApiImplicitParam(name = "id", value = "混凝土拌合站生产数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
+	@PostMapping(value = "/delete")
+	public Result<ConcreteMixStationData> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
+		String id = MapUtils.getString(map, "id");
+		Result<ConcreteMixStationData> result = new Result<ConcreteMixStationData>();
+		ConcreteMixStationData concreteMixStationData = concreteMixStationDataService.getById(id);
+		if (concreteMixStationData == null) {
+			result.error500("未找到对应实体");
+		} else {
+			boolean ok = concreteMixStationDataService.removeById(id);
+			if (ok) {
+				result.success("删除成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value = "通过id查询混凝土拌合站生产数据信息", notes = "通过id查询混凝土拌合站生产数据信息", httpMethod = "GET")
+	@ApiImplicitParam(name = "id", value = "混凝土拌合站生产数据ID", paramType = "query", required = true, dataType = "Integer")
+	@GetMapping(value = "/queryById")
+	public Result<ConcreteMixStationData> queryById(@RequestParam(name = "id", required = true) String id) {
+		Result<ConcreteMixStationData> result = new Result<ConcreteMixStationData>();
+		ConcreteMixStationData concreteMixStationData = concreteMixStationDataService.getById(id);
+		if (concreteMixStationData == null) {
+			result.error500("未找到对应实体");
+		} else {
+			result.setResult(concreteMixStationData);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDevController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDevController.java
new file mode 100644
index 000000000..75106021c
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDevController.java
@@ -0,0 +1,139 @@
+package com.zhgd.xmgl.modules.concretemixstation.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParams;
+
+import java.util.HashMap;
+
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+import com.zhgd.jeecg.common.api.vo.Result;
+import org.apache.commons.collections.MapUtils;
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDevService;
+
+import org.simpleframework.xml.core.Validate;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @Title: Controller
+ * @Description: 混凝土拌合站设备
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/xmgl/concreteMixStationDev")
+@Slf4j
+@Api(tags = "混凝土拌合站设备相关Api")
+public class ConcreteMixStationDevController {
+	@Autowired
+	private IConcreteMixStationDevService concreteMixStationDevService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "分页列表查询混凝土拌合站设备信息", notes = "分页列表查询混凝土拌合站设备信息", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
+	})
+	@GetMapping(value = "/page")
+	public Result<IPage<ConcreteMixStationDev>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+		return Result.success(concreteMixStationDevService.queryPageList(paramMap));
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "列表查询混凝土拌合站设备信息", notes = "列表查询混凝土拌合站设备信息", httpMethod = "GET")
+	@GetMapping(value = "/list")
+	public Result<List<ConcreteMixStationDev>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+		return Result.success(concreteMixStationDevService.queryList(paramMap));
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param concreteMixStationDev
+	 * @return
+	 */
+	@ApiOperation(value = "添加混凝土拌合站设备信息", notes = "添加混凝土拌合站设备信息", httpMethod = "POST")
+	@PostMapping(value = "/add")
+	public Result<ConcreteMixStationDev> add(@RequestBody @Validate ConcreteMixStationDev concreteMixStationDev) {
+		concreteMixStationDevService.add(concreteMixStationDev);
+		return Result.ok();
+	}
+
+	/**
+	 * 编辑
+	 *
+	 * @param concreteMixStationDev
+	 * @return
+	 */
+	@ApiOperation(value = "编辑混凝土拌合站设备信息", notes = "编辑混凝土拌合站设备信息", httpMethod = "POST")
+	@PostMapping(value = "/edit")
+	public Result<ConcreteMixStationDev> edit(@RequestBody ConcreteMixStationDev concreteMixStationDev) {
+		concreteMixStationDevService.edit(concreteMixStationDev);
+		return Result.ok();
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "删除混凝土拌合站设备信息", notes = "删除混凝土拌合站设备信息", httpMethod = "POST")
+	@ApiImplicitParam(name = "id", value = "混凝土拌合站设备ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
+	@PostMapping(value = "/delete")
+	public Result<ConcreteMixStationDev> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
+		String id = MapUtils.getString(map, "id");
+		Result<ConcreteMixStationDev> result = new Result<ConcreteMixStationDev>();
+		ConcreteMixStationDev concreteMixStationDev = concreteMixStationDevService.getById(id);
+		if (concreteMixStationDev == null) {
+			result.error500("未找到对应实体");
+		} else {
+			boolean ok = concreteMixStationDevService.removeById(id);
+			if (ok) {
+				result.success("删除成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value = "通过id查询混凝土拌合站设备信息", notes = "通过id查询混凝土拌合站设备信息", httpMethod = "GET")
+	@ApiImplicitParam(name = "id", value = "混凝土拌合站设备ID", paramType = "query", required = true, dataType = "Integer")
+	@GetMapping(value = "/queryById")
+	public Result<ConcreteMixStationDev> queryById(@RequestParam(name = "id", required = true) String id) {
+		Result<ConcreteMixStationDev> result = new Result<ConcreteMixStationDev>();
+		ConcreteMixStationDev concreteMixStationDev = concreteMixStationDevService.getById(id);
+		if (concreteMixStationDev == null) {
+			result.error500("未找到对应实体");
+		} else {
+			result.setResult(concreteMixStationDev);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java
new file mode 100644
index 000000000..66e3e347c
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java
@@ -0,0 +1,139 @@
+package com.zhgd.xmgl.modules.concretemixstation.controller;
+
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationMaterialDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParams;
+
+import java.util.HashMap;
+
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+import com.zhgd.jeecg.common.api.vo.Result;
+import org.apache.commons.collections.MapUtils;
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
+
+import org.simpleframework.xml.core.Validate;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @Title: Controller
+ * @Description: 混凝土拌合站材料用量数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/xmgl/concreteMixStationMaterialData")
+@Slf4j
+@Api(tags = "混凝土拌合站材料用量数据相关Api")
+public class ConcreteMixStationMaterialDataController {
+    @Autowired
+    private IConcreteMixStationMaterialDataService concreteMixStationMaterialDataService;
+
+    /**
+     * 分页列表查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "分页列表查询混凝土拌合站材料用量数据信息", notes = "分页列表查询混凝土拌合站材料用量数据信息", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
+    })
+    @GetMapping(value = "/page")
+    public Result<IPage<ConcreteMixStationMaterialData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(concreteMixStationMaterialDataService.queryPageList(paramMap));
+    }
+
+    /**
+     * 列表查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "列表查询混凝土拌合站材料用量数据信息", notes = "列表查询混凝土拌合站材料用量数据信息", httpMethod = "GET")
+    @GetMapping(value = "/list")
+    public Result<List<ConcreteMixStationMaterialData>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(concreteMixStationMaterialDataService.queryList(paramMap));
+    }
+
+    /**
+     * 添加
+     *
+     * @param concreteMixStationMaterialData
+     * @return
+     */
+    @ApiOperation(value = "添加混凝土拌合站材料用量数据信息", notes = "添加混凝土拌合站材料用量数据信息", httpMethod = "POST")
+    @PostMapping(value = "/add")
+    public Result<ConcreteMixStationMaterialData> add(@RequestBody @Validate ConcreteMixStationMaterialData concreteMixStationMaterialData) {
+        concreteMixStationMaterialDataService.add(concreteMixStationMaterialData);
+        return Result.ok();
+    }
+
+    /**
+     * 编辑
+     *
+     * @param concreteMixStationMaterialData
+     * @return
+     */
+    @ApiOperation(value = "编辑混凝土拌合站材料用量数据信息", notes = "编辑混凝土拌合站材料用量数据信息", httpMethod = "POST")
+    @PostMapping(value = "/edit")
+    public Result<ConcreteMixStationMaterialData> edit(@RequestBody ConcreteMixStationMaterialData concreteMixStationMaterialData) {
+        concreteMixStationMaterialDataService.edit(concreteMixStationMaterialData);
+        return Result.ok();
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @return
+     */
+    @ApiOperation(value = "删除混凝土拌合站材料用量数据信息", notes = "删除混凝土拌合站材料用量数据信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "id", value = "混凝土拌合站材料用量数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
+    @PostMapping(value = "/delete")
+    public Result<ConcreteMixStationMaterialData> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
+        String id = MapUtils.getString(map, "id");
+        Result<ConcreteMixStationMaterialData> result = new Result<ConcreteMixStationMaterialData>();
+        ConcreteMixStationMaterialData concreteMixStationMaterialData = concreteMixStationMaterialDataService.getById(id);
+        if (concreteMixStationMaterialData == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = concreteMixStationMaterialDataService.removeById(id);
+            if (ok) {
+                result.success("删除成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "通过id查询混凝土拌合站材料用量数据信息", notes = "通过id查询混凝土拌合站材料用量数据信息", httpMethod = "GET")
+    @ApiImplicitParam(name = "id", value = "混凝土拌合站材料用量数据ID", paramType = "query", required = true, dataType = "Integer")
+    @GetMapping(value = "/queryById")
+    public Result<ConcreteMixStationMaterialData> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ConcreteMixStationMaterialData> result = new Result<ConcreteMixStationMaterialData>();
+        ConcreteMixStationMaterialData concreteMixStationMaterialData = concreteMixStationMaterialDataService.getById(id);
+        if (concreteMixStationMaterialData == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(concreteMixStationMaterialData);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java
new file mode 100644
index 000000000..60df15815
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java
@@ -0,0 +1,136 @@
+package com.zhgd.xmgl.modules.concretemixstation.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 混凝土拌合站生产数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Data
+@TableName("concrete_mix_station_data")
+@ApiModel(value = "ConcreteMixStationData实体类", description = "ConcreteMixStationData")
+public class ConcreteMixStationData implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键id")
+	private java.lang.Long id;
+	/**
+	 * 设备sn
+	 */
+	@Excel(name = "设备sn", width = 15)
+	@ApiModelProperty(value = "设备sn")
+	private java.lang.String devSn;
+	/**
+	 * 设备名称
+	 */
+	@Excel(name = "设备名称", width = 15)
+	@ApiModelProperty(value = "设备名称")
+	private java.lang.String devName;
+	/**
+	 * 任务单号
+	 */
+	@Excel(name = "任务单号", width = 15)
+	@ApiModelProperty(value = "任务单号")
+	private java.lang.String taskNumber;
+	/**
+	 * 浇筑部位
+	 */
+	@Excel(name = "浇筑部位", width = 15)
+	@ApiModelProperty(value = "浇筑部位")
+	private java.lang.String pouringPart;
+	/**
+	 * 强度等级
+	 */
+	@Excel(name = "强度等级", width = 15)
+	@ApiModelProperty(value = "强度等级")
+	private java.lang.String powerLevel;
+	/**
+	 * 实际方量(m3)
+	 */
+	@Excel(name = "实际方量(m3)", width = 15)
+	@ApiModelProperty(value = "实际方量(m3)")
+	private java.lang.Double actualQuantity;
+	/**
+	 * 水胶比
+	 */
+	@Excel(name = "水胶比", width = 15)
+	@ApiModelProperty(value = "水胶比")
+	private java.lang.Double water_binderRatio;
+	/**
+	 * 出料时间
+	 */
+	@Excel(name = "出料时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "出料时间")
+	private java.util.Date dischargeTime;
+	/**
+	 * 使用状态：1正常2初级超标3中级超标4高级超标5异常
+	 */
+	@Excel(name = "使用状态：1正常2初级超标3中级超标4高级超标5异常", width = 15)
+	@ApiModelProperty(value = "使用状态：1正常2初级超标3中级超标4高级超标5异常")
+	private java.lang.Integer useStatus;
+	/**
+	 * 施工配合比
+	 */
+	@Excel(name = "施工配合比", width = 15)
+	@ApiModelProperty(value = "施工配合比")
+	private java.lang.String constructionMixRatio;
+	/**
+	 * 搅拌时长
+	 */
+	@Excel(name = "搅拌时长", width = 15)
+	@ApiModelProperty(value = "搅拌时长")
+	private java.lang.String stirringTime;
+	/**
+	 * 施工地点
+	 */
+	@Excel(name = "施工地点", width = 15)
+	@ApiModelProperty(value = "施工地点")
+	private java.lang.String constructionSite;
+	/**
+	 * 操作员
+	 */
+	@Excel(name = "操作员", width = 15)
+	@ApiModelProperty(value = "操作员")
+	private java.lang.String operator;
+	/**
+	 * 项目sn
+	 */
+	@Excel(name = "项目sn", width = 15)
+	@ApiModelProperty(value = "项目sn")
+	private java.lang.String projectSn;
+	/**
+	 * 创建时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date createDate;
+	/**
+	 * 更新时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date updateDate;
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java
new file mode 100644
index 000000000..7e80bc542
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java
@@ -0,0 +1,124 @@
+package com.zhgd.xmgl.modules.concretemixstation.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 混凝土拌合站设备
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Data
+@TableName("concrete_mix_station_dev")
+@ApiModel(value = "ConcreteMixStationDev实体类", description = "ConcreteMixStationDev")
+public class ConcreteMixStationDev implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键id")
+	private java.lang.Long id;
+	/**
+	 * 设备sn
+	 */
+	@Excel(name = "设备sn", width = 15)
+	@ApiModelProperty(value = "设备sn")
+	private java.lang.String devSn;
+	/**
+	 * 设备名称
+	 */
+	@Excel(name = "设备名称", width = 15)
+	@ApiModelProperty(value = "设备名称")
+	private java.lang.String devName;
+	/**
+	 * 备注
+	 */
+	@Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+	private java.lang.String remark;
+	/**
+	 * 图片
+	 */
+	@Excel(name = "图片", width = 15)
+	@ApiModelProperty(value = "图片")
+	private java.lang.Object image;
+	/**
+	 * 上传时间
+	 */
+	@Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "上传时间")
+	private java.util.Date uploadDate;
+	/**
+	 * 所属拌合站
+	 */
+	@Excel(name = "所属拌合站", width = 15)
+	@ApiModelProperty(value = "所属拌合站")
+	private java.lang.String belongingMixingStation;
+	/**
+	 * 拌合站型号
+	 */
+	@Excel(name = "拌合站型号", width = 15)
+	@ApiModelProperty(value = "拌合站型号")
+	private java.lang.String mixingPlantModel;
+	/**
+	 * 拌合站位置
+	 */
+	@Excel(name = "拌合站位置", width = 15)
+	@ApiModelProperty(value = "拌合站位置")
+	private java.lang.String mixingStationLocation;
+	/**
+	 * 负责人id
+	 */
+	@Excel(name = "负责人id", width = 15)
+	@ApiModelProperty(value = "负责人id")
+	private java.lang.Long dutyUserId;
+	/**
+	 * 负责人名称
+	 */
+	@Excel(name = "负责人名称", width = 15)
+	@ApiModelProperty(value = "负责人名称")
+	private java.lang.String dutyUserName;
+	/**
+	 * 负责人电话
+	 */
+	@Excel(name = "负责人电话", width = 15)
+	@ApiModelProperty(value = "负责人电话")
+	private java.lang.String phoneNumber;
+	/**
+	 * 项目sn
+	 */
+	@Excel(name = "项目sn", width = 15)
+	@ApiModelProperty(value = "项目sn")
+	private java.lang.String projectSn;
+	/**
+	 * 创建时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date createDate;
+	/**
+	 * 更新时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date updateDate;
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationMaterialData.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationMaterialData.java
new file mode 100644
index 000000000..f4841c7be
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationMaterialData.java
@@ -0,0 +1,92 @@
+package com.zhgd.xmgl.modules.concretemixstation.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 混凝土拌合站材料用量数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Data
+@TableName("concrete_mix_station_material_data")
+@ApiModel(value = "ConcreteMixStationMaterialData实体类", description = "ConcreteMixStationMaterialData")
+public class ConcreteMixStationMaterialData implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键id")
+	private java.lang.Long id;
+	/**
+	 * 混凝土拌合站生产数据id
+	 */
+	@Excel(name = "混凝土拌合站生产数据id", width = 15)
+	@ApiModelProperty(value = "混凝土拌合站生产数据id")
+	private java.lang.Long concreteMixStationDataId;
+	/**
+	 * 设备sn
+	 */
+	@Excel(name = "设备sn", width = 15)
+	@ApiModelProperty(value = "设备sn")
+	private java.lang.String devSn;
+	/**
+	 * 材料名称
+	 */
+	@Excel(name = "材料名称", width = 15)
+	@ApiModelProperty(value = "材料名称")
+	private java.lang.String materialName;
+	/**
+	 * 理论用量(kg)
+	 */
+	@Excel(name = "理论用量(kg)", width = 15)
+	@ApiModelProperty(value = "理论用量(kg)")
+	private java.lang.Double theoreticalDosage;
+	/**
+	 * 实际用量(kg)
+	 */
+	@Excel(name = "实际用量(kg)", width = 15)
+	@ApiModelProperty(value = "实际用量(kg)")
+	private java.lang.Double actualAmount;
+	/**
+	 * 误差(%)
+	 */
+	@Excel(name = "误差(%)", width = 15)
+	@ApiModelProperty(value = "误差(%)")
+	private java.lang.Double error;
+	/**
+	 * 项目sn
+	 */
+	@Excel(name = "项目sn", width = 15)
+	@ApiModelProperty(value = "项目sn")
+	private java.lang.String projectSn;
+	/**
+	 * 创建时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date createDate;
+	/**
+	 * 更新时间 yyyy-MM-dd HH:mm:ss
+	 */
+	@Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
+	private java.util.Date updateDate;
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java
new file mode 100644
index 000000000..0815f2591
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java
@@ -0,0 +1,16 @@
+package com.zhgd.xmgl.modules.concretemixstation.mapper;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 混凝土拌合站生产数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Mapper
+public interface ConcreteMixStationDataMapper extends BaseMapper<ConcreteMixStationData> {
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDevMapper.java
new file mode 100644
index 000000000..5d9f93224
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDevMapper.java
@@ -0,0 +1,16 @@
+package com.zhgd.xmgl.modules.concretemixstation.mapper;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 混凝土拌合站设备
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Mapper
+public interface ConcreteMixStationDevMapper extends BaseMapper<ConcreteMixStationDev> {
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java
new file mode 100644
index 000000000..d5818ebcd
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java
@@ -0,0 +1,16 @@
+package com.zhgd.xmgl.modules.concretemixstation.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 混凝土拌合站材料用量数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Mapper
+public interface ConcreteMixStationMaterialDataMapper extends BaseMapper<ConcreteMixStationMaterialData> {
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml
new file mode 100644
index 000000000..b82bd439c
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml
@@ -0,0 +1,4 @@
+<?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.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDataMapper">
+</mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDevMapper.xml
new file mode 100644
index 000000000..464dd0769
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDevMapper.xml
@@ -0,0 +1,4 @@
+<?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.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDevMapper">
+</mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml
new file mode 100644
index 000000000..600a3127c
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml
@@ -0,0 +1,4 @@
+<?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.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationMaterialDataMapper">
+</mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java
new file mode 100644
index 000000000..31dacb4d5
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java
@@ -0,0 +1,25 @@
+package com.zhgd.xmgl.modules.concretemixstation.service;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Description: 混凝土拌合站生产数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+public interface IConcreteMixStationDataService extends IService<ConcreteMixStationData> {
+
+    IPage<ConcreteMixStationData> queryPageList(HashMap<String, Object> paramMap);
+
+    List<ConcreteMixStationData> queryList(HashMap<String, Object> paramMap);
+
+    void add(ConcreteMixStationData concreteMixStationData);
+
+    void edit(ConcreteMixStationData concreteMixStationData);
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java
new file mode 100644
index 000000000..ceb992f66
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java
@@ -0,0 +1,25 @@
+package com.zhgd.xmgl.modules.concretemixstation.service;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Description: 混凝土拌合站设备
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+public interface IConcreteMixStationDevService extends IService<ConcreteMixStationDev> {
+
+    IPage<ConcreteMixStationDev> queryPageList(HashMap<String, Object> paramMap);
+
+    List<ConcreteMixStationDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(ConcreteMixStationDev concreteMixStationDev);
+
+    void edit(ConcreteMixStationDev concreteMixStationDev);
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java
new file mode 100644
index 000000000..5226fa65a
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java
@@ -0,0 +1,25 @@
+package com.zhgd.xmgl.modules.concretemixstation.service;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Description: 混凝土拌合站材料用量数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+public interface IConcreteMixStationMaterialDataService extends IService<ConcreteMixStationMaterialData> {
+
+    IPage<ConcreteMixStationMaterialData> queryPageList(HashMap<String, Object> paramMap);
+
+    List<ConcreteMixStationMaterialData> queryList(HashMap<String, Object> paramMap);
+
+    void add(ConcreteMixStationMaterialData concreteMixStationMaterialData);
+
+    void edit(ConcreteMixStationMaterialData concreteMixStationMaterialData);
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java
new file mode 100644
index 000000000..3a59d900b
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java
@@ -0,0 +1,69 @@
+package com.zhgd.xmgl.modules.concretemixstation.service.impl;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
+import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDataMapper;
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.util.PageUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 混凝土拌合站生产数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ConcreteMixStationDataServiceImpl extends ServiceImpl<ConcreteMixStationDataMapper, ConcreteMixStationData> implements IConcreteMixStationDataService {
+    @Autowired
+    private ConcreteMixStationDataMapper concreteMixStationDataMapper;
+
+    @Override
+    public IPage<ConcreteMixStationData> queryPageList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationData> queryWrapper = getQueryWrapper(paramMap);
+        Page<ConcreteMixStationData> page = PageUtil.getPage(paramMap);
+        IPage<ConcreteMixStationData> pageList = this.page(page, queryWrapper);
+        pageList.setRecords(dealList(pageList.getRecords()));
+        return pageList;
+    }
+
+    @Override
+    public List<ConcreteMixStationData> queryList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationData> queryWrapper = getQueryWrapper(paramMap);
+        return dealList(this.list(queryWrapper));
+    }
+
+    private QueryWrapper<ConcreteMixStationData> getQueryWrapper(HashMap<String, Object> paramMap) {
+        String alias = "";
+        QueryWrapper<ConcreteMixStationData> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMixStationData.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMixStationData::getId));
+        return queryWrapper;
+    }
+
+    private List<ConcreteMixStationData> dealList(List<ConcreteMixStationData> list) {
+        return list;
+    }
+
+    @Override
+    public void add(ConcreteMixStationData concreteMixStationData) {
+        concreteMixStationData.setId(null);
+        baseMapper.insert(concreteMixStationData);
+    }
+
+    @Override
+    public void edit(ConcreteMixStationData concreteMixStationData) {
+        baseMapper.updateById(concreteMixStationData);
+    }
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDevServiceImpl.java
new file mode 100644
index 000000000..76c3d278a
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDevServiceImpl.java
@@ -0,0 +1,69 @@
+package com.zhgd.xmgl.modules.concretemixstation.service.impl;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
+import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDevMapper;
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDevService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.util.PageUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 混凝土拌合站设备
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ConcreteMixStationDevServiceImpl extends ServiceImpl<ConcreteMixStationDevMapper, ConcreteMixStationDev> implements IConcreteMixStationDevService {
+    @Autowired
+    private ConcreteMixStationDevMapper concreteMixStationDevMapper;
+
+    @Override
+    public IPage<ConcreteMixStationDev> queryPageList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationDev> queryWrapper = getQueryWrapper(paramMap);
+        Page<ConcreteMixStationDev> page = PageUtil.getPage(paramMap);
+        IPage<ConcreteMixStationDev> pageList = this.page(page, queryWrapper);
+        pageList.setRecords(dealList(pageList.getRecords()));
+        return pageList;
+    }
+
+    @Override
+    public List<ConcreteMixStationDev> queryList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationDev> queryWrapper = getQueryWrapper(paramMap);
+        return dealList(this.list(queryWrapper));
+    }
+
+    private QueryWrapper<ConcreteMixStationDev> getQueryWrapper(HashMap<String, Object> paramMap) {
+        String alias = "";
+        QueryWrapper<ConcreteMixStationDev> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMixStationDev.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMixStationDev::getId));
+        return queryWrapper;
+    }
+
+    private List<ConcreteMixStationDev> dealList(List<ConcreteMixStationDev> list) {
+        return list;
+    }
+
+    @Override
+    public void add(ConcreteMixStationDev concreteMixStationDev) {
+        concreteMixStationDev.setId(null);
+        baseMapper.insert(concreteMixStationDev);
+    }
+
+    @Override
+    public void edit(ConcreteMixStationDev concreteMixStationDev) {
+        baseMapper.updateById(concreteMixStationDev);
+    }
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java
new file mode 100644
index 000000000..b663dc4ea
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java
@@ -0,0 +1,69 @@
+package com.zhgd.xmgl.modules.concretemixstation.service.impl;
+
+import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
+import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationMaterialDataMapper;
+import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationMaterialDataService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.util.PageUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 混凝土拌合站材料用量数据
+ * @author： pds
+ * @date： 2024-01-15
+ * @version： V1.0
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ConcreteMixStationMaterialDataServiceImpl extends ServiceImpl<ConcreteMixStationMaterialDataMapper, ConcreteMixStationMaterialData> implements IConcreteMixStationMaterialDataService {
+    @Autowired
+    private ConcreteMixStationMaterialDataMapper concreteMixStationMaterialDataMapper;
+
+    @Override
+    public IPage<ConcreteMixStationMaterialData> queryPageList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationMaterialData> queryWrapper = getQueryWrapper(paramMap);
+        Page<ConcreteMixStationMaterialData> page = PageUtil.getPage(paramMap);
+        IPage<ConcreteMixStationMaterialData> pageList = this.page(page, queryWrapper);
+        pageList.setRecords(dealList(pageList.getRecords()));
+        return pageList;
+    }
+
+    @Override
+    public List<ConcreteMixStationMaterialData> queryList(HashMap<String, Object> paramMap) {
+        QueryWrapper<ConcreteMixStationMaterialData> queryWrapper = getQueryWrapper(paramMap);
+        return dealList(this.list(queryWrapper));
+    }
+
+    private QueryWrapper<ConcreteMixStationMaterialData> getQueryWrapper(HashMap<String, Object> paramMap) {
+        String alias = "";
+        QueryWrapper<ConcreteMixStationMaterialData> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMixStationMaterialData.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMixStationMaterialData::getId));
+        return queryWrapper;
+    }
+
+    private List<ConcreteMixStationMaterialData> dealList(List<ConcreteMixStationMaterialData> list) {
+        return list;
+    }
+
+    @Override
+    public void add(ConcreteMixStationMaterialData concreteMixStationMaterialData) {
+        concreteMixStationMaterialData.setId(null);
+        baseMapper.insert(concreteMixStationMaterialData);
+    }
+
+    @Override
+    public void edit(ConcreteMixStationMaterialData concreteMixStationMaterialData) {
+        baseMapper.updateById(concreteMixStationMaterialData);
+    }
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java
index 8ef272f08..bb2773c50 100644
--- a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java
+++ b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java
@@ -81,11 +81,14 @@ public class MsMixedSoilDev implements Serializable {
     @ApiModelProperty(value = "拌合站位置")
     private java.lang.String mixingStationLocation;
     /**
-     * 负责人
+     * 负责人id
      */
-    @Excel(name = "负责人", width = 15)
-    @ApiModelProperty(value = "负责人")
-    private java.lang.String personInCharge;
+    @Excel(name = "负责人id", width = 15)
+    @ApiModelProperty(value = "负责人id")
+    private java.lang.Long dutyUserId;
+    @ApiModelProperty(value = "负责人名称")
+    private java.lang.String dutyUserName;
+
     /**
      * 负责人电话
      */