*

L

15 小时以前 9d7bfe8cf15f1b34a87351560f39662d9e141cce

*

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -70,6 +70,10 @@
            Integer wrkNo = null;
            String taskNo = null;
            Integer status = null;
            String barcode = null;
            String startPoint = null;
            String targetPoint = null;
            String allField = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -86,6 +90,14 @@
                    taskNo = val;
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                } else if (entry.getKey().equals("barcode")) {
                    barcode = val;
                } else if (entry.getKey().equals("startPoint")) {
                    startPoint = val;
                } else if (entry.getKey().equals("targetPoint")) {
                    targetPoint = val;
                } else if (entry.getKey().equals("allField")) {
                    allField = val;
                }
            }
//
@@ -94,9 +106,9 @@
//            convert(param, wrapper);
//            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

            List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
            page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
            return R.ok(page);
//        return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));


 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java

@@ -40,6 +40,10 @@
            Integer wrkNo = null;
            String taskNo = null;
            Integer status = null;
            String barcode = null;
            String startPoint = null;
            String targetPoint = null;
            String allField = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -56,15 +60,23 @@
                    taskNo = val;
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                } else if (entry.getKey().equals("barcode")) {
                    barcode = val;
                } else if (entry.getKey().equals("startPoint")) {
                    startPoint = val;
                } else if (entry.getKey().equals("targetPoint")) {
                    targetPoint = val;
                } else if (entry.getKey().equals("allField")) {
                    allField = val;
                }
            }
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
            if (page.getRecords().size()==0){
                taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit);
                taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, 1, limit);
                page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
            }
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {

 src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java

@@ -16,6 +16,10 @@
    List<TaskWrkLog> selectTaskWrkLogList(@Param("wrkNo") Integer wrkNo,
                                       @Param("taskNo") String taskNo,
                                       @Param("status") Integer status,
                                        @Param("barcode") String barcode,
                                        @Param("startPoint") String startPoint,
                                        @Param("targetPoint") String targetPoint,
                                        @Param("allField") String allField,
                                       @Param("modiTimeStart") Date modiTimeStart,
                                       @Param("modiTimeEnd") Date modiTimeEnd,
                                       @Param("pageNumber") Integer curr,
@@ -24,6 +28,10 @@
    Long selectTaskWrkLogListTotal(@Param("wrkNo") Integer wrkNo,
                                @Param("taskNo") String taskNo,
                                @Param("status") Integer status,
                                   @Param("barcode") String barcode,
                                   @Param("startPoint") String startPoint,
                                   @Param("targetPoint") String targetPoint,
                                   @Param("allField") String allField,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);
}

 src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java

@@ -52,6 +52,10 @@
    List<TaskWrk> selectTaskWrkList(@Param("wrkNo") Integer wrkNo,
                                    @Param("taskNo") String taskNo,
                                    @Param("status") Integer status,
                                    @Param("barcode") String barcode,
                                    @Param("startPoint") String startPoint,
                                    @Param("targetPoint") String targetPoint,
                                    @Param("allField") String allField,
                                    @Param("modiTimeStart") Date modiTimeStart,
                                    @Param("modiTimeEnd") Date modiTimeEnd,
                                    @Param("pageNumber") Integer curr,
@@ -60,6 +64,10 @@
    Long selectTaskWrkListTotal(@Param("wrkNo") Integer wrkNo,
                                @Param("taskNo") String taskNo,
                                @Param("status") Integer status,
                                @Param("barcode") String barcode,
                                @Param("startPoint") String startPoint,
                                @Param("targetPoint") String targetPoint,
                                @Param("allField") String allField,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);


 src/main/java/com/zy/asrs/service/TaskWrkLogService.java

@@ -7,7 +7,7 @@
import java.util.List;

public interface TaskWrkLogService extends IService<TaskWrkLog> {
    List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd);
    List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd);

}

 src/main/java/com/zy/asrs/service/TaskWrkService.java

@@ -32,7 +32,7 @@
    int saveToHistory(String taskNo);//将任务转历史日志
    int saveToHistoryD(String taskNo);//将任务转历史日志

    List<TaskWrk> selectTaskWrkList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd);
    List<TaskWrk> selectTaskWrkList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd);

}

 src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java

@@ -12,12 +12,12 @@
@Service("taskWrkLogService")
public class TaskWrkLogServiceImpl extends ServiceImpl<TaskWrkLogMapper, TaskWrkLog> implements TaskWrkLogService {
    @Override
    public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectTaskWrkLogList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
    public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectTaskWrkLogList(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd,curr,limit);
    }

    @Override
    public Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
        return this.baseMapper.selectTaskWrkLogListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
    public Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd) {
        return this.baseMapper.selectTaskWrkLogListTotal(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd);
    }
}

 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java

@@ -257,13 +257,13 @@


    @Override
    public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
    public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd,curr,limit);
    }

    @Override
    public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
        return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
    public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd) {
        return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd);
    }



 src/main/resources/mapper/TaskWrkLogMapper.xml

@@ -36,11 +36,30 @@
        <if test="status != null">
            and STATUS = #{status}
        </if>
        <if test="barcode != null">
            and BARCODE = #{barcode}
        </if>
        <if test="startPoint != null">
            and START_POINT = #{startPoint}
        </if>
        <if test="targetPoint != null">
            and TARGET_POINT = #{targetPoint}
        </if>
        <if test="modiTimeStart != null ">
            <if test="modiTimeEnd != null ">
                and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
            </if>
        </if>
        <if test="allField != null and allField != ''">
            <bind name="searchPattern" value="'%' + allField + '%'" />
            and (
            WRK_NO LIKE #{searchPattern}
            or TASK_NO LIKE #{searchPattern}
            or BARCODE LIKE #{searchPattern}
            or START_POINT LIKE #{searchPattern}
            or TARGET_POINT LIKE #{searchPattern}
            )
        </if>
    </sql>



 src/main/resources/mapper/TaskWrkMapper.xml

@@ -201,11 +201,38 @@
        <if test="status != null">
            and STATUS = #{status}
        </if>
        <if test="barcode != null">
            and BARCODE = #{barcode}
        </if>
        <if test="startPoint != null">
            and (
            START_POINT = #{startPoint}
            or ORIGIN_START_POINT = #{startPoint}
            )
        </if>
        <if test="targetPoint != null">
            and (
            TARGET_POINT = #{targetPoint}
            or ORIGIN_TARGET_POINT = #{targetPoint}
            )
        </if>
        <if test="modiTimeStart != null ">
            <if test="modiTimeEnd != null ">
                and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
            </if>
        </if>
        <if test="allField != null and allField != ''">
            <bind name="searchPattern" value="'%' + allField + '%'" />
            and (
            WRK_NO LIKE #{searchPattern}
            or TASK_NO LIKE #{searchPattern}
            or BARCODE LIKE #{searchPattern}
            or START_POINT LIKE #{searchPattern}
            or TARGET_POINT LIKE #{searchPattern}
            or ORIGIN_START_POINT LIKE #{searchPattern}
            or ORIGIN_TARGET_POINT LIKE #{searchPattern}
            )
        </if>
    </sql>



 src/main/webapp/views/taskWrk/taskWrk.html

@@ -21,6 +21,18 @@
                    <el-input v-model="tableSearchParam.task_no" placeholder="任务号"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.barcode" placeholder="条码"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.startPoint" placeholder="起点"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.targetPoint" placeholder="终点"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-select v-model="tableSearchParam.status" placeholder="任务状态">
                        <el-option label="接收" value="1"></el-option>
                        <el-option label="派发" value="2"></el-option>
@@ -29,7 +41,7 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input>
                    <el-input v-model="tableSearchParam.allField" placeholder="请输入"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-date-picker
@@ -163,6 +175,10 @@
                task_no: null,
                status: null,
                wrk_no: null,
                barcode: null,
                startPoint: null,
                targetPoint: null,
                allField: null,
                datetime: null,
            },
            taskWrkFormVisible: false,

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -26,6 +26,15 @@
                    <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.barcode" placeholder="条码"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.startPoint" placeholder="起点"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.targetPoint" placeholder="终点"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-select v-model="tableSearchParam.status" placeholder="任务状态">
                        <el-option label="接收" value="1"></el-option>
                        <el-option label="派发" value="2"></el-option>
@@ -34,6 +43,9 @@
                        <el-option label="手动完结" value="7"></el-option>
                        <el-option label="出库到输送线" value="9"></el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="">
                    <el-input v-model="tableSearchParam.allField" placeholder="请输入"></el-input>
                </el-form-item>
                <el-form-item label="">
                    <el-date-picker
@@ -188,6 +200,10 @@
                task_no: null,
                status: null,
                wrk_no: null,
                barcode: null,
                startPoint: null,
                targetPoint: null,
                allField: null,
                datetime: null
            },
            taskWrkFormVisible: false,