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

app-退料接收

This commit is contained in:
bns_han 2023-12-24 12:15:31 +08:00
parent 7e2564fe06
commit ca7bc2e5a5
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,19 +21,14 @@ import java.util.List;
/** /**
* 退料接收 * 退料接收
* @author bns_han
*/ */
@RestController @RestController
@RequestMapping("/backReceive") @RequestMapping("/backReceive")
public class BackReceiveController extends BaseController { public class BackReceiveController extends BaseController {
@Resource @Resource
private BackReceiveService backReceiveService; // 任务表Service private BackReceiveService backReceiveService;
/**
* 服务对象
*/
@Resource
private TmTaskService tmTaskService; // 任务表Service
/** /**
* 退料接收列表 * 退料接收列表

12
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -603,7 +603,7 @@
mt.type_id as typeId, mt.type_id as typeId,
mt.type_name typeCode, mt.type_name typeCode,
mt2.type_name AS typeName, mt2.type_name AS typeName,
bad.audit_num as num, IFNULL(bad.audit_num,0)-(IFNULL(aa.back_num,0)) as num,
mt.manage_type as manageType mt.manage_type as manageType
FROM FROM
back_apply_details bad back_apply_details bad
@ -612,6 +612,16 @@
LEFT JOIN ma_type mt on mt.type_id=bad.type_id LEFT JOIN ma_type mt on mt.type_id=bad.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
LEFT JOIN (
SELECT
type_id as typeId,
SUM(IFNULL(back_num,0)) as back_num
FROM
back_check_details
WHERE
parent_id=#{id}
GROUP BY type_id
) aa on aa.typeId=bad.type_id
WHERE WHERE
bai.id=#{id} bai.id=#{id}
</select> </select>