diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 401050c0..6e7bcaba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -180,7 +180,7 @@ public class WorkSiteDirectManageController extends BaseController { backApplyInfo.setCode(tcode); //创建退料任务(tm_task) backApplyInfo.setTaskType(36); - backApplyInfo.setTaskStatus("37"); + backApplyInfo.setTaskStatus("40"); int res5 = workSiteDirectManageService.insertTmTaskByBackInfo(backApplyInfo); if (res5 == 0) { return AjaxResult.error("退料任务新建失败"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java index 3e431154..61ec39ab 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java @@ -23,7 +23,6 @@ public interface BackRecordMapper { */ List getBackRecordList(BackRecord bean); - int insertBcd(BackApplyInfo backApplyInfo); int insertCheckDetails(BackApplyInfo backApplyInfo); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml index 372bd129..1b45bd86 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -3,9 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - insert into back_check_details ( diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 2679398a..ee2be062 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -390,6 +390,27 @@ LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id + WHERE + 1=1 + + and (bpl.lot_name like concat('%', #{keyWord}, '%') or + bui.unit_name like concat('%', #{keyWord}, '%')) + + + and bpl.lot_id = #{record.lotId} + + + and bui.unitId = #{record.unitId} + + + and dai.back_man like concat('%', #{backMan}, '%') + + + and dai.back_phone like concat('%', #{backPhone}, '%') + + + and dai.status = #{status} +