From dc1326a65865b916dbc2c270b8d036c1f64a932a Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 25 May 2026 09:46:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=BF=9B=E5=87=BA=E6=B8=AF=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E5=92=8C=E8=88=AA=E5=8F=B8=E4=BB=A3=E7=A0=81=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseAirCodeController.java | 19 +++++++------- .../RecordBasketCheckContentController.java | 25 ++++++++----------- .../RecordBasketCheckTaskController.java | 25 ++++++++----------- .../RecordDeliveryTaskBaseketController.java | 25 ++++++++----------- .../RecordDeliveryTaskController.java | 25 ++++++++----------- .../RecordDeliveryTaskImgController.java | 25 ++++++++----------- .../RecordDeliveryTaskWaybillController.java | 25 ++++++++----------- .../RecordtRfidBindingController.java | 25 ++++++++----------- .../com/ruoyi/manager/domain/BaseAirCode.java | 4 +-- .../ruoyi/manager/domain/BaseBindInfo.java | 2 +- .../ruoyi/manager/domain/BaseStoreInfo.java | 2 +- .../manager/domain/LedgerInstantBinding.java | 2 +- .../domain/RecordBasketCheckContent.java | 4 +-- .../manager/domain/RecordBasketRepair.java | 1 - .../domain/RecordBasketRepairSpareParts.java | 4 +-- .../domain/RecordDeliveryTaskBaseket.java | 7 +++--- .../manager/domain/RecordDeliveryTaskImg.java | 6 ++--- .../domain/RecordDeliveryTaskWaybill.java | 4 +-- .../manager/domain/RecordtRfidBinding.java | 7 +++--- .../manager/mapper/BaseAirCodeMapper.java | 3 ++- .../RecordBasketCheckContentMapper.java | 3 ++- .../mapper/RecordBasketCheckTaskMapper.java | 3 ++- .../RecordBasketRepairSparePartsMapper.java | 3 ++- .../mapper/RecordCargoBindingMapper.java | 3 ++- .../RecordDeliveryTaskBaseketMapper.java | 4 +-- .../mapper/RecordDeliveryTaskImgMapper.java | 3 ++- .../mapper/RecordDeliveryTaskMapper.java | 3 ++- .../RecordDeliveryTaskWaybillMapper.java | 9 ++++++- .../mapper/RecordtRfidBindingMapper.java | 3 ++- .../manager/service/IBaseAirCodeService.java | 3 ++- .../IRecordBasketCheckContentService.java | 3 ++- .../IRecordBasketCheckTaskService.java | 3 ++- .../IRecordBasketRepairSparePartsService.java | 3 ++- .../service/IRecordCargoBindingService.java | 3 ++- .../IRecordDeliveryTaskBaseketService.java | 4 +-- .../IRecordDeliveryTaskImgService.java | 3 ++- .../service/IRecordDeliveryTaskService.java | 3 ++- .../IRecordDeliveryTaskWaybillService.java | 7 +++++- .../service/IRecordtRfidBindingService.java | 3 ++- .../service/impl/BaseAirCodeServiceImpl.java | 1 - .../service/impl/BaseBindInfoServiceImpl.java | 1 - .../RecordBasketCheckContentServiceImpl.java | 11 ++++---- .../RecordBasketCheckTaskServiceImpl.java | 1 - ...cordBasketRepairSparePartsServiceImpl.java | 11 ++++---- .../impl/RecordCargoBindingServiceImpl.java | 11 ++++---- .../RecordDeliveryTaskImgServiceImpl.java | 11 ++++---- .../impl/RecordDeliveryTaskServiceImpl.java | 11 ++++---- .../RecordDeliveryTaskWaybillServiceImpl.java | 21 ++++++++++++---- .../RecordDeliveryTaskWaybillMapper.xml | 15 +++++++++++ .../manager/delivery_task/delivery_task.html | 2 ++ 50 files changed, 221 insertions(+), 184 deletions(-) diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseAirCodeController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseAirCodeController.java index 196ca94..9130523 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseAirCodeController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseAirCodeController.java @@ -1,19 +1,20 @@ 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.BaseAirCode; +import com.ruoyi.manager.service.IBaseAirCodeService; 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.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.manager.domain.BaseAirCode; -import com.ruoyi.manager.service.IBaseAirCodeService; -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 java.util.List; /** * 航司代码Controller diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java index 8ba0cb2..5f0ef3a 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java @@ -1,23 +1,20 @@ 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.RecordBasketCheckContent; +import com.ruoyi.manager.service.IRecordBasketCheckContentService; 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.RecordBasketCheckContent; -import com.ruoyi.manager.service.IRecordBasketCheckContentService; -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 diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java index 4110234..adf3144 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java @@ -1,23 +1,20 @@ 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.RecordBasketCheckTask; +import com.ruoyi.manager.service.IRecordBasketCheckTaskService; 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.RecordBasketCheckTask; -import com.ruoyi.manager.service.IRecordBasketCheckTaskService; -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 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 index feb3fd6..2d37019 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java @@ -1,23 +1,20 @@ 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.RecordDeliveryTaskBaseket; +import com.ruoyi.manager.service.IRecordDeliveryTaskBaseketService; 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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 交接资产Controller 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 index 795ac99..a654c45 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskController.java @@ -1,23 +1,20 @@ 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.RecordDeliveryTask; +import com.ruoyi.manager.service.IRecordDeliveryTaskService; 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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 交接任务列Controller 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 index 1410247..42f073e 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskImgController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskImgController.java @@ -1,23 +1,20 @@ 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.RecordDeliveryTaskImg; +import com.ruoyi.manager.service.IRecordDeliveryTaskImgService; 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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 交接图片列Controller diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskWaybillController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskWaybillController.java index df6694f..ce2c012 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskWaybillController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskWaybillController.java @@ -1,23 +1,20 @@ 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.RecordDeliveryTaskWaybill; +import com.ruoyi.manager.service.IRecordDeliveryTaskWaybillService; 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.RecordDeliveryTaskWaybill; -import com.ruoyi.manager.service.IRecordDeliveryTaskWaybillService; -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 diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordtRfidBindingController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordtRfidBindingController.java index a27fef8..2492d63 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordtRfidBindingController.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordtRfidBindingController.java @@ -1,23 +1,20 @@ 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.RecordtRfidBinding; +import com.ruoyi.manager.service.IRecordtRfidBindingService; 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.RecordtRfidBinding; -import com.ruoyi.manager.service.IRecordtRfidBindingService; -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; /** * 货筐RFID绑定记录Controller diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseAirCode.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseAirCode.java index 9909d4b..bc57660 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseAirCode.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseAirCode.java @@ -1,9 +1,9 @@ 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; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 航司代码对象 base_air_code diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBindInfo.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBindInfo.java index 9cfc8dd..2c77919 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBindInfo.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBindInfo.java @@ -1,8 +1,8 @@ package com.ruoyi.manager.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseStoreInfo.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseStoreInfo.java index e5f31f8..f7811e9 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseStoreInfo.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseStoreInfo.java @@ -1,8 +1,8 @@ package com.ruoyi.manager.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/LedgerInstantBinding.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/LedgerInstantBinding.java index a62152d..5e49c78 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/LedgerInstantBinding.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/LedgerInstantBinding.java @@ -1,8 +1,8 @@ package com.ruoyi.manager.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java index 04ddc36..4508972 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java @@ -1,9 +1,9 @@ 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; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 资产盘点内容对象 record_basket_check_content diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java index aaa69a1..ee5e3e2 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java @@ -2,7 +2,6 @@ package com.ruoyi.manager.domain; 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; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepairSpareParts.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepairSpareParts.java index d1d3f5a..1e8be3d 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepairSpareParts.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepairSpareParts.java @@ -1,9 +1,9 @@ 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; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 维修记录-添加备件对象 record_basket_repair_spare_parts 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 index 246ae86..44a952b 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java @@ -1,11 +1,12 @@ 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_delivery_task_baseket 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 index 1e4591b..03e490e 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskImg.java @@ -1,11 +1,9 @@ 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; /** * 交接图片列对象 record_delivery_task_img diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskWaybill.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskWaybill.java index 6b44a0d..5c88b79 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskWaybill.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskWaybill.java @@ -1,9 +1,9 @@ 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; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 交接资产对象 record_delivery_task_waybill diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordtRfidBinding.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordtRfidBinding.java index 0c264b7..e49052f 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordtRfidBinding.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordtRfidBinding.java @@ -1,11 +1,12 @@ 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; /** * 货筐RFID绑定记录对象 base_basket_rfid_binding_record diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/BaseAirCodeMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/BaseAirCodeMapper.java index 70e12e0..5271daa 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/BaseAirCodeMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/BaseAirCodeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.BaseAirCode; +import java.util.List; + /** * 航司代码Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java index d6b0a5b..c7d3bdf 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java @@ -1,9 +1,10 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketCheckContent; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 资产盘点内容Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java index a60fec1..21247f4 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketCheckTask; +import java.util.List; + /** * 资产盘点任务列Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairSparePartsMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairSparePartsMapper.java index e23227b..7bf6734 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairSparePartsMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairSparePartsMapper.java @@ -1,9 +1,10 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketRepairSpareParts; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 维修记录-添加备件Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordCargoBindingMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordCargoBindingMapper.java index 56473dd..8386652 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordCargoBindingMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordCargoBindingMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordCargoBinding; +import java.util.List; + /** * 货物绑定记录Mapper接口 * 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 index 46b1bee..6eeea5e 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java @@ -1,11 +1,11 @@ package com.ruoyi.manager.mapper; -import java.util.List; - import com.ruoyi.manager.domain.LedgerInstantBinding; import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 交接资产Mapper接口 * 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 index c4bfdc0..571119d 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskImgMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskImgMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTaskImg; +import java.util.List; + /** * 交接图片列Mapper接口 * 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 index e514909..cba9b75 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java @@ -1,9 +1,10 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTask; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 交接任务列Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskWaybillMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskWaybillMapper.java index 2a5e39e..ed2c56e 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskWaybillMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskWaybillMapper.java @@ -1,7 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTaskWaybill; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 交接资产Mapper接口 @@ -58,4 +60,9 @@ public interface RecordDeliveryTaskWaybillMapper * @return 结果 */ public int deleteRecordDeliveryTaskWaybillByObjids(String[] objids); + + List selectTaskWaybillList(@Param("waybillNumber") String waybillNumber); + + int updateRecord(@Param("taskCode") String taskCode, @Param("waybillNumber")String waybillNumber, + @Param("cargoFrameEpc") String cargoFrameEpc, @Param("basketId") Long basketId); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordtRfidBindingMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordtRfidBindingMapper.java index ad95aeb..83b4e81 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordtRfidBindingMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordtRfidBindingMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.mapper; -import java.util.List; import com.ruoyi.manager.domain.RecordtRfidBinding; +import java.util.List; + /** * 货筐RFID绑定记录Mapper接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IBaseAirCodeService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IBaseAirCodeService.java index 857b490..cadc774 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IBaseAirCodeService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IBaseAirCodeService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.BaseAirCode; +import java.util.List; + /** * 航司代码Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java index 9d546f1..abc8270 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketCheckContent; +import java.util.List; + /** * 资产盘点内容Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java index bb857c2..bd46642 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketCheckTask; +import java.util.List; + /** * 资产盘点任务列Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairSparePartsService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairSparePartsService.java index 11cb0d0..7018a53 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairSparePartsService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairSparePartsService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordBasketRepairSpareParts; +import java.util.List; + /** * 维修记录-添加备件Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordCargoBindingService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordCargoBindingService.java index 098883f..8e55339 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordCargoBindingService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordCargoBindingService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordCargoBinding; +import java.util.List; + /** * 货物绑定记录Service接口 * 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 index f7b2db1..e076932 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java @@ -1,10 +1,10 @@ package com.ruoyi.manager.service; -import java.util.List; - import com.ruoyi.manager.domain.LedgerInstantBinding; import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket; +import java.util.List; + /** * 交接资产Service接口 * 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 index 9ed39ea..59f271b 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskImgService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskImgService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTaskImg; +import java.util.List; + /** * 交接图片列Service接口 * 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 index 7a2bd0a..0548154 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTask; +import java.util.List; + /** * 交接任务列Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskWaybillService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskWaybillService.java index 063c50d..91e7422 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskWaybillService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskWaybillService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTaskWaybill; +import java.util.List; + /** * 交接资产Service接口 * @@ -58,4 +59,8 @@ public interface IRecordDeliveryTaskWaybillService * @return 结果 */ public int deleteRecordDeliveryTaskWaybillByObjid(Long objid); + + List selectTaskWaybillList(String waybillNumber); + + int updateRecord(String taskCode, String waybillNumber, String cargoFrameEpc, Long basketId); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordtRfidBindingService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordtRfidBindingService.java index 8e609c3..9042d4d 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordtRfidBindingService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordtRfidBindingService.java @@ -1,8 +1,9 @@ package com.ruoyi.manager.service; -import java.util.List; import com.ruoyi.manager.domain.RecordtRfidBinding; +import java.util.List; + /** * 货筐RFID绑定记录Service接口 * diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseAirCodeServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseAirCodeServiceImpl.java index 7b460e5..3851ee9 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseAirCodeServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseAirCodeServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.manager.service.impl; -import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseBindInfoServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseBindInfoServiceImpl.java index 39fff32..6bb2a30 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseBindInfoServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/BaseBindInfoServiceImpl.java @@ -7,7 +7,6 @@ import com.ruoyi.manager.service.IBaseBindInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.sql.SQLIntegrityConstraintViolationException; import java.util.List; /** diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java index 262cd93..5223b59 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java @@ -1,13 +1,14 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.manager.domain.RecordBasketCheckContent; +import com.ruoyi.manager.mapper.RecordBasketCheckContentMapper; +import com.ruoyi.manager.service.IRecordBasketCheckContentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.manager.mapper.RecordBasketCheckContentMapper; -import com.ruoyi.manager.domain.RecordBasketCheckContent; -import com.ruoyi.manager.service.IRecordBasketCheckContentService; -import com.ruoyi.common.core.text.Convert; + +import java.util.List; /** * 资产盘点内容Service业务层处理 diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java index c8e92ef..b3fbd2c 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.manager.service.impl; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.manager.domain.RecordBasketCheckContent; import com.ruoyi.manager.domain.RecordBasketCheckTask; import com.ruoyi.manager.mapper.RecordBasketCheckContentMapper; import com.ruoyi.manager.mapper.RecordBasketCheckTaskMapper; diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairSparePartsServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairSparePartsServiceImpl.java index cc2932a..33309b8 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairSparePartsServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairSparePartsServiceImpl.java @@ -1,13 +1,14 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.manager.domain.RecordBasketRepairSpareParts; +import com.ruoyi.manager.mapper.RecordBasketRepairSparePartsMapper; +import com.ruoyi.manager.service.IRecordBasketRepairSparePartsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.manager.mapper.RecordBasketRepairSparePartsMapper; -import com.ruoyi.manager.domain.RecordBasketRepairSpareParts; -import com.ruoyi.manager.service.IRecordBasketRepairSparePartsService; -import com.ruoyi.common.core.text.Convert; + +import java.util.List; /** * 维修记录-添加备件Service业务层处理 diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordCargoBindingServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordCargoBindingServiceImpl.java index 922b0ed..ad46976 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordCargoBindingServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordCargoBindingServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.manager.domain.RecordCargoBinding; +import com.ruoyi.manager.mapper.RecordCargoBindingMapper; +import com.ruoyi.manager.service.IRecordCargoBindingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.manager.mapper.RecordCargoBindingMapper; -import com.ruoyi.manager.domain.RecordCargoBinding; -import com.ruoyi.manager.service.IRecordCargoBindingService; -import com.ruoyi.common.core.text.Convert; + +import java.util.List; /** * 货物绑定记录Service业务层处理 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 index eb2e4f4..1825a61 100644 --- 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 @@ -1,12 +1,13 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.manager.domain.RecordDeliveryTaskImg; +import com.ruoyi.manager.mapper.RecordDeliveryTaskImgMapper; +import com.ruoyi.manager.service.IRecordDeliveryTaskImgService; 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; + +import java.util.List; /** * 交接图片列Service业务层处理 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 index b8b5473..c84f0dc 100644 --- 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 @@ -1,13 +1,14 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.manager.domain.RecordDeliveryTask; +import com.ruoyi.manager.mapper.RecordDeliveryTaskMapper; +import com.ruoyi.manager.service.IRecordDeliveryTaskService; 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; + +import java.util.List; /** * 交接任务列Service业务层处理 diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskWaybillServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskWaybillServiceImpl.java index a8999a9..403a397 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskWaybillServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskWaybillServiceImpl.java @@ -1,13 +1,14 @@ package com.ruoyi.manager.service.impl; -import java.util.List; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.manager.domain.RecordDeliveryTaskWaybill; +import com.ruoyi.manager.mapper.RecordDeliveryTaskWaybillMapper; +import com.ruoyi.manager.service.IRecordDeliveryTaskWaybillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.manager.mapper.RecordDeliveryTaskWaybillMapper; -import com.ruoyi.manager.domain.RecordDeliveryTaskWaybill; -import com.ruoyi.manager.service.IRecordDeliveryTaskWaybillService; -import com.ruoyi.common.core.text.Convert; + +import java.util.List; /** * 交接资产Service业务层处理 @@ -93,4 +94,14 @@ public class RecordDeliveryTaskWaybillServiceImpl implements IRecordDeliveryTask { return recordDeliveryTaskWaybillMapper.deleteRecordDeliveryTaskWaybillByObjid(objid); } + + @Override + public List selectTaskWaybillList(String waybillNumber) { + return recordDeliveryTaskWaybillMapper.selectTaskWaybillList( waybillNumber); + } + + @Override + public int updateRecord(String taskCode, String waybillNumber, String cargoFrameEpc, Long basketId) { + return recordDeliveryTaskWaybillMapper.updateRecord(taskCode,waybillNumber,cargoFrameEpc,basketId); + } } diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskWaybillMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskWaybillMapper.xml index e6d1e93..fca64ab 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskWaybillMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskWaybillMapper.xml @@ -73,4 +73,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + UPDATE record_delivery_task_waybill SET basket_id = #{basketId}, basket_epc = #{cargoFrameEpc} + WHERE task_code = #{taskCode} AND waybill_number = #{waybillNumber} + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html index a3cf828..fe53bdb 100644 --- a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html +++ b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html @@ -90,6 +90,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + sortName: "createTime", + sortOrder: "desc", modalName: "交接任务列", detailView: true, onExpandRow: function (index, row, $detail) {