Yangwl
/
SZXBGJ_HT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:615601866db1722bfd5bbc7f5e573dafb4b0e33a
Branches Tags
Yangwl:master
..
compare: Yangwl:03c3b819f160cff2b27eb49b743d8420aeb4dd05
Branches Tags
Yangwl:master

No commits in common. '615601866db1722bfd5bbc7f5e573dafb4b0e33a' and '03c3b819f160cff2b27eb49b743d8420aeb4dd05' have entirely different histories.
615601866d ... 03c3b819f1

13 changed files with 14 additions and 138 deletions
Show Stats

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java
Unescape Escape View File

@ -19,7 +19,6 @@ import com.ruoyi.system.service.IRecordTyreInstallService;
import com.ruoyi.system.service.IRecordWarehousingService;
import com.ruoyi.system.service.ITyreStatDetailService;
import com.ruoyi.system.domain.vo.InboundBatchPreviewVo;
import com.ruoyi.system.service.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -64,10 +63,6 @@ public class BaseTyreController extends BaseController
@Autowired
private IBaseInventoryService baseInventoryService;
@Autowired
private IBizOrderTireDetailService bizOrderTireDetailService;
@Autowired
private IBizMaintenanceOrderService iBizMaintenanceOrderService;
@RequiresPermissions("tyre:tyre:view")
@GetMapping()
public String tyre()
@ -551,16 +546,4 @@ public class BaseTyreController extends BaseController
: AjaxResult.error("收货撤回失败或无可撤回轮胎");
}
@PostMapping("/pdaQueryTyreTimeLine")
@ResponseBody
public AjaxResult pdaQueryTyreTimeLine(BaseTyre baseTyre)
{
try {
Map resultMap = baseTyreService.pdaQueryTyreTimeLine(baseTyre);
return success(resultMap);
}catch (Exception e){
e.printStackTrace();
return error();
}
}
}

2
ruoyi-admin/src/main/resources/application.yml
Unescape Escape View File

@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2026
# 实例演示开关
demoEnabled: true
demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: C:/ruoyi/uploadPath
# 获取ip地址开关

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
Unescape Escape View File

@ -347,8 +347,6 @@ public class ShiroConfig
filterChainDefinitionMap.put("/tyre/order/PDAGetMaintenanceOrder", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/order/PDAAddMaintenanceOrder", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/order/PDASaveMaintenanceOrder", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/tyre/pdaQueryTyreTimeLine", "anon,captchaValidate");
// 系统权限列表
// filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());

21
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java
Unescape Escape View File

@ -83,23 +83,6 @@ public class BaseTyre extends BaseEntity
* 约定：批量导入保持为空；空值在页面统一展示为“已发货待入库”，非空按字典翻译。
*/
private String inventoryStatus;
public String getPressure() {
return pressure;
}
public void setPressure(String pressure) {
this.pressure = pressure;
}
private String keyParam;
public String getKeyParam() {
return keyParam;
}
public void setKeyParam(String keyParam) {
this.keyParam = keyParam;
}
public String getCompany() {
return company;
@ -287,7 +270,7 @@ public class BaseTyre extends BaseEntity
.append("tyreEpc", getTyreEpc())
.append("inboundCode", getInboundCode())
.append("tyreBrand", getTyreBrand())
.append("tyreModel", getTyreModel())
@ -303,7 +286,7 @@ public class BaseTyre extends BaseEntity
.append("deptName", getDeptName())
.append("inventoryStatus", getInventoryStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())

12
ruoyi-system/src/main/java/com/ruoyi/system/domain/BizOrderTireDetail.java
Unescape Escape View File

@ -24,10 +24,8 @@ public class BizOrderTireDetail extends BaseEntity
private Long orderId;
/** 轮胎位置ID（关联位置表） */
// @Excel(name = "轮胎位置ID", readConverterExp = "关=联位置表")
@Excel(name = "轮胎位置ID", readConverterExp = "关=联位置表")
private Long positionId;
@Excel(name = "轮胎位置ID")
private String positionName;
/** 轮胎ID（关联轮胎档案，如果是新胎可能为空或临时生成） */
@Excel(name = "轮胎ID", readConverterExp = "关=联轮胎档案，如果是新胎可能为空或临时生成")
@ -51,14 +49,6 @@ public class BizOrderTireDetail extends BaseEntity
// 数据类型（保养；换新胎，卸车；换新胎，装车）
private String dataType;
public String getPositionName() {
return positionName;
}
public void setPositionName(String positionName) {
this.positionName = positionName;
}
public String getDataType() {
return dataType;
}

6
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java
Unescape Escape View File

@ -76,7 +76,7 @@ public interface BaseTyreMapper
/**
* 根据入库编码查询批次下的轮胎基础信息列表
*
*
* @param inboundCode 入库编码
* @return 轮胎基础信息列表
*/
@ -84,12 +84,10 @@ public interface BaseTyreMapper
/**
* 根据入库编码统计批次下的轮胎数量
*
*
* @param inboundCode 入库编码
* @return 轮胎数量
*/
int countBaseTyreByInboundCode(@Param("inboundCode") String inboundCode);
BaseTyre selectBaseTyreByKeyParam(BaseTyre baseTyre);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseTyreService.java
Unescape Escape View File

@ -84,6 +84,4 @@ public interface IBaseTyreService
*/
List<BaseTyre> selectBaseTyresByInboundCode(String inboundCode);
Map pdaQueryTyreTimeLine(BaseTyre baseTyre);
}

1
ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreInstallService.java
Unescape Escape View File

@ -67,5 +67,4 @@ public interface IRecordTyreInstallService
AjaxResult PdaInstallTyre(RecordTyreInstall recordTyreInstall);
AjaxResult PdaUnInstallTyre(RecordTyreInstall recordTyreInstall);
}

31
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java
Unescape Escape View File

@ -19,7 +19,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -38,12 +37,6 @@ public class BaseTyreServiceImpl implements IBaseTyreService
{
@Autowired
private BaseTyreMapper baseTyreMapper;
@Autowired
private RecordWarehousingMapper recordWarehousingMapper;
@Autowired
private RecordTyreInstallMapper recordTyreInstallMapper;
private static final Logger log = LoggerFactory.getLogger(BaseTyreServiceImpl.class);
/**
* 查询轮胎基础信息
@ -252,28 +245,4 @@ public class BaseTyreServiceImpl implements IBaseTyreService
public List<BaseTyre> selectBaseTyresByInboundCode(String inboundCode) {
return baseTyreMapper.selectByInboundCode(inboundCode);
}
@Override
public Map pdaQueryTyreTimeLine(BaseTyre baseTyre) {
Map map = new HashMap();
//查询轮胎数据
BaseTyre resultBase = baseTyreMapper.selectBaseTyreByKeyParam(baseTyre);
if (resultBase==null){
return map;
}else {
map.put("resultBase",resultBase);
//查询出入库数据
String tyreRfid = resultBase.getTyreEpc();
RecordWarehousing recordWarehousing = new RecordWarehousing();
recordWarehousing.setTyreRfid(tyreRfid);
List<RecordWarehousing> recordWarehousingList = recordWarehousingMapper.selectRecordWarehousingList(recordWarehousing);
map.put("recordWarehousingList",recordWarehousingList);
//查询操作记录记录（装卸车）
RecordTyreInstall recordTyreInstall = new RecordTyreInstall();
recordTyreInstall.setTyreRfid(tyreRfid);
List<RecordTyreInstall> recordTyreInstallList = recordTyreInstallMapper.selectRecordTyreInstallList(recordTyreInstall);
map.put("recordTyreInstallList",recordTyreInstallList);
return map;
}
}
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java
Unescape Escape View File

@ -179,8 +179,6 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService
}
return AjaxResult.error("卸胎失败！");
}
public static long calculateMileageDifference(long endMileage, long startMileage) {
return Math.abs(endMileage - startMileage);
}

34
ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
Unescape Escape View File

@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="tyreModel" column="tyre_model" />
<result property="tyreLevel" column="tyre_level" />
<result property="tyrePattern" column="tyre_pattern" />
<result property="pressure" column="pressure" />
<result property="tyreType" column="tyre_type" />
<result property="team" column="team" />
<result property="deptName" column="dept_name" />
@ -142,39 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</where>
</select>
<select id="selectBaseTyreByKeyParam" resultMap="BaseTyreResult" parameterType="BaseTyre">
SELECT
tyre_id,
tyre_no,
self_no,
tyre_epc,
tyre_brand,
tyre_model,
tyre_level,
tyre_pattern,
pattern_depth,
tyre_type,
sdss.dept_name as company,
d.team,
sd.dept_name as carTeam,
su.user_name AS create_by,
d.create_time,
d.update_by,
d.update_time,
d.remark,
d.car_no,
wheel_postion,
d.pressure
FROM
base_tyre d
LEFT JOIN sys_user su ON su.login_name = d.create_by
LEFT JOIN base_car bc ON bc.car_no = d.car_no
LEFT JOIN sys_dept sd ON bc.dept_id = sd.dept_id
LEFT JOIN sys_dept sds ON sd.parent_id = sds.dept_id
LEFT JOIN sys_dept sdss ON sds.parent_id = sdss.dept_id
where tyre_id is not null
<if test="keyParam != null and keyParam != ''">and d.tyre_epc = #{keyParam} OR d.tyre_no = #{keyParam} OR d.self_no = #{keyParam}</if>
</select>
<insert id="insertBaseTyre" parameterType="BaseTyre">

1
ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml
Unescape Escape View File

@ -111,7 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_user su ON su.login_name = bmo.create_by
LEFT JOIN sys_user sus ON sus.login_name = bmo.update_by
LEFT JOIN base_car bc ON bc.id = bmo.vehicle_id
where order_id = #{orderId}
</select>
<select id="selectBizMaintenanceOrderTD" resultMap="BizMaintenanceOrderResult">

21
ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml
Unescape Escape View File

@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="positionName" column="position_name" />
</resultMap>
<sql id="selectBizOrderTireDetailVo">
@ -26,19 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectBizOrderTireDetailList" parameterType="BizOrderTireDetail" resultMap="BizOrderTireDetailResult">
select botd.detail_id, botd.order_id, botd.position_id, botd.tire_id, botd.tire_code, botd.tread_depth,
botd.tire_press, botd.tire_status, botd.create_by, botd.create_time, botd.update_by, botd.update_time, botd.remark,
sda.dict_label as position_name
from biz_order_tire_detail botd
LEFT JOIN sys_dict_data sda ON sda.dict_value = botd.position_id
<include refid="selectBizOrderTireDetailVo"/>
<where>
<if test="orderId != null "> and botd.order_id = #{orderId}</if>
<if test="positionId != null "> and botd.position_id = #{positionId}</if>
<if test="tireId != null "> and botd.tire_id = #{tireId}</if>
<if test="tireCode != null and tireCode != ''"> and botd.tire_code = #{tireCode}</if>
<if test="treadDepth != null "> and botd.tread_depth = #{treadDepth}</if>
<if test="tirePress != null "> and botd.tire_press = #{tirePress}</if>
<if test="tireStatus != null and tireStatus != ''"> and botd.tire_status = #{tireStatus}</if>
<if test="orderId != null "> and order_id = #{orderId}</if>
<if test="positionId != null "> and position_id = #{positionId}</if>
<if test="tireId != null "> and tire_id = #{tireId}</if>
<if test="tireCode != null and tireCode != ''"> and tire_code = #{tireCode}</if>
<if test="treadDepth != null "> and tread_depth = #{treadDepth}</if>
<if test="tirePress != null "> and tire_press = #{tirePress}</if>
<if test="tireStatus != null and tireStatus != ''"> and tire_status = #{tireStatus}</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save