bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重庆测试问题修改

This commit is contained in:
csyue 2024-06-14 13:42:46 +08:00
parent 4ec79b9c1e
commit e5c4ad8c55
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -249,6 +249,17 @@ public class BackReceiveController extends BaseController {
}
}
@Log(title = "编码接收机具查询-App", businessType = BusinessType.INSERT)
@GetMapping("getBackMachineApp")
public AjaxResult getBackMachineApp(TmTask task) {
try {
List<TmTask> list = backReceiveService.getBackMachine(task);
return AjaxResult.success(list);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Log(title = "查询退料接收记录-web", businessType = BusinessType.INSERT)
@GetMapping("getRecord")
public AjaxResult getRecord(TmTask task) {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -86,7 +86,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//插入back_check_details
res = insertBcd(record);
if (res == 0) {
throw new RuntimeException("插入back_check_details异常");
throw new RuntimeException("保存失败，请确认是否填写数量");
}
} catch (Exception e) {
throw new RuntimeException(e.getMessage());

5
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
View File

@ -409,7 +409,10 @@
LEFT JOIN sys_user us on us.user_id=bai.create_by
LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
WHERE tt.create_by = #{createBy}
WHERE 1=1
<if test="createBy != 1 ">
and tt.create_by = #{createBy}
</if>
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
ORDER BY bai.create_time desc
</select>

2
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -332,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getListByParentId" resultMap="MaTypeResult">
select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
m.lease_price,m.rent_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,