diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordCargoBindingController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordCargoBindingController.java index 39a3b0c..709cf4a 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordCargoBindingController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordCargoBindingController.java @@ -1,34 +1,30 @@ package com.ruoyi.manager.controller; -import java.util.List; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.manager.domain.RecordCargoBinding; +import com.ruoyi.manager.service.IRecordCargoBindingService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.manager.domain.RecordCargoBinding; -import com.ruoyi.manager.service.IRecordCargoBindingService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 货物绑定记录Controller - * + * * @author ruoyi * @date 2026-02-28 */ @Controller @RequestMapping("/manager/recordCargoBinding") -public class RecordCargoBindingController extends BaseController -{ +public class RecordCargoBindingController extends BaseController { private String prefix = "manager/recordCargoBinding"; @Autowired @@ -36,8 +32,7 @@ public class RecordCargoBindingController extends BaseController @RequiresPermissions("manager:recordCargoBinding:view") @GetMapping() - public String recordCargoBinding() - { + public String recordCargoBinding() { return prefix + "/recordCargoBinding"; } @@ -47,8 +42,7 @@ public class RecordCargoBindingController extends BaseController @RequiresPermissions("manager:recordCargoBinding:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(RecordCargoBinding recordCargoBinding) - { + public TableDataInfo list(RecordCargoBinding recordCargoBinding) { startPage(); List list = recordCargoBindingService.selectRecordCargoBindingList(recordCargoBinding); return getDataTable(list); @@ -61,8 +55,7 @@ public class RecordCargoBindingController extends BaseController @Log(title = "货物绑定记录", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(RecordCargoBinding recordCargoBinding) - { + public AjaxResult export(RecordCargoBinding recordCargoBinding) { List list = recordCargoBindingService.selectRecordCargoBindingList(recordCargoBinding); ExcelUtil util = new ExcelUtil(RecordCargoBinding.class); return util.exportExcel(list, "货物绑定记录数据"); @@ -73,8 +66,7 @@ public class RecordCargoBindingController extends BaseController */ @RequiresPermissions("manager:recordCargoBinding:add") @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } @@ -85,8 +77,7 @@ public class RecordCargoBindingController extends BaseController @Log(title = "货物绑定记录", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(RecordCargoBinding recordCargoBinding) - { + public AjaxResult addSave(RecordCargoBinding recordCargoBinding) { return toAjax(recordCargoBindingService.insertRecordCargoBinding(recordCargoBinding)); } @@ -95,8 +86,7 @@ public class RecordCargoBindingController extends BaseController */ @RequiresPermissions("manager:recordCargoBinding:edit") @GetMapping("/edit/{objid}") - public String edit(@PathVariable("objid") Long objid, ModelMap mmap) - { + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) { RecordCargoBinding recordCargoBinding = recordCargoBindingService.selectRecordCargoBindingByObjid(objid); mmap.put("recordCargoBinding", recordCargoBinding); return prefix + "/edit"; @@ -109,8 +99,7 @@ public class RecordCargoBindingController extends BaseController @Log(title = "货物绑定记录", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(RecordCargoBinding recordCargoBinding) - { + public AjaxResult editSave(RecordCargoBinding recordCargoBinding) { return toAjax(recordCargoBindingService.updateRecordCargoBinding(recordCargoBinding)); } @@ -119,10 +108,9 @@ public class RecordCargoBindingController extends BaseController */ @RequiresPermissions("manager:recordCargoBinding:remove") @Log(title = "货物绑定记录", businessType = BusinessType.DELETE) - @PostMapping( "/remove") + @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(recordCargoBindingService.deleteRecordCargoBindingByObjids(ids)); } } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java new file mode 100644 index 0000000..7fafd28 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java @@ -0,0 +1,128 @@ +package com.ruoyi.manager.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; +import com.ruoyi.manager.service.IRecordDeliveryTaskBaseketService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 交接资产Controller + * + * @author ruoyi + * @date 2026-03-04 + */ +@Controller +@RequestMapping("/manager/delivery_task_baseket") +public class RecordDeliveryTaskBaseketController extends BaseController +{ + private String prefix = "manager/delivery_task_baseket"; + + @Autowired + private IRecordDeliveryTaskBaseketService recordDeliveryTaskBaseketService; + + @RequiresPermissions("manager:delivery_task_baseket:view") + @GetMapping() + public String delivery_task_baseket() + { + return prefix + "/delivery_task_baseket"; + } + + /** + * 查询交接资产列表 + */ + @RequiresPermissions("manager:delivery_task_baseket:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + startPage(); + List list = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketList(recordDeliveryTaskBaseket); + return getDataTable(list); + } + + /** + * 导出交接资产列表 + */ + @RequiresPermissions("manager:delivery_task_baseket:export") + @Log(title = "交接资产", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + List list = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketList(recordDeliveryTaskBaseket); + ExcelUtil util = new ExcelUtil(RecordDeliveryTaskBaseket.class); + return util.exportExcel(list, "交接资产数据"); + } + + /** + * 新增交接资产 + */ + @RequiresPermissions("manager:delivery_task_baseket:add") + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存交接资产 + */ + @RequiresPermissions("manager:delivery_task_baseket:add") + @Log(title = "交接资产", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + return toAjax(recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket)); + } + + /** + * 修改交接资产 + */ + @RequiresPermissions("manager:delivery_task_baseket:edit") + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + { + RecordDeliveryTaskBaseket recordDeliveryTaskBaseket = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketByObjid(objid); + mmap.put("recordDeliveryTaskBaseket", recordDeliveryTaskBaseket); + return prefix + "/edit"; + } + + /** + * 修改保存交接资产 + */ + @RequiresPermissions("manager:delivery_task_baseket:edit") + @Log(title = "交接资产", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + return toAjax(recordDeliveryTaskBaseketService.updateRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket)); + } + + /** + * 删除交接资产 + */ + @RequiresPermissions("manager:delivery_task_baseket:remove") + @Log(title = "交接资产", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(recordDeliveryTaskBaseketService.deleteRecordDeliveryTaskBaseketByObjids(ids)); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskController.java new file mode 100644 index 0000000..795ac99 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskController.java @@ -0,0 +1,128 @@ +package com.ruoyi.manager.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manager.domain.RecordDeliveryTask; +import com.ruoyi.manager.service.IRecordDeliveryTaskService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 交接任务列Controller + * + * @author ruoyi + * @date 2026-03-04 + */ +@Controller +@RequestMapping("/manager/delivery_task") +public class RecordDeliveryTaskController extends BaseController +{ + private String prefix = "manager/delivery_task"; + + @Autowired + private IRecordDeliveryTaskService recordDeliveryTaskService; + + @RequiresPermissions("manager:delivery_task:view") + @GetMapping() + public String delivery_task() + { + return prefix + "/delivery_task"; + } + + /** + * 查询交接任务列列表 + */ + @RequiresPermissions("manager:delivery_task:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordDeliveryTask recordDeliveryTask) + { + startPage(); + List list = recordDeliveryTaskService.selectRecordDeliveryTaskList(recordDeliveryTask); + return getDataTable(list); + } + + /** + * 导出交接任务列列表 + */ + @RequiresPermissions("manager:delivery_task:export") + @Log(title = "交接任务列", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordDeliveryTask recordDeliveryTask) + { + List list = recordDeliveryTaskService.selectRecordDeliveryTaskList(recordDeliveryTask); + ExcelUtil util = new ExcelUtil(RecordDeliveryTask.class); + return util.exportExcel(list, "交接任务列数据"); + } + + /** + * 新增交接任务列 + */ + @RequiresPermissions("manager:delivery_task:add") + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存交接任务列 + */ + @RequiresPermissions("manager:delivery_task:add") + @Log(title = "交接任务列", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordDeliveryTask recordDeliveryTask) + { + return toAjax(recordDeliveryTaskService.insertRecordDeliveryTask(recordDeliveryTask)); + } + + /** + * 修改交接任务列 + */ + @RequiresPermissions("manager:delivery_task:edit") + @GetMapping("/edit/{deliveryTaskId}") + public String edit(@PathVariable("deliveryTaskId") Long deliveryTaskId, ModelMap mmap) + { + RecordDeliveryTask recordDeliveryTask = recordDeliveryTaskService.selectRecordDeliveryTaskByDeliveryTaskId(deliveryTaskId); + mmap.put("recordDeliveryTask", recordDeliveryTask); + return prefix + "/edit"; + } + + /** + * 修改保存交接任务列 + */ + @RequiresPermissions("manager:delivery_task:edit") + @Log(title = "交接任务列", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordDeliveryTask recordDeliveryTask) + { + return toAjax(recordDeliveryTaskService.updateRecordDeliveryTask(recordDeliveryTask)); + } + + /** + * 删除交接任务列 + */ + @RequiresPermissions("manager:delivery_task:remove") + @Log(title = "交接任务列", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(recordDeliveryTaskService.deleteRecordDeliveryTaskByDeliveryTaskIds(ids)); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskImgController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskImgController.java new file mode 100644 index 0000000..1410247 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskImgController.java @@ -0,0 +1,128 @@ +package com.ruoyi.manager.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manager.domain.RecordDeliveryTaskImg; +import com.ruoyi.manager.service.IRecordDeliveryTaskImgService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 交接图片列Controller + * + * @author ruoyi + * @date 2026-03-04 + */ +@Controller +@RequestMapping("/manager/delivery_task_img") +public class RecordDeliveryTaskImgController extends BaseController +{ + private String prefix = "manager/delivery_task_img"; + + @Autowired + private IRecordDeliveryTaskImgService recordDeliveryTaskImgService; + + @RequiresPermissions("manager:delivery_task_img:view") + @GetMapping() + public String delivery_task_img() + { + return prefix + "/delivery_task_img"; + } + + /** + * 查询交接图片列列表 + */ + @RequiresPermissions("manager:delivery_task_img:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + startPage(); + List list = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg); + return getDataTable(list); + } + + /** + * 导出交接图片列列表 + */ + @RequiresPermissions("manager:delivery_task_img:export") + @Log(title = "交接图片列", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + List list = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg); + ExcelUtil util = new ExcelUtil(RecordDeliveryTaskImg.class); + return util.exportExcel(list, "交接图片列数据"); + } + + /** + * 新增交接图片列 + */ + @RequiresPermissions("manager:delivery_task_img:add") + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存交接图片列 + */ + @RequiresPermissions("manager:delivery_task_img:add") + @Log(title = "交接图片列", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + return toAjax(recordDeliveryTaskImgService.insertRecordDeliveryTaskImg(recordDeliveryTaskImg)); + } + + /** + * 修改交接图片列 + */ + @RequiresPermissions("manager:delivery_task_img:edit") + @GetMapping("/edit/{deliveryImgId}") + public String edit(@PathVariable("deliveryImgId") Long deliveryImgId, ModelMap mmap) + { + RecordDeliveryTaskImg recordDeliveryTaskImg = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgByDeliveryImgId(deliveryImgId); + mmap.put("recordDeliveryTaskImg", recordDeliveryTaskImg); + return prefix + "/edit"; + } + + /** + * 修改保存交接图片列 + */ + @RequiresPermissions("manager:delivery_task_img:edit") + @Log(title = "交接图片列", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + return toAjax(recordDeliveryTaskImgService.updateRecordDeliveryTaskImg(recordDeliveryTaskImg)); + } + + /** + * 删除交接图片列 + */ + @RequiresPermissions("manager:delivery_task_img:remove") + @Log(title = "交接图片列", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(recordDeliveryTaskImgService.deleteRecordDeliveryTaskImgByDeliveryImgIds(ids)); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordCargoBinding.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordCargoBinding.java index 388c00b..4136e76 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordCargoBinding.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordCargoBinding.java @@ -1,116 +1,126 @@ package com.ruoyi.manager.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 货物绑定记录对象 record_cargo_binding - * + * * @author ruoyi * @date 2026-02-28 */ -public class RecordCargoBinding extends BaseEntity -{ +public class RecordCargoBinding extends BaseEntity { private static final long serialVersionUID = 1L; - /** 自增主键 */ + /** + * 自增主键 + */ private Long objid; - /** 扫描RFID */ + /** + * 扫描RFID + */ @Excel(name = "扫描RFID") private String cargoFrameEpc; - /** 货物条码 */ + /** + * 货物条码 + */ @Excel(name = "货物条码") private String waybillNumber; - /** 绑定时间 */ + /** + * 绑定时间 + */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd") private Date crateTime; - /** 资产ID */ + /** + * 资产ID + */ @Excel(name = "资产ID") private Long basketId; - /** 位置信息 */ + /** + * 位置信息 + */ @Excel(name = "位置信息") private String locationInfo; - public void setObjid(Long objid) - { - this.objid = objid; + private BaseBasketInfo baseBasketInfo; + + public BaseBasketInfo getBaseBasketInfo() { + return baseBasketInfo; } - public Long getObjid() - { + public void setBaseBasketInfo(BaseBasketInfo baseBasketInfo) { + this.baseBasketInfo = baseBasketInfo; + } + + public Long getObjid() { return objid; } - public void setCargoFrameEpc(String cargoFrameEpc) - { - this.cargoFrameEpc = cargoFrameEpc; + public void setObjid(Long objid) { + this.objid = objid; } - public String getCargoFrameEpc() - { + public String getCargoFrameEpc() { return cargoFrameEpc; } - public void setWaybillNumber(String waybillNumber) - { - this.waybillNumber = waybillNumber; + public void setCargoFrameEpc(String cargoFrameEpc) { + this.cargoFrameEpc = cargoFrameEpc; } - public String getWaybillNumber() - { + public String getWaybillNumber() { return waybillNumber; } - public void setCrateTime(Date crateTime) - { - this.crateTime = crateTime; + public void setWaybillNumber(String waybillNumber) { + this.waybillNumber = waybillNumber; } - public Date getCrateTime() - { + public Date getCrateTime() { return crateTime; } - public void setBasketId(Long basketId) - { - this.basketId = basketId; + public void setCrateTime(Date crateTime) { + this.crateTime = crateTime; } - public Long getBasketId() - { + public Long getBasketId() { return basketId; } - public void setLocationInfo(String locationInfo) - { - this.locationInfo = locationInfo; + public void setBasketId(Long basketId) { + this.basketId = basketId; } - public String getLocationInfo() - { + public String getLocationInfo() { return locationInfo; } + public void setLocationInfo(String locationInfo) { + this.locationInfo = locationInfo; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("objid", getObjid()) - .append("cargoFrameEpc", getCargoFrameEpc()) - .append("waybillNumber", getWaybillNumber()) - .append("crateTime", getCrateTime()) - .append("createBy", getCreateBy()) - .append("basketId", getBasketId()) - .append("locationInfo", getLocationInfo()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("cargoFrameEpc", getCargoFrameEpc()) + .append("waybillNumber", getWaybillNumber()) + .append("crateTime", getCrateTime()) + .append("createBy", getCreateBy()) + .append("basketId", getBasketId()) + .append("locationInfo", getLocationInfo()) + .toString(); } } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTask.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTask.java new file mode 100644 index 0000000..c9f79fe --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTask.java @@ -0,0 +1,71 @@ +package com.ruoyi.manager.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 交接任务列对象 record_delivery_task + * + * @author ruoyi + * @date 2026-03-04 + */ +public class RecordDeliveryTask extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + private Long deliveryTaskId; + + /** 交接码 */ + @Excel(name = "交接码") + private String taskCode; + + /** 交接状态 */ + @Excel(name = "交接状态") + private String taskState; + + public void setDeliveryTaskId(Long deliveryTaskId) + { + this.deliveryTaskId = deliveryTaskId; + } + + public Long getDeliveryTaskId() + { + return deliveryTaskId; + } + + public void setTaskCode(String taskCode) + { + this.taskCode = taskCode; + } + + public String getTaskCode() + { + return taskCode; + } + + public void setTaskState(String taskState) + { + this.taskState = taskState; + } + + public String getTaskState() + { + return taskState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deliveryTaskId", getDeliveryTaskId()) + .append("taskCode", getTaskCode()) + .append("taskState", getTaskState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java new file mode 100644 index 0000000..eb25393 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java @@ -0,0 +1,79 @@ +package com.ruoyi.manager.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 交接资产对象 record_delivery_task_baseket + * + * @author ruoyi + * @date 2026-03-04 + */ +public class RecordDeliveryTaskBaseket extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + private Long objid; + + /** 绑定时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date crateTime; + + /** 资产ID */ + @Excel(name = "资产ID") + private Long basketId; + private BaseBasketInfo baseBasketInfo; + + public BaseBasketInfo getBaseBasketInfo() { + return baseBasketInfo; + } + + public void setBaseBasketInfo(BaseBasketInfo baseBasketInfo) { + this.baseBasketInfo = baseBasketInfo; + } + + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + + public void setCrateTime(Date crateTime) + { + this.crateTime = crateTime; + } + + public Date getCrateTime() + { + return crateTime; + } + + public void setBasketId(Long basketId) + { + this.basketId = basketId; + } + + public Long getBasketId() + { + return basketId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("crateTime", getCrateTime()) + .append("basketId", getBasketId()) + .toString(); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java new file mode 100644 index 0000000..f50148b --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java @@ -0,0 +1,85 @@ +package com.ruoyi.manager.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 交接图片列对象 record_delivery_task_img + * + * @author ruoyi + * @date 2026-03-04 + */ +public class RecordDeliveryTaskImg extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + private Long deliveryImgId; + + /** 交接码 */ + @Excel(name = "交接码") + private String taskCode; + + /** 交接图片 */ + @Excel(name = "交接图片") + private String imgPath; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date crateTime; + + public void setDeliveryImgId(Long deliveryImgId) + { + this.deliveryImgId = deliveryImgId; + } + + public Long getDeliveryImgId() + { + return deliveryImgId; + } + + public void setTaskCode(String taskCode) + { + this.taskCode = taskCode; + } + + public String getTaskCode() + { + return taskCode; + } + + public void setImgPath(String imgPath) + { + this.imgPath = imgPath; + } + + public String getImgPath() + { + return imgPath; + } + + public void setCrateTime(Date crateTime) + { + this.crateTime = crateTime; + } + + public Date getCrateTime() + { + return crateTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deliveryImgId", getDeliveryImgId()) + .append("taskCode", getTaskCode()) + .append("imgPath", getImgPath()) + .append("crateTime", getCrateTime()) + .toString(); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java new file mode 100644 index 0000000..d4e3088 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.mapper; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; + +/** + * 交接资产Mapper接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface RecordDeliveryTaskBaseketMapper +{ + /** + * 查询交接资产 + * + * @param objid 交接资产主键 + * @return 交接资产 + */ + public RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByObjid(Long objid); + + /** + * 查询交接资产列表 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 交接资产集合 + */ + public List selectRecordDeliveryTaskBaseketList(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 新增交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 修改交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + public int updateRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 删除交接资产 + * + * @param objid 交接资产主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskBaseketByObjid(Long objid); + + /** + * 批量删除交接资产 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskBaseketByObjids(String[] objids); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskImgMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskImgMapper.java new file mode 100644 index 0000000..c4bfdc0 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskImgMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.mapper; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTaskImg; + +/** + * 交接图片列Mapper接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface RecordDeliveryTaskImgMapper +{ + /** + * 查询交接图片列 + * + * @param deliveryImgId 交接图片列主键 + * @return 交接图片列 + */ + public RecordDeliveryTaskImg selectRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId); + + /** + * 查询交接图片列列表 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 交接图片列集合 + */ + public List selectRecordDeliveryTaskImgList(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 新增交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + public int insertRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 修改交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + public int updateRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 删除交接图片列 + * + * @param deliveryImgId 交接图片列主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId); + + /** + * 批量删除交接图片列 + * + * @param deliveryImgIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskImgByDeliveryImgIds(String[] deliveryImgIds); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java new file mode 100644 index 0000000..36e7f68 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.mapper; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTask; + +/** + * 交接任务列Mapper接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface RecordDeliveryTaskMapper +{ + /** + * 查询交接任务列 + * + * @param deliveryTaskId 交接任务列主键 + * @return 交接任务列 + */ + public RecordDeliveryTask selectRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId); + + /** + * 查询交接任务列列表 + * + * @param recordDeliveryTask 交接任务列 + * @return 交接任务列集合 + */ + public List selectRecordDeliveryTaskList(RecordDeliveryTask recordDeliveryTask); + + /** + * 新增交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + public int insertRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask); + + /** + * 修改交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + public int updateRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask); + + /** + * 删除交接任务列 + * + * @param deliveryTaskId 交接任务列主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId); + + /** + * 批量删除交接任务列 + * + * @param deliveryTaskIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskByDeliveryTaskIds(String[] deliveryTaskIds); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java new file mode 100644 index 0000000..8a2f947 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.service; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; + +/** + * 交接资产Service接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface IRecordDeliveryTaskBaseketService +{ + /** + * 查询交接资产 + * + * @param objid 交接资产主键 + * @return 交接资产 + */ + public RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByObjid(Long objid); + + /** + * 查询交接资产列表 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 交接资产集合 + */ + public List selectRecordDeliveryTaskBaseketList(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 新增交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 修改交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + public int updateRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket); + + /** + * 批量删除交接资产 + * + * @param objids 需要删除的交接资产主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskBaseketByObjids(String objids); + + /** + * 删除交接资产信息 + * + * @param objid 交接资产主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskBaseketByObjid(Long objid); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskImgService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskImgService.java new file mode 100644 index 0000000..9ed39ea --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskImgService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.service; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTaskImg; + +/** + * 交接图片列Service接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface IRecordDeliveryTaskImgService +{ + /** + * 查询交接图片列 + * + * @param deliveryImgId 交接图片列主键 + * @return 交接图片列 + */ + public RecordDeliveryTaskImg selectRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId); + + /** + * 查询交接图片列列表 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 交接图片列集合 + */ + public List selectRecordDeliveryTaskImgList(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 新增交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + public int insertRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 修改交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + public int updateRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg); + + /** + * 批量删除交接图片列 + * + * @param deliveryImgIds 需要删除的交接图片列主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskImgByDeliveryImgIds(String deliveryImgIds); + + /** + * 删除交接图片列信息 + * + * @param deliveryImgId 交接图片列主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java new file mode 100644 index 0000000..76db584 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.service; + +import java.util.List; +import com.ruoyi.manager.domain.RecordDeliveryTask; + +/** + * 交接任务列Service接口 + * + * @author ruoyi + * @date 2026-03-04 + */ +public interface IRecordDeliveryTaskService +{ + /** + * 查询交接任务列 + * + * @param deliveryTaskId 交接任务列主键 + * @return 交接任务列 + */ + public RecordDeliveryTask selectRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId); + + /** + * 查询交接任务列列表 + * + * @param recordDeliveryTask 交接任务列 + * @return 交接任务列集合 + */ + public List selectRecordDeliveryTaskList(RecordDeliveryTask recordDeliveryTask); + + /** + * 新增交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + public int insertRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask); + + /** + * 修改交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + public int updateRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask); + + /** + * 批量删除交接任务列 + * + * @param deliveryTaskIds 需要删除的交接任务列主键集合 + * @return 结果 + */ + public int deleteRecordDeliveryTaskByDeliveryTaskIds(String deliveryTaskIds); + + /** + * 删除交接任务列信息 + * + * @param deliveryTaskId 交接任务列主键 + * @return 结果 + */ + public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java new file mode 100644 index 0000000..3915ad3 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.manager.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manager.mapper.RecordDeliveryTaskBaseketMapper; +import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; +import com.ruoyi.manager.service.IRecordDeliveryTaskBaseketService; +import com.ruoyi.common.core.text.Convert; + +/** + * 交接资产Service业务层处理 + * + * @author ruoyi + * @date 2026-03-04 + */ +@Service +public class RecordDeliveryTaskBaseketServiceImpl implements IRecordDeliveryTaskBaseketService +{ + @Autowired + private RecordDeliveryTaskBaseketMapper recordDeliveryTaskBaseketMapper; + + /** + * 查询交接资产 + * + * @param objid 交接资产主键 + * @return 交接资产 + */ + @Override + public RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByObjid(Long objid) + { + return recordDeliveryTaskBaseketMapper.selectRecordDeliveryTaskBaseketByObjid(objid); + } + + /** + * 查询交接资产列表 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 交接资产 + */ + @Override + public List selectRecordDeliveryTaskBaseketList(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + return recordDeliveryTaskBaseketMapper.selectRecordDeliveryTaskBaseketList(recordDeliveryTaskBaseket); + } + + /** + * 新增交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + @Override + public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket); + } + + /** + * 修改交接资产 + * + * @param recordDeliveryTaskBaseket 交接资产 + * @return 结果 + */ + @Override + public int updateRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket) + { + return recordDeliveryTaskBaseketMapper.updateRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket); + } + + /** + * 批量删除交接资产 + * + * @param objids 需要删除的交接资产主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskBaseketByObjids(String objids) + { + return recordDeliveryTaskBaseketMapper.deleteRecordDeliveryTaskBaseketByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除交接资产信息 + * + * @param objid 交接资产主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskBaseketByObjid(Long objid) + { + return recordDeliveryTaskBaseketMapper.deleteRecordDeliveryTaskBaseketByObjid(objid); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskImgServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskImgServiceImpl.java new file mode 100644 index 0000000..eb2e4f4 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskImgServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.manager.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manager.mapper.RecordDeliveryTaskImgMapper; +import com.ruoyi.manager.domain.RecordDeliveryTaskImg; +import com.ruoyi.manager.service.IRecordDeliveryTaskImgService; +import com.ruoyi.common.core.text.Convert; + +/** + * 交接图片列Service业务层处理 + * + * @author ruoyi + * @date 2026-03-04 + */ +@Service +public class RecordDeliveryTaskImgServiceImpl implements IRecordDeliveryTaskImgService +{ + @Autowired + private RecordDeliveryTaskImgMapper recordDeliveryTaskImgMapper; + + /** + * 查询交接图片列 + * + * @param deliveryImgId 交接图片列主键 + * @return 交接图片列 + */ + @Override + public RecordDeliveryTaskImg selectRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId) + { + return recordDeliveryTaskImgMapper.selectRecordDeliveryTaskImgByDeliveryImgId(deliveryImgId); + } + + /** + * 查询交接图片列列表 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 交接图片列 + */ + @Override + public List selectRecordDeliveryTaskImgList(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + return recordDeliveryTaskImgMapper.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg); + } + + /** + * 新增交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + @Override + public int insertRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + return recordDeliveryTaskImgMapper.insertRecordDeliveryTaskImg(recordDeliveryTaskImg); + } + + /** + * 修改交接图片列 + * + * @param recordDeliveryTaskImg 交接图片列 + * @return 结果 + */ + @Override + public int updateRecordDeliveryTaskImg(RecordDeliveryTaskImg recordDeliveryTaskImg) + { + return recordDeliveryTaskImgMapper.updateRecordDeliveryTaskImg(recordDeliveryTaskImg); + } + + /** + * 批量删除交接图片列 + * + * @param deliveryImgIds 需要删除的交接图片列主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskImgByDeliveryImgIds(String deliveryImgIds) + { + return recordDeliveryTaskImgMapper.deleteRecordDeliveryTaskImgByDeliveryImgIds(Convert.toStrArray(deliveryImgIds)); + } + + /** + * 删除交接图片列信息 + * + * @param deliveryImgId 交接图片列主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskImgByDeliveryImgId(Long deliveryImgId) + { + return recordDeliveryTaskImgMapper.deleteRecordDeliveryTaskImgByDeliveryImgId(deliveryImgId); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskServiceImpl.java new file mode 100644 index 0000000..dd29b6e --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.manager.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manager.mapper.RecordDeliveryTaskMapper; +import com.ruoyi.manager.domain.RecordDeliveryTask; +import com.ruoyi.manager.service.IRecordDeliveryTaskService; +import com.ruoyi.common.core.text.Convert; + +/** + * 交接任务列Service业务层处理 + * + * @author ruoyi + * @date 2026-03-04 + */ +@Service +public class RecordDeliveryTaskServiceImpl implements IRecordDeliveryTaskService +{ + @Autowired + private RecordDeliveryTaskMapper recordDeliveryTaskMapper; + + /** + * 查询交接任务列 + * + * @param deliveryTaskId 交接任务列主键 + * @return 交接任务列 + */ + @Override + public RecordDeliveryTask selectRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId) + { + return recordDeliveryTaskMapper.selectRecordDeliveryTaskByDeliveryTaskId(deliveryTaskId); + } + + /** + * 查询交接任务列列表 + * + * @param recordDeliveryTask 交接任务列 + * @return 交接任务列 + */ + @Override + public List selectRecordDeliveryTaskList(RecordDeliveryTask recordDeliveryTask) + { + return recordDeliveryTaskMapper.selectRecordDeliveryTaskList(recordDeliveryTask); + } + + /** + * 新增交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + @Override + public int insertRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask) + { + recordDeliveryTask.setCreateTime(DateUtils.getNowDate()); + return recordDeliveryTaskMapper.insertRecordDeliveryTask(recordDeliveryTask); + } + + /** + * 修改交接任务列 + * + * @param recordDeliveryTask 交接任务列 + * @return 结果 + */ + @Override + public int updateRecordDeliveryTask(RecordDeliveryTask recordDeliveryTask) + { + recordDeliveryTask.setUpdateTime(DateUtils.getNowDate()); + return recordDeliveryTaskMapper.updateRecordDeliveryTask(recordDeliveryTask); + } + + /** + * 批量删除交接任务列 + * + * @param deliveryTaskIds 需要删除的交接任务列主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskByDeliveryTaskIds(String deliveryTaskIds) + { + return recordDeliveryTaskMapper.deleteRecordDeliveryTaskByDeliveryTaskIds(Convert.toStrArray(deliveryTaskIds)); + } + + /** + * 删除交接任务列信息 + * + * @param deliveryTaskId 交接任务列主键 + * @return 结果 + */ + @Override + public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId) + { + return recordDeliveryTaskMapper.deleteRecordDeliveryTaskByDeliveryTaskId(deliveryTaskId); + } +} diff --git a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml index 6560e48..a20b7fe 100644 --- a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml @@ -28,7 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" self_code from ledger_instant_binding lib left join base_basket_info bbi on lib.basket_id = bbi.obj_id - + + and bbi.steel_grade = #{baseBasketInfo.steelGrade} + and bbi.self_code = #{baseBasketInfo.selfCode} + and lib.create_by = #{createBy} + group by basket_id diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordCargoBindingMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordCargoBindingMapper.xml index 3242aef..3db3851 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordCargoBindingMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordCargoBindingMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,10 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select objid, cargo_frame_epc, waybill_number, crate_time, create_by, basket_id, location_info from record_cargo_binding + select objid, cargo_frame_epc, waybill_number, crate_time, create_by, basket_id, location_info, + basket_code,basket_spe,basket_type,steel_grade,self_code + from record_cargo_binding rcb + left join base_basket_info bbi on rcb.basket_id = bbi.obj_id diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml new file mode 100644 index 0000000..8266386 --- /dev/null +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + select objid, crate_time, basket_id, basket_type, steel_grade, self_code + from record_delivery_task_baseket rb + left join base_basket_info bbi on bbi.obj_id = rb.basket_id + + + + + + + + insert into record_delivery_task_baseket + + crate_time, + basket_id, + + + #{crateTime}, + #{basketId}, + + + + + update record_delivery_task_baseket + + crate_time = #{crateTime}, + basket_id = #{basketId}, + + where objid = #{objid} + + + + delete + from record_delivery_task_baseket + where objid = #{objid} + + + + delete from record_delivery_task_baseket where objid in + + #{objid} + + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml new file mode 100644 index 0000000..797d876 --- /dev/null +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskImgMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + select delivery_img_id, task_code, img_path, crate_time from record_delivery_task_img + + + + + + + + insert into record_delivery_task_img + + task_code, + img_path, + crate_time, + + + #{taskCode}, + #{imgPath}, + #{crateTime}, + + + + + update record_delivery_task_img + + task_code = #{taskCode}, + img_path = #{imgPath}, + crate_time = #{crateTime}, + + where delivery_img_id = #{deliveryImgId} + + + + delete from record_delivery_task_img where delivery_img_id = #{deliveryImgId} + + + + delete from record_delivery_task_img where delivery_img_id in + + #{deliveryImgId} + + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml new file mode 100644 index 0000000..0297c73 --- /dev/null +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + select delivery_task_id, task_code, task_state, create_by, crate_time, update_by, update_time from record_delivery_task + + + + + + + + insert into record_delivery_task + + task_code, + task_state, + create_by, + crate_time, + update_by, + update_time, + + + #{taskCode}, + #{taskState}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update record_delivery_task + + task_code = #{taskCode}, + task_state = #{taskState}, + create_by = #{createBy}, + crate_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where delivery_task_id = #{deliveryTaskId} + + + + delete from record_delivery_task where delivery_task_id = #{deliveryTaskId} + + + + delete from record_delivery_task where delivery_task_id in + + #{deliveryTaskId} + + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/sql/delivery_taskMenu.sql b/ruoyi-manager/src/main/resources/sql/delivery_taskMenu.sql new file mode 100644 index 0000000..282fa02 --- /dev/null +++ b/ruoyi-manager/src/main/resources/sql/delivery_taskMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列', '2051', '1', '/manager/delivery_task', 'C', '0', 'manager:delivery_task:view', '#', 'admin', sysdate(), '', null, '交接任务列菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列查询', @parentId, '1', '#', 'F', '0', 'manager:delivery_task:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列新增', @parentId, '2', '#', 'F', '0', 'manager:delivery_task:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列修改', @parentId, '3', '#', 'F', '0', 'manager:delivery_task:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列删除', @parentId, '4', '#', 'F', '0', 'manager:delivery_task:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接任务列导出', @parentId, '5', '#', 'F', '0', 'manager:delivery_task:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manager/src/main/resources/sql/delivery_task_baseketMenu.sql b/ruoyi-manager/src/main/resources/sql/delivery_task_baseketMenu.sql new file mode 100644 index 0000000..e3e29e3 --- /dev/null +++ b/ruoyi-manager/src/main/resources/sql/delivery_task_baseketMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产', '2051', '1', '/manager/delivery_task_baseket', 'C', '0', 'manager:delivery_task_baseket:view', '#', 'admin', sysdate(), '', null, '交接资产菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产查询', @parentId, '1', '#', 'F', '0', 'manager:delivery_task_baseket:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产新增', @parentId, '2', '#', 'F', '0', 'manager:delivery_task_baseket:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产修改', @parentId, '3', '#', 'F', '0', 'manager:delivery_task_baseket:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产删除', @parentId, '4', '#', 'F', '0', 'manager:delivery_task_baseket:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接资产导出', @parentId, '5', '#', 'F', '0', 'manager:delivery_task_baseket:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manager/src/main/resources/sql/delivery_task_imgMenu.sql b/ruoyi-manager/src/main/resources/sql/delivery_task_imgMenu.sql new file mode 100644 index 0000000..9e78f8d --- /dev/null +++ b/ruoyi-manager/src/main/resources/sql/delivery_task_imgMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列', '2051', '1', '/manager/delivery_task_img', 'C', '0', 'manager:delivery_task_img:view', '#', 'admin', sysdate(), '', null, '交接图片列菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列查询', @parentId, '1', '#', 'F', '0', 'manager:delivery_task_img:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列新增', @parentId, '2', '#', 'F', '0', 'manager:delivery_task_img:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列修改', @parentId, '3', '#', 'F', '0', 'manager:delivery_task_img:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列删除', @parentId, '4', '#', 'F', '0', 'manager:delivery_task_img:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('交接图片列导出', @parentId, '5', '#', 'F', '0', 'manager:delivery_task_img:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html b/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html index 10d6625..f25e56f 100644 --- a/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html +++ b/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html @@ -10,7 +10,7 @@