feat:交接任务、图片、详情

master
wanghao 2 weeks ago
parent 0d91d3710f
commit 7babd5b7f3

@ -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<RecordCargoBinding> 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<RecordCargoBinding> list = recordCargoBindingService.selectRecordCargoBindingList(recordCargoBinding);
ExcelUtil<RecordCargoBinding> util = new ExcelUtil<RecordCargoBinding>(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));
}
}

@ -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<RecordDeliveryTaskBaseket> 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<RecordDeliveryTaskBaseket> list = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketList(recordDeliveryTaskBaseket);
ExcelUtil<RecordDeliveryTaskBaseket> util = new ExcelUtil<RecordDeliveryTaskBaseket>(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));
}
}

@ -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<RecordDeliveryTask> 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<RecordDeliveryTask> list = recordDeliveryTaskService.selectRecordDeliveryTaskList(recordDeliveryTask);
ExcelUtil<RecordDeliveryTask> util = new ExcelUtil<RecordDeliveryTask>(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));
}
}

@ -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<RecordDeliveryTaskImg> 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<RecordDeliveryTaskImg> list = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg);
ExcelUtil<RecordDeliveryTaskImg> util = new ExcelUtil<RecordDeliveryTaskImg>(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));
}
}

@ -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();
}
}

@ -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();
}
}

@ -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();
}
}

@ -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();
}
}

@ -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<RecordDeliveryTaskBaseket> 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);
}

@ -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<RecordDeliveryTaskImg> 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);
}

@ -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<RecordDeliveryTask> 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);
}

@ -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<RecordDeliveryTaskBaseket> 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);
}

@ -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<RecordDeliveryTaskImg> 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);
}

@ -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<RecordDeliveryTask> 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);
}

@ -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<RecordDeliveryTaskBaseket> 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);
}
}

@ -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<RecordDeliveryTaskImg> 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);
}
}

@ -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<RecordDeliveryTask> 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);
}
}

@ -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
<where>
<if test="baseBasketInfo != null and baseBasketInfo.steelGrade != null and baseBasketInfo.steelGrade != ''"> and bbi.steel_grade = #{baseBasketInfo.steelGrade}</if>
<if test="baseBasketInfo != null and baseBasketInfo.selfCode != null and baseBasketInfo.selfCode != ''"> and bbi.self_code = #{baseBasketInfo.selfCode}</if>
<if test="createBy != null and createBy != ''"> and lib.create_by = #{createBy}</if>
</where>
group by basket_id
</select>

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.manager.mapper.RecordCargoBindingMapper">
<resultMap type="RecordCargoBinding" id="RecordCargoBindingResult">
<resultMap type="com.ruoyi.manager.domain.RecordCargoBinding" id="RecordCargoBindingResult">
<result property="objid" column="objid" />
<result property="cargoFrameEpc" column="cargo_frame_epc" />
<result property="waybillNumber" column="waybill_number" />
@ -12,10 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_by" />
<result property="basketId" column="basket_id" />
<result property="locationInfo" column="location_info" />
<association property="baseBasketInfo" resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult"/>
</resultMap>
<sql id="selectRecordCargoBindingVo">
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
</sql>
<select id="selectRecordCargoBindingList" parameterType="RecordCargoBinding" resultMap="RecordCargoBindingResult">
@ -26,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginCrateTime != null and params.beginCrateTime != '' and params.endCrateTime != null and params.endCrateTime != ''"> and crate_time between #{params.beginCrateTime} and #{params.endCrateTime}</if>
<if test="basketId != null "> and basket_id = #{basketId}</if>
<if test="locationInfo != null and locationInfo != ''"> and location_info = #{locationInfo}</if>
<if test="baseBasketInfo.steelGrade != null and baseBasketInfo.steelGrade != ''"> and bbi.steel_grade = #{baseBasketInfo.steelGrade}</if>
<if test="baseBasketInfo.selfCode != null and baseBasketInfo.selfCode != ''"> and bbi.self_code = #{baseBasketInfo.selfCode}</if>
</where>
</select>

@ -0,0 +1,71 @@
<?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.ruoyi.manager.mapper.RecordDeliveryTaskBaseketMapper">
<resultMap type="com.ruoyi.manager.domain.RecordDeliveryTaskBaseket" id="RecordDeliveryTaskBaseketResult">
<result property="objid" column="objid"/>
<result property="crateTime" column="crate_time"/>
<result property="basketId" column="basket_id"/>
<association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult"/>
</resultMap>
<sql id="selectRecordDeliveryTaskBaseketVo">
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
</sql>
<select id="selectRecordDeliveryTaskBaseketList" parameterType="RecordDeliveryTaskBaseket"
resultMap="RecordDeliveryTaskBaseketResult">
<include refid="selectRecordDeliveryTaskBaseketVo"/>
<where>
<if test="crateTime != null ">and crate_time = #{crateTime}</if>
<if test="basketId != null ">and basket_id = #{basketId}</if>
</where>
</select>
<select id="selectRecordDeliveryTaskBaseketByObjid" parameterType="Long"
resultMap="RecordDeliveryTaskBaseketResult">
<include refid="selectRecordDeliveryTaskBaseketVo"/>
where objid = #{objid}
</select>
<insert id="insertRecordDeliveryTaskBaseket" parameterType="RecordDeliveryTaskBaseket" useGeneratedKeys="true"
keyProperty="objid">
insert into record_delivery_task_baseket
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="crateTime != null">crate_time,</if>
<if test="basketId != null">basket_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="crateTime != null">#{crateTime},</if>
<if test="basketId != null">#{basketId},</if>
</trim>
</insert>
<update id="updateRecordDeliveryTaskBaseket" parameterType="RecordDeliveryTaskBaseket">
update record_delivery_task_baseket
<trim prefix="SET" suffixOverrides=",">
<if test="crateTime != null">crate_time = #{crateTime},</if>
<if test="basketId != null">basket_id = #{basketId},</if>
</trim>
where objid = #{objid}
</update>
<delete id="deleteRecordDeliveryTaskBaseketByObjid" parameterType="Long">
delete
from record_delivery_task_baseket
where objid = #{objid}
</delete>
<delete id="deleteRecordDeliveryTaskBaseketByObjids" parameterType="String">
delete from record_delivery_task_baseket where objid in
<foreach item="objid" collection="array" open="(" separator="," close=")">
#{objid}
</foreach>
</delete>
</mapper>

@ -0,0 +1,67 @@
<?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.ruoyi.manager.mapper.RecordDeliveryTaskImgMapper">
<resultMap type="RecordDeliveryTaskImg" id="RecordDeliveryTaskImgResult">
<result property="deliveryImgId" column="delivery_img_id" />
<result property="taskCode" column="task_code" />
<result property="imgPath" column="img_path" />
<result property="crateTime" column="crate_time" />
</resultMap>
<sql id="selectRecordDeliveryTaskImgVo">
select delivery_img_id, task_code, img_path, crate_time from record_delivery_task_img
</sql>
<select id="selectRecordDeliveryTaskImgList" parameterType="RecordDeliveryTaskImg" resultMap="RecordDeliveryTaskImgResult">
<include refid="selectRecordDeliveryTaskImgVo"/>
<where>
<if test="taskCode != null and taskCode != ''"> and task_code = #{taskCode}</if>
<if test="imgPath != null and imgPath != ''"> and img_path = #{imgPath}</if>
<if test="crateTime != null "> and crate_time = #{crateTime}</if>
</where>
</select>
<select id="selectRecordDeliveryTaskImgByDeliveryImgId" parameterType="Long" resultMap="RecordDeliveryTaskImgResult">
<include refid="selectRecordDeliveryTaskImgVo"/>
where delivery_img_id = #{deliveryImgId}
</select>
<insert id="insertRecordDeliveryTaskImg" parameterType="RecordDeliveryTaskImg" useGeneratedKeys="true" keyProperty="deliveryImgId">
insert into record_delivery_task_img
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskCode != null">task_code,</if>
<if test="imgPath != null">img_path,</if>
<if test="crateTime != null">crate_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskCode != null">#{taskCode},</if>
<if test="imgPath != null">#{imgPath},</if>
<if test="crateTime != null">#{crateTime},</if>
</trim>
</insert>
<update id="updateRecordDeliveryTaskImg" parameterType="RecordDeliveryTaskImg">
update record_delivery_task_img
<trim prefix="SET" suffixOverrides=",">
<if test="taskCode != null">task_code = #{taskCode},</if>
<if test="imgPath != null">img_path = #{imgPath},</if>
<if test="crateTime != null">crate_time = #{crateTime},</if>
</trim>
where delivery_img_id = #{deliveryImgId}
</update>
<delete id="deleteRecordDeliveryTaskImgByDeliveryImgId" parameterType="Long">
delete from record_delivery_task_img where delivery_img_id = #{deliveryImgId}
</delete>
<delete id="deleteRecordDeliveryTaskImgByDeliveryImgIds" parameterType="String">
delete from record_delivery_task_img where delivery_img_id in
<foreach item="deliveryImgId" collection="array" open="(" separator="," close=")">
#{deliveryImgId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,78 @@
<?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.ruoyi.manager.mapper.RecordDeliveryTaskMapper">
<resultMap type="RecordDeliveryTask" id="RecordDeliveryTaskResult">
<result property="deliveryTaskId" column="delivery_task_id" />
<result property="taskCode" column="task_code" />
<result property="taskState" column="task_state" />
<result property="createBy" column="create_by" />
<result property="createTime" column="crate_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectRecordDeliveryTaskVo">
select delivery_task_id, task_code, task_state, create_by, crate_time, update_by, update_time from record_delivery_task
</sql>
<select id="selectRecordDeliveryTaskList" parameterType="RecordDeliveryTask" resultMap="RecordDeliveryTaskResult">
<include refid="selectRecordDeliveryTaskVo"/>
<where>
<if test="taskState != null and taskState != ''"> and task_state = #{taskState}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and crate_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
<select id="selectRecordDeliveryTaskByDeliveryTaskId" parameterType="Long" resultMap="RecordDeliveryTaskResult">
<include refid="selectRecordDeliveryTaskVo"/>
where delivery_task_id = #{deliveryTaskId}
</select>
<insert id="insertRecordDeliveryTask" parameterType="RecordDeliveryTask" useGeneratedKeys="true" keyProperty="deliveryTaskId">
insert into record_delivery_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskCode != null">task_code,</if>
<if test="taskState != null">task_state,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">crate_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskCode != null">#{taskCode},</if>
<if test="taskState != null">#{taskState},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateRecordDeliveryTask" parameterType="RecordDeliveryTask">
update record_delivery_task
<trim prefix="SET" suffixOverrides=",">
<if test="taskCode != null">task_code = #{taskCode},</if>
<if test="taskState != null">task_state = #{taskState},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">crate_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where delivery_task_id = #{deliveryTaskId}
</update>
<delete id="deleteRecordDeliveryTaskByDeliveryTaskId" parameterType="Long">
delete from record_delivery_task where delivery_task_id = #{deliveryTaskId}
</delete>
<delete id="deleteRecordDeliveryTaskByDeliveryTaskIds" parameterType="String">
delete from record_delivery_task where delivery_task_id in
<foreach item="deliveryTaskId" collection="array" open="(" separator="," close=")">
#{deliveryTaskId}
</foreach>
</delete>
</mapper>

@ -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, '');

@ -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, '');

@ -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, '');

@ -10,7 +10,7 @@
<form id="formId">
<div class="select-list">
<ul>
<li>
<!-- <li>
资产RFID
<input name="cargoFrameEpc" type="text"/>
</li>
@ -26,6 +26,15 @@
<span>-</span>
<input class="time-input" id="endTime" name="params[endCrateTime]" placeholder="结束时间"
type="text"/>
</li> -->
<li>
<label>钢号:</label>
<input name="baseBasketInfo.steelGrade" type="text"/>
</li>
<li>
<label>自编号:</label>
<input name="baseBasketInfo.selfCode" type="text"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交接任务列')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task-add">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接码:</label>
<div class="col-sm-8">
<input name="taskCode" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接状态:</label>
<div class="col-sm-8">
<select name="taskState" class="form-control" th:with="type=${@dict.getType('delivery_task_state')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task"
$("#form-delivery_task-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-delivery_task-add').serialize());
}
}
</script>
</body>
</html>

@ -0,0 +1,221 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交接任务列列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>交接状态:</label>
<select name="taskState" th:with="type=${@dict.getType('delivery_task_state')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li class="select-time">
<label>创建时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manager:delivery_task:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manager:delivery_task:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manager:delivery_task:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manager:delivery_task:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manager:delivery_task:edit')}]];
var removeFlag = [[${@permission.hasPermi('manager:delivery_task:remove')}]];
var taskStateDatas = [[${@dict.getType('delivery_task_state')}]];
var prefix = ctx + "manager/delivery_task";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交接任务列",
detailView: true,
onExpandRow: function (index, row, $detail) {
initTaskTable(index, row, $detail);
},
columns: [{
checkbox: true
},
{
field: 'deliveryTaskId',
title: '自增主键',
visible: false
},
{
field: 'taskCode',
title: '交接码'
},
{
field: 'taskState',
title: '交接状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(taskStateDatas, value);
}
},
{
field: 'createBy',
title: '交接人'
},
{
field: 'createTime',
title: '创建时间'
},
{
field: 'updateBy',
title: '接收人'
},
{
field: 'updateTime',
title: '接收时间'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryTaskId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryTaskId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
initTaskTable = function (index, row, $detail) {
// 为每个展开行生成唯一的标识符
var uniqueId = 'tab-' + row.objid + '-';
var [childTable, childTable1] = $detail.html('<div class="col-sm-12">\n' +
' <div class="tabs-container">\n' +
' <ul class="nav nav-tabs">\n' +
' <li class="active"><a data-toggle="tab" href="#' + uniqueId + '1" aria-expanded="true">待交接资产照片</a>\n' +
' </li>\n' +
' <li class=""><a data-toggle="tab" href="#' + uniqueId + '2" aria-expanded="false">待交接资产信息</a>\n' +
' </li>\n' +
' </ul>\n' +
' <div class="tab-content">\n' +
' <div id="' + uniqueId + '1" class="tab-pane active">\n' +
'<table class="table1" style="table-layout:fixed"></table>' +
' </div>\n' +
' <div id="' + uniqueId + '2" class="tab-pane">\n' +
'<table style="table-layout:fixed"></table>' +
' </div>\n' +
' </div>\n' +
' </div>\n' +
' </div>').find('table');
console.log(childTable)
console.log(childTable1)
var basketTypeDatas = [[${@dict.getType('basket_type')}]];
$(childTable).bootstrapTable({
url: ctx + "manager/delivery_task_img/list",
method: 'post',
sidePagination: "server",
contentType: "application/x-www-form-urlencoded",
queryParams: {
taskCode: row.taskCode,
},
columns: [
{
title: '序号',
formatter: function (value, row, index) {
return index + 1
}
},
{
field: 'imgPath',
title: '照片',
formatter: function (value, row, index) {
return $.table.imageView(value, 818, 460, null);
}
},
{
field: 'createTime',
title: '提交时间'
}
]
});
$(childTable1).bootstrapTable({
url: ctx + "manager/delivery_task_baseket/list",
method: 'post',
sidePagination: "server",
contentType: "application/x-www-form-urlencoded",
queryParams: {
taskCode: row.taskCode,
},
columns: [
{
title: '序号',
formatter: function (value, row, index) {
return index + 1
}
},
{
field: 'baseBasketInfo.basketType',
title: '资产类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(basketTypeDatas, value);
}
},
{
field: 'baseBasketInfo.steelGrade',
title: '钢号'
},
{
field: 'baseBasketInfo.selfCode',
title: '自编号'
},
{
field: 'crateTime',
title: '绑定时间'
},
]
});
};
</script>
</body>
</html>

@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交接任务列')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task-edit" th:object="${recordDeliveryTask}">
<input name="deliveryTaskId" th:field="*{deliveryTaskId}" type="hidden">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接码:</label>
<div class="col-sm-8">
<input name="taskCode" th:field="*{taskCode}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接状态:</label>
<div class="col-sm-8">
<select name="taskState" class="form-control" th:with="type=${@dict.getType('delivery_task_state')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taskState}"></option>
</select>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task";
$("#form-delivery_task-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-delivery_task-edit').serialize());
}
}
</script>
</body>
</html>

@ -0,0 +1,52 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交接资产')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task_baseket-add">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">绑定时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="crateTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">资产ID</label>
<div class="col-sm-8">
<input name="basketId" class="form-control" type="text">
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task_baseket"
$("#form-delivery_task_baseket-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-delivery_task_baseket-add').serialize());
}
}
$("input[name='crateTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,94 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交接资产列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>绑定时间:</label>
<input type="text" class="time-input" placeholder="请选择绑定时间" name="crateTime"/>
</li>
<li>
<label>资产ID</label>
<input type="text" name="basketId"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manager:delivery_task_baseket:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manager:delivery_task_baseket:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manager:delivery_task_baseket:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manager:delivery_task_baseket:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manager:delivery_task_baseket:edit')}]];
var removeFlag = [[${@permission.hasPermi('manager:delivery_task_baseket:remove')}]];
var prefix = ctx + "manager/delivery_task_baseket";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交接资产",
columns: [{
checkbox: true
},
{
field: 'objid',
title: '自增主键',
visible: false
},
{
field: 'crateTime',
title: '绑定时间'
},
{
field: 'basketId',
title: '资产ID'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,53 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交接资产')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task_baseket-edit" th:object="${recordDeliveryTaskBaseket}">
<input name="objid" th:field="*{objid}" type="hidden">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">绑定时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="crateTime" th:value="${#dates.format(recordDeliveryTaskBaseket.crateTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">资产ID</label>
<div class="col-sm-8">
<input name="basketId" th:field="*{basketId}" class="form-control" type="text">
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task_baseket";
$("#form-delivery_task_baseket-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-delivery_task_baseket-edit').serialize());
}
}
$("input[name='crateTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,60 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交接图片列')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task_img-add">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接码:</label>
<div class="col-sm-8">
<input name="taskCode" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接图片:</label>
<div class="col-sm-8">
<input name="imgPath" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">创建时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="crateTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task_img"
$("#form-delivery_task_img-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-delivery_task_img-add').serialize());
}
}
$("input[name='crateTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,102 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交接图片列列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>交接码:</label>
<input type="text" name="taskCode"/>
</li>
<li>
<label>交接图片:</label>
<input type="text" name="imgPath"/>
</li>
<li>
<label>创建时间:</label>
<input type="text" class="time-input" placeholder="请选择创建时间" name="crateTime"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manager:delivery_task_img:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manager:delivery_task_img:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manager:delivery_task_img:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manager:delivery_task_img:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manager:delivery_task_img:edit')}]];
var removeFlag = [[${@permission.hasPermi('manager:delivery_task_img:remove')}]];
var prefix = ctx + "manager/delivery_task_img";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交接图片列",
columns: [{
checkbox: true
},
{
field: 'deliveryImgId',
title: '自增主键',
visible: false
},
{
field: 'taskCode',
title: '交接码'
},
{
field: 'imgPath',
title: '交接图片'
},
{
field: 'crateTime',
title: '创建时间'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryImgId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryImgId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,61 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交接图片列')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-delivery_task_img-edit" th:object="${recordDeliveryTaskImg}">
<input name="deliveryImgId" th:field="*{deliveryImgId}" type="hidden">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接码:</label>
<div class="col-sm-8">
<input name="taskCode" th:field="*{taskCode}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">交接图片:</label>
<div class="col-sm-8">
<input name="imgPath" th:field="*{imgPath}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">创建时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="crateTime" th:value="${#dates.format(recordDeliveryTaskImg.crateTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "manager/delivery_task_img";
$("#form-delivery_task_img-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-delivery_task_img-edit').serialize());
}
}
$("input[name='crateTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -1,87 +1,122 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<html lang="zh" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('货物绑定记录列表')" />
<th:block th:include="include :: header('货物绑定记录列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>扫描RFID</label>
<input type="text" name="cargoFrameEpc"/>
</li>
<li>
<label>货物条码:</label>
<input type="text" name="waybillNumber"/>
</li>
<li class="select-time">
<label>绑定时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCrateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCrateTime]"/>
</li>
<li>
<label>资产ID</label>
<input type="text" name="basketId"/>
</li>
<li>
<label>位置信息:</label>
<input type="text" name="locationInfo"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
扫描RFID
<input name="cargoFrameEpc" type="text"/>
</li>
<li>
<label>货物条码:</label>
<input name="waybillNumber" type="text"/>
</li>
<li class="select-time">
<label>绑定时间:</label>
<input class="time-input" id="startTime" name="params[beginCrateTime]" placeholder="开始时间"
type="text"/>
<span>-</span>
<input class="time-input" id="endTime" name="params[endCrateTime]" placeholder="结束时间"
type="text"/>
</li>
<li>
<label>钢号:</label>
<input name="baseBasketInfo.steelGrade" type="text"/>
</li>
<li>
<label>自编号:</label>
<input name="baseBasketInfo.selfCode" type="text"/>
</li>
<!-- <li> -->
<!-- <label>资产ID</label> -->
<!-- <input name="basketId" type="text"/> -->
<!-- </li> -->
<!-- <li> -->
<!-- <label>位置信息:</label> -->
<!-- <input name="locationInfo" type="text"/> -->
<!-- </li> -->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manager:recordCargoBinding:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manager:recordCargoBinding:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manager:recordCargoBinding:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manager:recordCargoBinding:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manager:recordCargoBinding:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()"
shiro:hasPermission="manager:recordCargoBinding:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
shiro:hasPermission="manager:recordCargoBinding:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="manager:recordCargoBinding:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manager:recordCargoBinding:edit')}]];
var removeFlag = [[${@permission.hasPermi('manager:recordCargoBinding:remove')}]];
var prefix = ctx + "manager/recordCargoBinding";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "货物绑定记录",
columns: [{
checkbox: true
},
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('manager:recordCargoBinding:edit')}]];
var removeFlag = [[${@permission.hasPermi('manager:recordCargoBinding:remove')}]];
var prefix = ctx + "manager/recordCargoBinding";
var basketTypeDatas = [[${@dict.getType('basket_type')}]];
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "货物绑定记录",
columns: [{
checkbox: true
},
{
field: 'objid',
title: '自增主键',
visible: false
},
{
field: 'baseBasketInfo.basketCode',
title: '资产编号'
},
{
field: 'baseBasketInfo.basketType',
title: '资产类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(basketTypeDatas, value);
}
},
{
field: 'baseBasketInfo.steelGrade',
title: '钢号'
},
{
field: 'baseBasketInfo.selfCode',
title: '自编号'
},
{
field: 'cargoFrameEpc',
title: '扫描RFID'
@ -100,7 +135,8 @@
},
{
field: 'basketId',
title: '资产ID'
title: '资产ID',
visible: false
},
{
field: 'locationInfo',
@ -109,16 +145,16 @@
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
};
$.table.init(options);
});
</script>
</body>
</html>
Loading…
Cancel
Save