行车吊运单

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetAutoTmp/controller/BilletAutoTmpController.java

@@ -27,7 +27,7 @@ import java.util.Arrays;
  * @Date:   2025-01-09
  * @Version: V1.0
  */
-@Api(tags="billet_auto_tmp")
+@Api(tags="钢坯自动化临时表")
 @RestController
 @RequestMapping("/billetAutoTmp/billetAutoTmp")
 @Slf4j
@@ -45,7 +45,7 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @return
 	 */
 	//@AutoLog(value = "billet_auto_tmp-分页列表查询")
-	@ApiOperation(value="billet_auto_tmp-分页列表查询", notes="billet_auto_tmp-分页列表查询")
+	@ApiOperation(value="钢坯自动化临时表-分页列表查询", notes="钢坯自动化临时表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<BilletAutoTmp>> queryPageList(BilletAutoTmp billetAutoTmp,
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,8 +63,8 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @param billetAutoTmp
 	 * @return
 	 */
-	@AutoLog(value = "billet_auto_tmp-添加")
-	@ApiOperation(value="billet_auto_tmp-添加", notes="billet_auto_tmp-添加")
+	@AutoLog(value = "钢坯自动化临时表-添加")
+	@ApiOperation(value="钢坯自动化临时表-添加", notes="钢坯自动化临时表-添加")
 	@RequiresPermissions("billetAutoTmp:billet_auto_tmp:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BilletAutoTmp billetAutoTmp) {
@@ -78,8 +78,8 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @param billetAutoTmp
 	 * @return
 	 */
-	@AutoLog(value = "billet_auto_tmp-编辑")
-	@ApiOperation(value="billet_auto_tmp-编辑", notes="billet_auto_tmp-编辑")
+	@AutoLog(value = "钢坯自动化临时表-编辑")
+	@ApiOperation(value="钢坯自动化临时表-编辑", notes="钢坯自动化临时表-编辑")
 	@RequiresPermissions("billetAutoTmp:billet_auto_tmp:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody BilletAutoTmp billetAutoTmp) {
@@ -93,8 +93,8 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "billet_auto_tmp-通过id删除")
-	@ApiOperation(value="billet_auto_tmp-通过id删除", notes="billet_auto_tmp-通过id删除")
+	@AutoLog(value = "钢坯自动化临时表-通过id删除")
+	@ApiOperation(value="钢坯自动化临时表-通过id删除", notes="钢坯自动化临时表-通过id删除")
 	@RequiresPermissions("billetAutoTmp:billet_auto_tmp:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -108,8 +108,8 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "billet_auto_tmp-批量删除")
-	@ApiOperation(value="billet_auto_tmp-批量删除", notes="billet_auto_tmp-批量删除")
+	@AutoLog(value = "钢坯自动化临时表-批量删除")
+	@ApiOperation(value="钢坯自动化临时表-批量删除", notes="钢坯自动化临时表-批量删除")
 	@RequiresPermissions("billetAutoTmp:billet_auto_tmp:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -124,7 +124,7 @@ public class BilletAutoTmpController extends JeecgController<BilletAutoTmp, IBil
 	 * @return
 	 */
 	//@AutoLog(value = "billet_auto_tmp-通过id查询")
-	@ApiOperation(value="billet_auto_tmp-通过id查询", notes="billet_auto_tmp-通过id查询")
+	@ApiOperation(value="钢坯自动化临时表-通过id查询", notes="钢坯自动化临时表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<BilletAutoTmp> queryById(@RequestParam(name="id",required=true) String id) {
 		BilletAutoTmp billetAutoTmp = billetAutoTmpService.getById(id);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/controller/BilletLiftingBillController.java

@@ -0,0 +1,163 @@
+package org.jeecg.modules.billet.billetLiftingBill.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.billet.billetLiftingBill.entity.BilletLiftingBill;
+import org.jeecg.modules.billet.billetLiftingBill.service.IBilletLiftingBillService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: billet_lifting_bill
+ * @Author: jeecg-boot
+ * @Date:   2025-01-17
+ * @Version: V1.0
+ */
+@Api(tags="行车吊运单")
+@RestController
+@RequestMapping("/billet/billetLiftingBill")
+@Slf4j
+public class BilletLiftingBillController extends JeecgController<BilletLiftingBill, IBilletLiftingBillService> {
+
+	@Autowired
+	private IBilletLiftingBillService billetLiftingBillService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param billetLiftingBill
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "行车吊运单-分页列表查询")
+	@ApiOperation(value="行车吊运单-分页列表查询", notes="billet_lifting_bill-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BilletLiftingBill>> queryPageList(BilletLiftingBill billetLiftingBill,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BilletLiftingBill> queryWrapper = QueryGenerator.initQueryWrapper(billetLiftingBill, req.getParameterMap());
+		Page<BilletLiftingBill> page = new Page<BilletLiftingBill>(pageNo, pageSize);
+		IPage<BilletLiftingBill> pageList = billetLiftingBillService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param billetLiftingBill
+	 * @return
+	 */
+	@AutoLog(value = "行车吊运单-添加")
+	@ApiOperation(value="行车吊运单-添加", notes="行车吊运单-添加")
+	@RequiresPermissions("billetLiftingBill:billet_lifting_bill:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BilletLiftingBill billetLiftingBill) {
+		billetLiftingBillService.save(billetLiftingBill);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param billetLiftingBill
+	 * @return
+	 */
+	@AutoLog(value = "行车吊运单-编辑")
+	@ApiOperation(value="行车吊运单-编辑", notes="行车吊运单-编辑")
+	@RequiresPermissions("billetLiftingBill:billet_lifting_bill:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BilletLiftingBill billetLiftingBill) {
+		billetLiftingBillService.updateById(billetLiftingBill);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "行车吊运单-通过id删除")
+	@ApiOperation(value="行车吊运单-通过id删除", notes="行车吊运单-通过id删除")
+	@RequiresPermissions("billetLiftingBill:billet_lifting_bill:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		billetLiftingBillService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "行车吊运单-批量删除")
+	@ApiOperation(value="行车吊运单-批量删除", notes="行车吊运单-批量删除")
+	@RequiresPermissions("billetLiftingBill:billet_lifting_bill:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.billetLiftingBillService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "billet_lifting_bill-通过id查询")
+	@ApiOperation(value="行车吊运单-通过id查询", notes="行车吊运单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BilletLiftingBill> queryById(@RequestParam(name="id",required=true) String id) {
+		BilletLiftingBill billetLiftingBill = billetLiftingBillService.getById(id);
+		if(billetLiftingBill==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(billetLiftingBill);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param billetLiftingBill
+    */
+    @RequiresPermissions("billetLiftingBill:billet_lifting_bill:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BilletLiftingBill billetLiftingBill) {
+        return super.exportXls(request, billetLiftingBill, BilletLiftingBill.class, "billet_lifting_bill");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("billetLiftingBill:billet_lifting_bill:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BilletLiftingBill.class);
+    }
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/entity/BilletLiftingBill.java

@@ -0,0 +1,97 @@
+package org.jeecg.modules.billet.billetLiftingBill.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: billet_lifting_bill
+ * @Author: jeecg-boot
+ * @Date:   2025-01-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("billet_lifting_bill")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="billet_lifting_bill对象", description="billet_lifting_bill")
+public class BilletLiftingBill implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**铸机号*/
+	@Excel(name = "铸机号", width = 15)
+    @ApiModelProperty(value = "铸机号")
+    private String ccmNo;
+	/**炉号*/
+	@Excel(name = "炉号", width = 15)
+    @ApiModelProperty(value = "炉号")
+    private String heatNo;
+	/**班别*/
+	@Excel(name = "班别", width = 15)
+    @ApiModelProperty(value = "班别")
+    private String shift;
+	/**班组*/
+	@Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    private String shiftGroup;
+	/**坯号集合*/
+	@Excel(name = "坯号集合", width = 15)
+    @ApiModelProperty(value = "坯号集合")
+    private String billetsNo;
+	/**组坯号*/
+	@Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号")
+    private String assemblyNumber;
+	/**所在位置*/
+	@Excel(name = "所在位置", width = 15)
+    @ApiModelProperty(value = "所在位置")
+    private String location;
+	/**行车号*/
+	@Excel(name = "行车号", width = 15)
+    @ApiModelProperty(value = "行车号")
+    private String vehicleNumber;
+	/**吊运时间*/
+	@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 Date liftingTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/mapper/BilletLiftingBillMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.billet.billetLiftingBill.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.billet.billetLiftingBill.entity.BilletLiftingBill;
+
+/**
+ * @Description: billet_lifting_bill
+ * @Author: jeecg-boot
+ * @Date:   2025-01-17
+ * @Version: V1.0
+ */
+public interface BilletLiftingBillMapper extends BaseMapper<BilletLiftingBill> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/mapper/xml/BilletLiftingBillMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.billet.billetLiftingBill.mapper.BilletLiftingBillMapper">
+
+</mapper>

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/service/IBilletLiftingBillService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.billet.billetLiftingBill.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.billet.billetLiftingBill.entity.BilletLiftingBill;
+
+/**
+ * @Description: billet_lifting_bill
+ * @Author: jeecg-boot
+ * @Date:   2025-01-17
+ * @Version: V1.0
+ */
+public interface IBilletLiftingBillService extends IService<BilletLiftingBill> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/service/impl/BilletLiftingBillServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.billet.billetLiftingBill.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.billet.billetLiftingBill.entity.BilletLiftingBill;
+import org.jeecg.modules.billet.billetLiftingBill.mapper.BilletLiftingBillMapper;
+import org.jeecg.modules.billet.billetLiftingBill.service.IBilletLiftingBillService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: billet_lifting_bill
+ * @Author: jeecg-boot
+ * @Date:   2025-01-17
+ * @Version: V1.0
+ */
+@Service
+public class BilletLiftingBillServiceImpl extends ServiceImpl<BilletLiftingBillMapper, BilletLiftingBill> implements IBilletLiftingBillService {
+
+}