From c7bfefec1482194e56890f9cd7a8a5f4abf4e6f1 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 30 Mar 2026 17:18:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=B4=E4=BF=AE=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/domain/LedgerInstantBinding.java | 10 +- .../manager/domain/RecordBasketRepair.java | 19 +++ .../mapper/LedgerInstantBindingMapper.java | 5 + .../mapper/RecordBasketRepairMapper.java | 3 + .../RecordBasketRepairSparePartsMapper.java | 3 + .../RecordDeliveryTaskBaseketMapper.java | 2 + .../mapper/RecordDeliveryTaskMapper.java | 3 + .../service/ILedgerInstantBindingService.java | 4 + .../service/IRecordBasketRepairService.java | 2 + .../IRecordBasketRepairSparePartsService.java | 2 + .../IRecordDeliveryTaskBaseketService.java | 2 + .../service/IRecordDeliveryTaskService.java | 2 + .../impl/LedgerInstantBindingServiceImpl.java | 10 ++ .../impl/RecordBasketRepairServiceImpl.java | 5 + ...cordBasketRepairSparePartsServiceImpl.java | 5 + .../RecordDeliveryTaskBaseketServiceImpl.java | 5 + .../impl/RecordDeliveryTaskServiceImpl.java | 5 + .../mapper/LedgerInstantBindingMapper.xml | 95 +++++++++------ .../mapper/RecordBasketRepairMapper.xml | 100 +++++++++------ .../RecordBasketRepairSparePartsMapper.xml | 9 ++ .../RecordDeliveryTaskBaseketMapper.xml | 13 +- .../manager/RecordDeliveryTaskMapper.xml | 8 +- .../recordtRfidBinding.html | 31 ++++- .../templates/system/repair/repair.html | 32 ++++- .../webapi/controller/ApiController.java | 114 +++++++++++++++--- .../controller/PdaApkVersionController.java | 2 +- ...SubmitBeen.java => ReceiptSubmitBeen.java} | 11 +- .../com/ruoyi/webapi/mapper/ApiMapper.java | 6 +- .../com/ruoyi/webapi/service/ApiService.java | 6 +- .../src/main/resources/mapper/ApiMapper.xml | 12 +- 30 files changed, 414 insertions(+), 112 deletions(-) rename ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/{JoinSubmitBeen.java => ReceiptSubmitBeen.java} (66%) 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 b746c72..a62152d 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 @@ -33,15 +33,21 @@ public class LedgerInstantBinding extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd") private Date crateTime; - private String locationCode; - private String basketCode; private Long basketId; private Long taskState; private BaseBasketInfo baseBasketInfo; + public Long getTaskState() { + return taskState; + } + + public void setTaskState(Long taskState) { + this.taskState = taskState; + } + public Long getBasketId() { return basketId; } 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 083b341..aaa69a1 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,9 +2,12 @@ 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; +import java.util.List; + /** * 维修记录对象 record_basket_repair * @@ -27,8 +30,16 @@ public class RecordBasketRepair extends BaseEntity private String repairInfo; private Long baseBasketId; + private Long repairState; private BaseBasketInfo baseBasketInfo; + private List list; + public Long getRepairState() { + return repairState; + } + public void setRepairState(Long repairState) { + this.repairState = repairState; + } public BaseBasketInfo getBaseBasketInfo() { return baseBasketInfo; @@ -76,6 +87,14 @@ public class RecordBasketRepair extends BaseEntity return repairInfo; } + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java index cba2daf..63b95f7 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.manager.mapper; import com.ruoyi.manager.domain.LedgerInstantBinding; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -65,4 +66,8 @@ public interface LedgerInstantBindingMapper List selectLedgerChildTablelist(LedgerInstantBinding ledgerInstantBinding); int unbindingCargoDeleteLedger(Long basketId); + + void deleteLedgerInstantByBasket(@Param("ids") List ids); + + int updateTaskStatebyBasketID(@Param("ids") List ids); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java index 23eb7c2..67f0e22 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.manager.mapper; import com.ruoyi.manager.domain.RecordBasketRepair; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -61,4 +62,6 @@ public interface RecordBasketRepairMapper public int deleteRecordBasketRepairByObjIds(String[] objIds); List selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair); + + RecordBasketRepair selectRepairByBasketId(@Param("basketId") Long basketId,@Param("repairState") int repairState); } 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 dcd00fb..e23227b 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 @@ -2,6 +2,7 @@ package com.ruoyi.manager.mapper; import java.util.List; import com.ruoyi.manager.domain.RecordBasketRepairSpareParts; +import org.apache.ibatis.annotations.Param; /** * 维修记录-添加备件Mapper接口 @@ -58,4 +59,6 @@ public interface RecordBasketRepairSparePartsMapper * @return 结果 */ public int deleteRecordBasketRepairSparePartsByRecordRepairSparePartsIds(String[] recordRepairSparePartsIds); + + int insertRecordBasketRepairSpareParts2(@Param("list") List list,@Param("repairId") Long repairId); } 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 14de814..5d12219 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 @@ -59,4 +59,6 @@ public interface RecordDeliveryTaskBaseketMapper * @return 结果 */ public int deleteRecordDeliveryTaskBaseketByObjids(String[] objids); + + RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId); } 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 2cd026d..d55c926 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 @@ -2,6 +2,7 @@ package com.ruoyi.manager.mapper; import java.util.List; import com.ruoyi.manager.domain.RecordDeliveryTask; +import org.apache.ibatis.annotations.Param; /** * 交接任务列Mapper接口 @@ -60,4 +61,6 @@ public interface RecordDeliveryTaskMapper public int deleteRecordDeliveryTaskByDeliveryTaskIds(String[] deliveryTaskIds); int countNowDateTaskNumber(); + + int closeTaskByReceipt(@Param("taskCode") String taskCode, @Param("user") String user); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java index a813b53..1af2721 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java @@ -65,4 +65,8 @@ public interface ILedgerInstantBindingService List selectLedgerChildTablelist(LedgerInstantBinding ledgerInstantBinding); int unbindingCargoDeleteLedger(Long basketId); + + void deleteLedgerInstantByBasket(List ids); + + int updateTaskStatebyBasketID(List ids); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java index 74389b2..c78c71e 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java @@ -61,4 +61,6 @@ public interface IRecordBasketRepairService public int deleteRecordBasketRepairByObjId(Long objId); List selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair); + + RecordBasketRepair selectRepairByBasketId(Long basketId, int repairState); } 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 3e9904c..11cb0d0 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 @@ -58,4 +58,6 @@ public interface IRecordBasketRepairSparePartsService * @return 结果 */ public int deleteRecordBasketRepairSparePartsByRecordRepairSparePartsId(Long recordRepairSparePartsId); + + int insertRecordBasketRepairSpareParts(List list, Long repairId); } 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 30221f1..8c97fc9 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 @@ -60,4 +60,6 @@ public interface IRecordDeliveryTaskBaseketService public int deleteRecordDeliveryTaskBaseketByObjid(Long objid); public int insertRecordDeliveryTaskBaseket(String taskCode, List ids); + + RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId); } 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 4e91e0c..f0e63d2 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 @@ -60,4 +60,6 @@ public interface IRecordDeliveryTaskService public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId); int countNowDateTaskNumber(); + + int closeTaskByReceipt(String taskCode, String user); } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java index 471d918..d147075 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java @@ -110,4 +110,14 @@ public class LedgerInstantBindingServiceImpl implements ILedgerInstantBindingSer public int unbindingCargoDeleteLedger(Long basketId) { return ledgerInstantBindingMapper.unbindingCargoDeleteLedger(basketId); } + + @Override + public void deleteLedgerInstantByBasket(List ids) { + ledgerInstantBindingMapper.deleteLedgerInstantByBasket(ids); + } + + @Override + public int updateTaskStatebyBasketID(List ids) { + return ledgerInstantBindingMapper.updateTaskStatebyBasketID(ids); + } } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java index cd4b232..6304f5c 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java @@ -105,4 +105,9 @@ public class RecordBasketRepairServiceImpl implements IRecordBasketRepairService { return recordBasketRepairMapper.selectRecordBasketRepairChildList(recordBasketRepair); } + + @Override + public RecordBasketRepair selectRepairByBasketId(Long basketId, int repairState) { + return recordBasketRepairMapper.selectRepairByBasketId(basketId,repairState); + } } 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 69271ec..cc2932a 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 @@ -93,4 +93,9 @@ public class RecordBasketRepairSparePartsServiceImpl implements IRecordBasketRep { return recordBasketRepairSparePartsMapper.deleteRecordBasketRepairSparePartsByRecordRepairSparePartsId(recordRepairSparePartsId); } + + @Override + public int insertRecordBasketRepairSpareParts(List list, Long repairId) { + return recordBasketRepairSparePartsMapper.insertRecordBasketRepairSpareParts2(list , repairId); + } } diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java index 39154e6..f525141 100644 --- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java @@ -96,4 +96,9 @@ public class RecordDeliveryTaskBaseketServiceImpl implements IRecordDeliveryTask public int insertRecordDeliveryTaskBaseket(String taskCode, List ids) { return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(taskCode, ids); } + + @Override + public RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId) { + return recordDeliveryTaskBaseketMapper.selectRecordDeliveryTaskBaseketByBasket(basketId); + } } 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 8136a53..cc98518 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 @@ -99,4 +99,9 @@ public class RecordDeliveryTaskServiceImpl implements IRecordDeliveryTaskService public int countNowDateTaskNumber() { return recordDeliveryTaskMapper.countNowDateTaskNumber(); } + + @Override + public int closeTaskByReceipt(String taskCode, String user) { + return recordDeliveryTaskMapper.closeTaskByReceipt(taskCode,user); + } } diff --git a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml index a20b7fe..757e008 100644 --- a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml @@ -1,54 +1,67 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - + + + + + + + + + + - select objid, cargo_frame_epc, waybill_number, crate_time,basket_id from ledger_instant_binding + select objid, cargo_frame_epc, waybill_number, crate_time, basket_id + from ledger_instant_binding - where basket_id=#{basketId} - + select t2.objid, t2.cargo_frame_epc, t1.basket_code, t3.location_code, t2.waybill_number, + t2.crate_time,t2.create_by from base_basket_info t1 right join ledger_instant_binding t2 on t1.basket_epc = t2.cargo_frame_epc left join base_location_info t3 on t1.basket_epc = t3.remark - and t1.basket_code = #{cargoFrameEpc} - and t2.waybill_number = #{waybillNumber} - and t2.crate_time between #{params.beginCrateTime} and #{params.endCrateTime} + and t1.basket_code = #{cargoFrameEpc} + and t2.waybill_number = #{waybillNumber} + + and t2.crate_time between #{params.beginCrateTime} and #{params.endCrateTime} + @@ -57,18 +70,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where objid = #{objid} - + insert into ledger_instant_binding cargo_frame_epc, waybill_number, crate_time, - + #{cargoFrameEpc}, #{waybillNumber}, #{crateTime}, - + @@ -82,7 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from ledger_instant_binding where objid = #{objid} + delete + from ledger_instant_binding + where objid = #{objid} @@ -92,12 +108,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from ledger_instant_binding where basket_id in + + #{objid} + + + + update ledger_instant_binding set task_state=1 where basket_id in + + #{objid} + + - + + delete from ledger_instant_binding where basket_id = #{basketId} - - diff --git a/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml b/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml index c6ea32b..0fc7db6 100644 --- a/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml @@ -1,55 +1,74 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - + + + + + + + + + - select obj_id, basket_epc, repair_info, create_by, create_time,base_basket_id from record_basket_repair + select obj_id, basket_epc, repair_info, create_by, create_time, base_basket_id + from record_basket_repair - - select rbr.obj_id, - rbr.basket_epc, - repair_info, - create_by, - create_time, - base_basket_id, - basket_code, - basket_spe, - bbi.created_time, - basket_type, - steel_grade, - self_code, - manufacturer_name - from record_basket_repair rbr - left join base_basket_info bbi on rbr.base_basket_id = bbi.obj_id + + select rbr.obj_id, + rbr.basket_epc, + repair_info, + create_by, + create_time, + base_basket_id, + basket_code, + basket_spe, + bbi.created_time, + basket_type, + steel_grade, + self_code, + manufacturer_name, + rbr.repair_state, + rbr.update_by, + rbr.update_time + from record_basket_repair rbr + left join base_basket_info bbi on rbr.base_basket_id = bbi.obj_id - - - and rbr.basket_epc = #{basketEpc} + + and rbr.basket_epc = #{basketEpc} + and base_basket_id=#{baseBasketId} + and repair_state=#{repairState} + and bbi.steel_grade = #{baseBasketInfo.steelGrade} + and bbi.self_code = #{baseBasketInfo.selfCode} - + + - + insert into record_basket_repair basket_epc, @@ -57,14 +76,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time, base_basket_id, - + #{basketEpc}, #{repairInfo}, #{createBy}, #{createTime}, #{baseBasketId}, - + @@ -74,24 +93,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" repair_info = #{repairInfo}, create_by = #{createBy}, create_time = #{createTime}, + base_basket_id = #{baseBasketId}, + repair_state = #{repairState}, + update_by = #{updateBy}, + update_time = #{updateTime}, where obj_id = #{objId} - delete from record_basket_repair where obj_id = #{objId} + delete + from record_basket_repair + where obj_id = #{objId} - delete from record_basket_repair where obj_id in + delete from record_basket_repair where obj_id in #{objId} - - where base_basket_id = #{baseBasketId} + where base_basket_id = #{baseBasketId} \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketRepairSparePartsMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketRepairSparePartsMapper.xml index ed93750..bb2d750 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketRepairSparePartsMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketRepairSparePartsMapper.xml @@ -52,6 +52,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, + + insert into record_basket_repair_spare_parts + ( repair_id, part_name, part_specifications, amount) + values + + (#{repairId},#{item.partName},#{item.partSpecifications},#{item.amount}) + + + update record_basket_repair_spare_parts diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml index 93bf441..cd67693 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml @@ -35,9 +35,9 @@ where objid = #{objid} - + insert into record_delivery_task_baseket(basket_id,task_code) values - + (#{item},#{taskCode}) @@ -65,4 +65,13 @@ + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml index 59c63b5..f7ca529 100644 --- a/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml @@ -78,6 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where DATE (create_time) = CURDATE() - + + UPDATE record_delivery_task + SET task_state = '1', + update_by = #{user}, + update_time = now() + WHERE task_code = #{taskCode} + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/manager/recordtRfidBinding/recordtRfidBinding.html b/ruoyi-manager/src/main/resources/templates/manager/recordtRfidBinding/recordtRfidBinding.html index 369a667..06a905d 100644 --- a/ruoyi-manager/src/main/resources/templates/manager/recordtRfidBinding/recordtRfidBinding.html +++ b/ruoyi-manager/src/main/resources/templates/manager/recordtRfidBinding/recordtRfidBinding.html @@ -117,7 +117,12 @@ title: '绑定照片', formatter: function (value, row, index) { // return '绑定照片'; - return imageView(value, 540); + // return imageView(value, 540); + if (value) { + return ''; + } else { + return '-'; + } } }, { @@ -155,6 +160,30 @@ return '-' } } + //点击查看图片 +function showImage(filePath) { + if (filePath) { + var urls = filePath.split(','); + var imageHtml = ''; + urls.forEach(function(url, index) { + imageHtml += '
'; + imageHtml += ''; + imageHtml += '
'; + }); + + layer.open({ + type: 1, + title: '绑定照片', + shadeClose: true, + shade: 0.3, + area: ['80%', '80%'], + content: '
' + imageHtml + '
' + }); + } else { + $.modal.alertWarning('暂无绑定照片'); + } +} + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/system/repair/repair.html b/ruoyi-manager/src/main/resources/templates/system/repair/repair.html index 63bcc44..6561820 100644 --- a/ruoyi-manager/src/main/resources/templates/system/repair/repair.html +++ b/ruoyi-manager/src/main/resources/templates/system/repair/repair.html @@ -10,10 +10,19 @@
    + + + +
  • - 资产RFID： - + +
    • +
  • + + +
    • +
  •  搜索 @@ -53,6 +62,7 @@ var removeFlag = [[${@permission.hasPermi('system:repair:remove')}]]; var prefix = ctx + "system/repair"; var basketTypeDatas = [[${@dict.getType('basket_type')}]]; + var repairState = [[${@dict.getType('repair_state')}]]; $(function () { var options = { url: prefix + "/list", @@ -89,6 +99,7 @@ return $.table.selectDictLabel(basketTypeDatas, value); } }, + { field: 'baseBasketInfo.createdTime', title: '采购日期' @@ -117,6 +128,23 @@ field: 'createTime', title: '创建时间' }, + { + field: 'repairState', + title: '状态', + formatter: function (value, row, index) { + return $.table.selectDictLabel(repairState, value); + } + }, + + { + field: 'updateBy', + title: '验收人' + }, + { + field: 'updateTime', + title: '验收时间' + }, + { title: '操作', align: 'center', diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java index af85e04..88c4e30 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java @@ -11,7 +11,7 @@ import com.ruoyi.manager.domain.*; import com.ruoyi.manager.service.*; import com.ruoyi.webapi.doman.APKVersion; import com.ruoyi.webapi.doman.BindingSubmitBeen; -import com.ruoyi.webapi.doman.JoinSubmitBeen; +import com.ruoyi.webapi.doman.ReceiptSubmitBeen; import com.ruoyi.webapi.service.ApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +19,9 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Created by wangh on 2020/7/17-15:18。 @@ -40,7 +42,15 @@ public class ApiController { @Autowired private ILedgerInstantBindingService ledgerInstantBindingService;//货物实时绑定信息 @Autowired - private IRecordCargoBindingService recordCargoBindingService; + private IRecordCargoBindingService recordCargoBindingService;//货物绑定记录 + @Autowired + private IRecordDeliveryTaskService recordDeliveryTaskService;//交货任务 + @Autowired + private IRecordDeliveryTaskBaseketService recordDeliveryTaskBaseketService;//交货详情 + @Autowired + private IRecordDeliveryTaskImgService recordDeliveryTaskImgService;//交货图片 + @Autowired + private IRecordBasketRepairSparePartsService recordBasketRepairSparePartsService;//维修备件 @PostMapping("/findBindingList") public AjaxResult findBindingList(String epc) { @@ -92,46 +102,44 @@ public class ApiController { if (list == null || list.isEmpty()) return AjaxResult.error("账号无绑定记录"); return AjaxResult.success(list); } - @Autowired - private IRecordDeliveryTaskService recordDeliveryTaskService; - @Autowired - private IRecordDeliveryTaskBaseketService recordDeliveryTaskBaseketService; + // 交货任务生成 @PostMapping("/delivery/createTask") - public AjaxResult createDeliveryTask(String json,String user, List files) { + public AjaxResult createDeliveryTask(String json, String user, List files) { List ids = JSONArray.parseArray(json, Long.class); // 生成任务编码 int taskNumber = recordDeliveryTaskService.countNowDateTaskNumber(); - String taskCode="Task"+DateUtils.dateTime()+String.format("%03d",taskNumber); + taskNumber++; + String taskCode = "Task" + DateUtils.dateTime() + String.format("%03d", taskNumber); // 插入任务 - RecordDeliveryTask recordDeliveryTask=new RecordDeliveryTask(); + RecordDeliveryTask recordDeliveryTask = new RecordDeliveryTask(); recordDeliveryTask.setTaskCode(taskCode); recordDeliveryTask.setCreateBy(user); recordDeliveryTaskService.insertRecordDeliveryTask(recordDeliveryTask); // 插入资产到任务表 - recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(taskCode,ids); + recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(taskCode, ids); // 插入图片 - String filePath = RuoYiConfig.getUploadPath()+"/task"; + String filePath = RuoYiConfig.getUploadPath() + "/task"; for (int i = 0; i < files.size(); i++) { try { String fileName = FileUploadUtils.upload(filePath, files.get(i)); - RecordDeliveryTaskImg recordDeliveryTaskImg=new RecordDeliveryTaskImg(); + RecordDeliveryTaskImg recordDeliveryTaskImg = new RecordDeliveryTaskImg(); recordDeliveryTaskImg.setTaskCode(taskCode); recordDeliveryTaskImg.setImgPath(fileName); recordDeliveryTaskImgService.insertRecordDeliveryTaskImg(recordDeliveryTaskImg); } catch (IOException e) { throw new RuntimeException(e); } - } - + // ledgerInstantBindingService.deleteLedgerInstantByBasket(ids);// 删除实时绑定记录 + // 更新状态 + ledgerInstantBindingService.updateTaskStatebyBasketID(ids); return AjaxResult.success(); } - @Autowired - private IRecordDeliveryTaskImgService recordDeliveryTaskImgService; + //交货提交 @PostMapping("/join/jiaoSubmit") - public AjaxResult joinJiaoSubmit(@RequestBody JoinSubmitBeen been) { + public AjaxResult joinJiaoSubmit(@RequestBody ReceiptSubmitBeen been) { int i = service.joinSelectByUser(been); if (i == 0) { return AjaxResult.success(); @@ -142,7 +150,7 @@ public class ApiController { //接货提交 @PostMapping("/join/shouSubmit") - public AjaxResult joinJieSubmit(@RequestBody JoinSubmitBeen been) { + public AjaxResult joinJieSubmit(@RequestBody ReceiptSubmitBeen been) { int i = service.joinShouSubmit(been); if (i >= been.getList().size()) { @@ -152,6 +160,40 @@ public class ApiController { } + // 远程接货扫描epc + @PostMapping("/receipt/scanEpc") + public AjaxResult ReceiptScanEpc(String epc) { + BaseBasketInfo baseBasketInfo = baseBasketInfoService.selectBaseBasketInfoByEpc(epc); + if (baseBasketInfo == null) return AjaxResult.error("RFID查询失败，没有维护该资产"); + Long objId = baseBasketInfo.getObjId(); + RecordDeliveryTaskBaseket select1 = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketByBasket(objId);//查询资产是否绑定任务 + if (select1 == null) return AjaxResult.error("资产未绑定任务或任务已完成"); + // 查询所有资产 + List list = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketList(select1); + // 查询所有图片 + RecordDeliveryTaskImg recordDeliveryTaskImg = new RecordDeliveryTaskImg(); + recordDeliveryTaskImg.setTaskCode(select1.getTaskCode()); + List imgList = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg); + + // 封装返回数据 + Map map = new HashMap<>(); + map.put("taskCode", select1.getTaskCode()); + map.put("baseketList", list); + map.put("imgList", imgList); + return AjaxResult.success(map); + } + + // 远程接货确认 + @PostMapping("/receipt/submit") + public AjaxResult receiptSubmit(@RequestBody ReceiptSubmitBeen been) { + int i = service.joinShouSubmit(been); + String taskCode = been.getTaskCode(); + String user = been.getUser(); + recordDeliveryTaskService.closeTaskByReceipt(taskCode, user); + + return AjaxResult.success(); + } + /** * 查询所有生产厂家 */ @@ -200,7 +242,11 @@ public class ApiController { public AjaxResult saveRepairInfo(@RequestBody RecordBasketRepair recordBasketRepair) { int i = recordBasketRepairService.insertRecordBasketRepair(recordBasketRepair); - if (i > 0) return AjaxResult.success(); + if (i > 0) { + Long objId = recordBasketRepair.getObjId(); + List list = recordBasketRepair.getList(); + recordBasketRepairSparePartsService.insertRecordBasketRepairSpareParts(list, objId); + } return AjaxResult.error(); } @@ -214,6 +260,36 @@ public class ApiController { return AjaxResult.success(baseBasketInfo); } + // 维修验收查询资产 + @PostMapping("/repair/checkBasketSelectByEpc") + public AjaxResult repairCheckBasketSelectByEpc(String epc) { + BaseBasketInfo baseBasketInfo = baseBasketInfoService.selectBaseBasketInfoByEpc(epc); + if (baseBasketInfo == null) return AjaxResult.error("没有维护该资产"); + // 查询主表 + RecordBasketRepair recordBasketRepair = recordBasketRepairService.selectRepairByBasketId(baseBasketInfo.getObjId(), 0); + if (recordBasketRepair == null) { + return AjaxResult.error("查询失败，暂未找到该资产待验收记录"); + } + // 查询子表 + List recordBasketRepairSpareParts = recordBasketRepairSparePartsService.selectRecordBasketRepairSparePartsList(new RecordBasketRepairSpareParts() {{ + setRepairId(recordBasketRepair.getObjId()); + }}); + recordBasketRepair.setList(recordBasketRepairSpareParts); + return AjaxResult.success(recordBasketRepair); + } + + @PostMapping("/repair/overRepairSubmit") + public AjaxResult overRepairSubmit(Long objId, String userName) { + recordBasketRepairService.updateRecordBasketRepair(new RecordBasketRepair(){{ + setObjId(objId); + setRepairState(1L); + setUpdateBy(userName); + setUpdateTime(new Date()); + }}); + return AjaxResult.success(); + } + + /** * 通过资产编号查询资产 */ diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/PdaApkVersionController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/PdaApkVersionController.java index 0923ab5..a3d35af 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/PdaApkVersionController.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/PdaApkVersionController.java @@ -99,7 +99,7 @@ public class PdaApkVersionController extends BaseController { pdaApkVersion.setApkSize(file1.length() / 1024); pdaApkVersion.setApkMd5(Md5Utils.getFileMD5(file1)); - pdaApkVersion.setDownloadUrl( "http://"+IpUtils.getHostIp()+":8091"+fileName); + pdaApkVersion.setDownloadUrl( "http://"+"119.45.202.115"+":8091"+fileName); } catch (IOException e) { e.printStackTrace(); } diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/ReceiptSubmitBeen.java similarity index 66% rename from ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java rename to ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/ReceiptSubmitBeen.java index 4521c8d..c1d2c20 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/ReceiptSubmitBeen.java @@ -6,9 +6,18 @@ import java.util.List; * @author wanghao * @date 2024/7/29 9:50 */ -public class JoinSubmitBeen { +public class ReceiptSubmitBeen { private String user; private List list; + private String taskCode; + + public String getTaskCode() { + return taskCode; + } + + public void setTaskCode(String taskCode) { + this.taskCode = taskCode; + } public String getUser() { return user; diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java index ce7e4ac..8e326b8 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java @@ -3,7 +3,7 @@ package com.ruoyi.webapi.mapper; import com.ruoyi.manager.domain.LedgerInstantBinding; import com.ruoyi.webapi.doman.APKVersion; -import com.ruoyi.webapi.doman.JoinSubmitBeen; +import com.ruoyi.webapi.doman.ReceiptSubmitBeen; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -30,9 +30,9 @@ public interface ApiMapper { List jionSelect(String user); - int joinShouSubmit(JoinSubmitBeen been); + int joinShouSubmit(ReceiptSubmitBeen been); - int joinSelectByUser(JoinSubmitBeen been); + int joinSelectByUser(ReceiptSubmitBeen been); APKVersion getVersion(); } diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java index 264c5c2..b8a828b 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java @@ -2,7 +2,7 @@ package com.ruoyi.webapi.service; import com.ruoyi.manager.domain.LedgerInstantBinding; import com.ruoyi.webapi.doman.APKVersion; -import com.ruoyi.webapi.doman.JoinSubmitBeen; +import com.ruoyi.webapi.doman.ReceiptSubmitBeen; import com.ruoyi.webapi.mapper.ApiMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,11 +48,11 @@ public class ApiService { return mapper.jionSelect(user); } - public int joinShouSubmit(JoinSubmitBeen been) { + public int joinShouSubmit(ReceiptSubmitBeen been) { return mapper.joinShouSubmit(been); } - public int joinSelectByUser(JoinSubmitBeen been) { + public int joinSelectByUser(ReceiptSubmitBeen been) { return mapper.joinSelectByUser(been); } diff --git a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml index 74c902d..cbfc8ab 100644 --- a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml @@ -33,16 +33,16 @@ select cargo_frame_epc from ledger_instant_binding where create_by = #{user} group by cargo_frame_epc - - update ledger_instant_binding set create_by=#{user} where cargo_frame_epc in - - #{item} - + + update ledger_instant_binding set create_by=#{user} , task_state = 0 where basket_id in + + #{item} + - select count(1) from ledger_instant_binding basket_id in