wangh
/
bgs-no-power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:维修完成

Browse Source
master
wanghao 1 week ago
parent 57b95cd38a
commit c7bfefec14
30 changed files with 414 additions and 112 deletions
Show Stats Download Patch File Download Diff File

10
ruoyi-manager/src/main/java/com/ruoyi/manager/domain/LedgerInstantBinding.java
Unescape Escape View File

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

19
ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java
Unescape Escape View File

@ -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<RecordBasketRepairSpareParts> 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<RecordBasketRepairSpareParts> getList() {
return list;
}
public void setList(List<RecordBasketRepairSpareParts> list) {
this.list = list;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

5
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java
Unescape Escape View File

@ -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<LedgerInstantBinding> selectLedgerChildTablelist(LedgerInstantBinding ledgerInstantBinding);
int unbindingCargoDeleteLedger(Long basketId);
void deleteLedgerInstantByBasket(@Param("ids") List<Long> ids);
int updateTaskStatebyBasketID(@Param("ids") List<Long> ids);
}

3
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java
Unescape Escape View File

@ -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<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
RecordBasketRepair selectRepairByBasketId(@Param("basketId") Long basketId,@Param("repairState") int repairState);
}

3
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairSparePartsMapper.java
Unescape Escape View File

@ -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<RecordBasketRepairSpareParts> list,@Param("repairId") Long repairId);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java
Unescape Escape View File

@ -59,4 +59,6 @@ public interface RecordDeliveryTaskBaseketMapper
* @return 结果
*/
public int deleteRecordDeliveryTaskBaseketByObjids(String[] objids);
RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId);
}

3
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java
Unescape Escape View File

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

4
ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java
Unescape Escape View File

@ -65,4 +65,8 @@ public interface ILedgerInstantBindingService
List<LedgerInstantBinding> selectLedgerChildTablelist(LedgerInstantBinding ledgerInstantBinding);
int unbindingCargoDeleteLedger(Long basketId);
void deleteLedgerInstantByBasket(List<Long> ids);
int updateTaskStatebyBasketID(List<Long> ids);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java
Unescape Escape View File

@ -61,4 +61,6 @@ public interface IRecordBasketRepairService
public int deleteRecordBasketRepairByObjId(Long objId);
List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
RecordBasketRepair selectRepairByBasketId(Long basketId, int repairState);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairSparePartsService.java
Unescape Escape View File

@ -58,4 +58,6 @@ public interface IRecordBasketRepairSparePartsService
* @return 结果
*/
public int deleteRecordBasketRepairSparePartsByRecordRepairSparePartsId(Long recordRepairSparePartsId);
int insertRecordBasketRepairSpareParts(List<RecordBasketRepairSpareParts> list, Long repairId);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java
Unescape Escape View File

@ -60,4 +60,6 @@ public interface IRecordDeliveryTaskBaseketService
public int deleteRecordDeliveryTaskBaseketByObjid(Long objid);
public int insertRecordDeliveryTaskBaseket(String taskCode, List<Long> ids);
RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java
Unescape Escape View File

@ -60,4 +60,6 @@ public interface IRecordDeliveryTaskService
public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId);
int countNowDateTaskNumber();
int closeTaskByReceipt(String taskCode, String user);
}

10
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java
Unescape Escape View File

@ -110,4 +110,14 @@ public class LedgerInstantBindingServiceImpl implements ILedgerInstantBindingSer
public int unbindingCargoDeleteLedger(Long basketId) {
return ledgerInstantBindingMapper.unbindingCargoDeleteLedger(basketId);
}
@Override
public void deleteLedgerInstantByBasket(List<Long> ids) {
ledgerInstantBindingMapper.deleteLedgerInstantByBasket(ids);
}
@Override
public int updateTaskStatebyBasketID(List<Long> ids) {
return ledgerInstantBindingMapper.updateTaskStatebyBasketID(ids);
}
}

5
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java
Unescape Escape View File

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

5
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairSparePartsServiceImpl.java
Unescape Escape View File

@ -93,4 +93,9 @@ public class RecordBasketRepairSparePartsServiceImpl implements IRecordBasketRep
{
return recordBasketRepairSparePartsMapper.deleteRecordBasketRepairSparePartsByRecordRepairSparePartsId(recordRepairSparePartsId);
}
@Override
public int insertRecordBasketRepairSpareParts(List<RecordBasketRepairSpareParts> list, Long repairId) {
return recordBasketRepairSparePartsMapper.insertRecordBasketRepairSpareParts2(list , repairId);
}
}

5
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java
Unescape Escape View File

@ -96,4 +96,9 @@ public class RecordDeliveryTaskBaseketServiceImpl implements IRecordDeliveryTask
public int insertRecordDeliveryTaskBaseket(String taskCode, List<Long> ids) {
return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(taskCode, ids);
}
@Override
public RecordDeliveryTaskBaseket selectRecordDeliveryTaskBaseketByBasket(Long basketId) {
return recordDeliveryTaskBaseketMapper.selectRecordDeliveryTaskBaseketByBasket(basketId);
}
}

5
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskServiceImpl.java
Unescape Escape View File

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

95
ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml
Unescape Escape View File

@ -1,54 +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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.manager.mapper.LedgerInstantBindingMapper">
<resultMap type="com.ruoyi.manager.domain.LedgerInstantBinding" id="LedgerInstantBindingResult">
<result property="objid" column="objid" />
<result property="cargoFrameEpc" column="cargo_frame_epc" />
<result property="waybillNumber" column="waybill_number" />
<result property="crateTime" column="crate_time" />
<result property="locationCode" column="location_code" />
<result property="basketCode" column="basket_code" />
<result property="createBy" column="create_by" />
<result property="basketId" column="basket_id" />
<association property="baseBasketInfo" resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult"/>
<result property="objid" column="objid"/>
<result property="cargoFrameEpc" column="cargo_frame_epc"/>
<result property="waybillNumber" column="waybill_number"/>
<result property="crateTime" column="crate_time"/>
<result property="locationCode" column="location_code"/>
<result property="basketCode" column="basket_code"/>
<result property="createBy" column="create_by"/>
<result property="basketId" column="basket_id"/>
<result property="taskState" column="task_state"/>
<association property="baseBasketInfo"
resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult"/>
</resultMap>
<sql id="selectLedgerInstantBindingVo">
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
</sql>
<select id="selectList" resultMap="LedgerInstantBindingResult">
select basket_id,
basket_code,
basket_spe,
basket_type,
steel_grade,
self_code
basket_code,
basket_spe,
basket_type,
steel_grade,
self_code
from ledger_instant_binding lib
left join base_basket_info bbi on lib.basket_id = bbi.obj_id
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>
<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>
and task_state=0
</where>
group by basket_id
</select>
<select id="selectLedgerChildTablelist" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding" resultMap="LedgerInstantBindingResult">
<select id="selectLedgerChildTablelist" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding"
resultMap="LedgerInstantBindingResult">
<include refid="selectLedgerInstantBindingVo"/>
where basket_id=#{basketId}
</select>
<select id="selectLedgerInstantBindingList" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding" resultMap="LedgerInstantBindingResult">
select t2.objid, t2.cargo_frame_epc, t1.basket_code, t3.location_code, t2.waybill_number, t2.crate_time,t2.create_by
<select id="selectLedgerInstantBindingList" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding"
resultMap="LedgerInstantBindingResult">
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
<where>
<if test="cargoFrameEpc != null and cargoFrameEpc != ''"> and t1.basket_code = #{cargoFrameEpc}</if>
<if test="waybillNumber != null and waybillNumber != ''"> and t2.waybill_number = #{waybillNumber}</if>
<if test="params.beginCrateTime != null and params.beginCrateTime != '' and params.endCrateTime != null and params.endCrateTime != ''"> and t2.crate_time between #{params.beginCrateTime} and #{params.endCrateTime}</if>
<if test="cargoFrameEpc != null and cargoFrameEpc != ''">and t1.basket_code = #{cargoFrameEpc}</if>
<if test="waybillNumber != null and waybillNumber != ''">and t2.waybill_number = #{waybillNumber}</if>
<if test="params.beginCrateTime != null and params.beginCrateTime != '' and params.endCrateTime != null and params.endCrateTime != ''">
and t2.crate_time between #{params.beginCrateTime} and #{params.endCrateTime}
</if>
</where>
</select>
@ -57,18 +70,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where objid = #{objid}
</select>
<insert id="insertLedgerInstantBinding" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding" useGeneratedKeys="true" keyProperty="objid">
<insert id="insertLedgerInstantBinding" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding"
useGeneratedKeys="true" keyProperty="objid">
insert into ledger_instant_binding
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="cargoFrameEpc != null">cargo_frame_epc,</if>
<if test="waybillNumber != null">waybill_number,</if>
<if test="crateTime != null">crate_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cargoFrameEpc != null">#{cargoFrameEpc},</if>
<if test="waybillNumber != null">#{waybillNumber},</if>
<if test="crateTime != null">#{crateTime},</if>
</trim>
</trim>
</insert>
<update id="updateLedgerInstantBinding" parameterType="com.ruoyi.manager.domain.LedgerInstantBinding">
@ -82,7 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteLedgerInstantBindingByObjid" parameterType="Long">
delete from ledger_instant_binding where objid = #{objid}
delete
from ledger_instant_binding
where objid = #{objid}
</delete>
<delete id="deleteLedgerInstantBindingByObjids" parameterType="String">
@ -92,12 +108,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<delete id="deleteLedgerInstantByBasket" parameterType="list">
delete from ledger_instant_binding where basket_id in
<foreach item="objid" collection="ids" open="(" separator="," close=")">
#{objid}
</foreach>
</delete>
<update id="updateTaskStatebyBasketID" parameterType="list">
update ledger_instant_binding set task_state=1 where basket_id in
<foreach item="objid" collection="ids" open="(" separator="," close=")">
#{objid}
</foreach>
</update>
<delete id="unbindingCargoDeleteLedger" parameterType="Long">
<delete id="unbindingCargoDeleteLedger" parameterType="Long">
delete from ledger_instant_binding where basket_id = #{basketId}
</delete>
</mapper>

100
ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml
Unescape Escape View File

@ -1,55 +1,74 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.manager.mapper.RecordBasketRepairMapper">
<resultMap type="com.ruoyi.manager.domain.RecordBasketRepair" id="RecordBasketRepairResult">
<result property="objId" column="obj_id" />
<result property="basketEpc" column="basket_epc" />
<result property="repairInfo" column="repair_info" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="baseBasketId" column="base_basket_id" />
<result property="objId" column="obj_id"/>
<result property="basketEpc" column="basket_epc"/>
<result property="repairInfo" column="repair_info"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="repairState" column="repair_state"/>
<result property="baseBasketId" column="base_basket_id"/>
<association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult">
</association>
</resultMap>
<sql id="selectRecordBasketRepairVo">
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
</sql>
<sql id="selectRecordBasketRepairList">
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
<sql id="selectRecordBasketRepairList">
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
</sql>
<select id="selectRecordBasketRepairList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
<select id="selectRecordBasketRepairList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair"
resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairList"/>
<where>
<if test="basketEpc != null and basketEpc != ''"> and rbr.basket_epc = #{basketEpc}</if>
<where>
<if test="basketEpc != null and basketEpc != ''">and rbr.basket_epc = #{basketEpc}</if>
<if test="baseBasketId !=null">and base_basket_id=#{baseBasketId}</if>
<if test="repairState !=null">and repair_state=#{repairState}</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>
<select id="selectRepairByBasketId" resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairList"/>
where base_basket_id=#{basketId} and repair_state=#{repairState}
order by create_time desc
limit 1
</select>
<select id="selectRecordBasketRepairByObjId" parameterType="Long" resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairVo"/>
where obj_id = #{objId}
</select>
<insert id="insertRecordBasketRepair" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" useGeneratedKeys="true" keyProperty="objId">
<insert id="insertRecordBasketRepair" parameterType="com.ruoyi.manager.domain.RecordBasketRepair"
useGeneratedKeys="true" keyProperty="objId">
insert into record_basket_repair
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="basketEpc != null">basket_epc,</if>
@ -57,14 +76,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="baseBasketId != null">base_basket_id,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="basketEpc != null">#{basketEpc},</if>
<if test="repairInfo != null">#{repairInfo},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="baseBasketId != null">#{baseBasketId},</if>
</trim>
</trim>
</insert>
<update id="updateRecordBasketRepair" parameterType="com.ruoyi.manager.domain.RecordBasketRepair">
@ -74,24 +93,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="repairInfo != null">repair_info = #{repairInfo},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="baseBasketId != null">base_basket_id = #{baseBasketId},</if>
<if test="repairState != null">repair_state = #{repairState},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where obj_id = #{objId}
</update>
<delete id="deleteRecordBasketRepairByObjId" parameterType="Long">
delete from record_basket_repair where obj_id = #{objId}
delete
from record_basket_repair
where obj_id = #{objId}
</delete>
<delete id="deleteRecordBasketRepairByObjIds" parameterType="String">
delete from record_basket_repair where obj_id in
delete from record_basket_repair where obj_id in
<foreach item="objId" collection="array" open="(" separator="," close=")">
#{objId}
</foreach>
</delete>
<select id="selectRecordBasketRepairChildList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
<select id="selectRecordBasketRepairChildList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair"
resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairVo"/>
where base_basket_id = #{baseBasketId}
where base_basket_id = #{baseBasketId}
</select>
</mapper>

9
ruoyi-manager/src/main/resources/mapper/manager/RecordBasketRepairSparePartsMapper.xml
Unescape Escape View File

@ -52,6 +52,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<insert id="insertRecordBasketRepairSpareParts2">
insert into record_basket_repair_spare_parts
( repair_id, part_name, part_specifications, amount)
values
<foreach item="item" index="index" collection="list" separator=",">
(#{repairId},#{item.partName},#{item.partSpecifications},#{item.amount})
</foreach>
</insert>
<update id="updateRecordBasketRepairSpareParts" parameterType="RecordBasketRepairSpareParts">
update record_basket_repair_spare_parts

13
ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml
Unescape Escape View File

@ -35,9 +35,9 @@
where objid = #{objid}
</select>
<insert id="insertRecordDeliveryTaskBaseket" >
<insert id="insertRecordDeliveryTaskBaseket">
insert into record_delivery_task_baseket(basket_id,task_code) values
<foreach collection="ids" item="item" separator="," >
<foreach collection="ids" item="item" separator=",">
(#{item},#{taskCode})
</foreach>
@ -65,4 +65,13 @@
</foreach>
</delete>
<select id="selectRecordDeliveryTaskBaseketByBasket" resultMap="RecordDeliveryTaskBaseketResult">
select rdtb.task_code
from record_delivery_task_baseket rdtb
left join record_delivery_task rdt on rdt.task_code = rdtb.task_code
where task_state = 0
and basket_id = #{basketId}
order by rdt.create_time desc limit 1
</select>
</mapper>

8
ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml
Unescape Escape View File

@ -78,6 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where DATE (create_time) = CURDATE()
</select>
<update id="closeTaskByReceipt">
UPDATE record_delivery_task
SET task_state = '1',
update_by = #{user},
update_time = now()
WHERE task_code = #{taskCode}
</update>
</mapper>

31
ruoyi-manager/src/main/resources/templates/manager/recordtRfidBinding/recordtRfidBinding.html
Unescape Escape View File

@ -117,7 +117,12 @@
title: '绑定照片',
formatter: function (value, row, index) {
// return '<img src="' + ctx + value + '" alt="绑定照片" style="max-width: 100px; max-height: 100px;">';
return imageView(value, 540);
// return imageView(value, 540);
if (value) {
return '<button type="button" class="btn btn-info btn-xs" onclick="showImage(\'' + value + '\')">查看图片</button>';
} else {
return '-';
}
}
},
{
@ -155,6 +160,30 @@
return '-'
}
}
//点击查看图片
function showImage(filePath) {
if (filePath) {
var urls = filePath.split(',');
var imageHtml = '';
urls.forEach(function(url, index) {
imageHtml += '<div style="text-align: center; margin: 10px 0;">';
imageHtml += '<img src="' + url + '" style="max-width: 100%; max-height: 400px; border: 1px solid #ddd; border-radius: 4px; padding: 5px;"/>';
imageHtml += '</div>';
});
layer.open({
type: 1,
title: '绑定照片',
shadeClose: true,
shade: 0.3,
area: ['80%', '80%'],
content: '<div style="padding: 20px; text-align: center;">' + imageHtml + '</div>'
});
} else {
$.modal.alertWarning('暂无绑定照片');
}
}
</script>
</body>
</html>

32
ruoyi-manager/src/main/resources/templates/system/repair/repair.html
Unescape Escape View File

@ -10,10 +10,19 @@
<form id="formId">
<div class="select-list">
<ul>
<!-- <li> -->
<!-- 资产RFID： -->
<!-- <input name="basketEpc" type="text"/> -->
<!-- </li> -->
<li>
资产RFID：
<input name="basketEpc" type="text"/>
<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
class="fa fa-search"></i>&nbsp;搜索</a>
@ -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',

114
ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
Unescape Escape View File

@ -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<MultipartFile> files) {
public AjaxResult createDeliveryTask(String json, String user, List<MultipartFile> files) {
List<Long> 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<RecordDeliveryTaskBaseket> list = recordDeliveryTaskBaseketService.selectRecordDeliveryTaskBaseketList(select1);
// 查询所有图片
RecordDeliveryTaskImg recordDeliveryTaskImg = new RecordDeliveryTaskImg();
recordDeliveryTaskImg.setTaskCode(select1.getTaskCode());
List<RecordDeliveryTaskImg> imgList = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg);
// 封装返回数据
Map<String, Object> 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<RecordBasketRepairSpareParts> 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> 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();
}
/**
* 通过资产编号查询资产
*/

2
ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/PdaApkVersionController.java
Unescape Escape View File

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

11
ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java → ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/ReceiptSubmitBeen.java
Unescape Escape View File

@ -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<Long> list;
private String taskCode;
public String getTaskCode() {
return taskCode;
}
public void setTaskCode(String taskCode) {
this.taskCode = taskCode;
}
public String getUser() {
return user;

6
ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java
Unescape Escape View File

@ -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<LedgerInstantBinding> jionSelect(String user);
int joinShouSubmit(JoinSubmitBeen been);
int joinShouSubmit(ReceiptSubmitBeen been);
int joinSelectByUser(JoinSubmitBeen been);
int joinSelectByUser(ReceiptSubmitBeen been);
APKVersion getVersion();
}

6
ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java
Unescape Escape View File

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

12
ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml
Unescape Escape View File

@ -33,16 +33,16 @@
select cargo_frame_epc from ledger_instant_binding where create_by = #{user} group by cargo_frame_epc
</select>
<update id="joinShouSubmit" parameterType="com.ruoyi.webapi.doman.JoinSubmitBeen">
update ledger_instant_binding set create_by=#{user} where cargo_frame_epc in
<foreach collection="list" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
<update id="joinShouSubmit" parameterType="com.ruoyi.webapi.doman.ReceiptSubmitBeen">
update ledger_instant_binding set create_by=#{user} , task_state = 0 where basket_id in
<foreach collection="list" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
</update>
<select id="joinSelectByUser" parameterType="com.ruoyi.webapi.doman.JoinSubmitBeen" resultType="java.lang.Integer">
<select id="joinSelectByUser" parameterType="com.ruoyi.webapi.doman.ReceiptSubmitBeen" resultType="java.lang.Integer">
select count(1) from ledger_instant_binding
<where>
basket_id in

Write Preview
Loading…
Cancel
Save