代码修改---暂存

src/main/java/com/wms/entity/table/Goods.java

@@ -60,69 +60,69 @@ public class Goods {
     /**
      * 拆包方式
      */
-    @TableField("")
+    @TableField("unpacking_type")
     private String unpackingType;
     /**
      * 载具类型
      */
-    @TableField("")
+    @TableField("vehicle_type")
     private String vehicleType;
     /**
      * 载具类型描述
      */
-    @TableField("")
+    @TableField("vehicle_type_description")
     private String vehicleTypeDescription;
     /**
      * 物料载具类型
      */
-    @TableField("")
+    @TableField("goods_in_vehicle_type")
     private String goodsInVehicleType;
     /**
      * 补料方式
      * PULL：有看板
      * PUSH：无看板
      */
-    @TableField("")
+    @TableField("feeding_type")
     private String feedingType;
     /**
      * 每个看板包含物料数量
      */
-    @TableField("")
+    @TableField("quantity_per_kanban")
     private BigDecimal quantityPerKanban;
     /**
      * 看板的数量
      */
-    @TableField("")
+    @TableField("kanban_num")
     private Integer kanbanNum;
     /**
      * 看板详细信息
      */
-    @TableField(value = "goods_related", typeHandler = Fastjson2TypeHandler.class)
+    @TableField(value = "kanban_list", typeHandler = Fastjson2TypeHandler.class)
     private List<KanbanEntity> kanbanList;
     /**
      * 补货点
      */
-    @TableField("")
+    @TableField("feeding_value")
     private BigDecimal feedingValue;
     /**
      * 备注1
      */
-    @TableField("")
+    @TableField("remark1")
     private String remark1;
     /**
      * 备注2
      */
-    @TableField("")
+    @TableField("remark2")
     private String remark2;
     /**
      * 备注3
      */
-    @TableField("")
+    @TableField("remark3")
     private String remark3;
     /**
      * 数据来源
      */
-    @TableField("")
+    @TableField("data_source")
     private String dataSource;
     /**
      * 最后更新日期

src/main/java/com/wms/entity/table/WorkStationConfig.java

@@ -24,7 +24,7 @@ public class WorkStationConfig {
     @TableField("work_station")
     private String workStation;
     /**
-     * 小盒子
+     * 小盒子---对面工单表里面的工位
      */
     @TableField("small_box")
     private String smallBox;

src/main/java/com/wms/mapper/ELocationConfigMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.ELocationConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ELocationConfigMapper extends BaseMapper<ELocationConfig> {
+}

src/main/java/com/wms/mapper/ETagLocationMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.ETagLocation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ETagLocationMapper extends BaseMapper<ETagLocation> {
+}

src/main/java/com/wms/mapper/GoodsToStationMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.GoodsToStation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface GoodsToStationMapper extends BaseMapper<GoodsToStation> {
+}

src/main/java/com/wms/mapper/KateDBSHistoryMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateDBSHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KateDBSHistoryMapper extends BaseMapper<KateDBSHistory> {
+}

src/main/java/com/wms/mapper/KateDBSLastMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateDBSLast;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KateDBSLastMapper extends BaseMapper<KateDBSLast> {
+}

src/main/java/com/wms/mapper/KateDBSMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateDBS;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KateDBSMapper extends BaseMapper<KateDBS> {
+}

src/main/java/com/wms/mapper/KateOrdersHistoryMapper.java

@@ -0,0 +1,12 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateOrdersHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 卡特订单
+ */
+@Mapper
+public interface KateOrdersHistoryMapper extends BaseMapper<KateOrdersHistory> {
+}

src/main/java/com/wms/mapper/KateOrdersLastMapper.java

@@ -0,0 +1,11 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateOrdersLast;
+
+/**
+ * 上一次导入的工单
+ */
+public interface KateOrdersLastMapper extends BaseMapper<KateOrdersLast> {
+
+}

src/main/java/com/wms/mapper/KateOrdersMapper.java

@@ -0,0 +1,9 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.KateOrders;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KateOrdersMapper extends BaseMapper<KateOrders> {
+}

src/main/java/com/wms/mapper/OutsideVehiclesMapper.java

@@ -0,0 +1,13 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.OutsideVehicles;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 库外载具
+ */
+@Mapper
+public interface OutsideVehiclesMapper extends BaseMapper<OutsideVehicles> {
+
+}

src/main/java/com/wms/mapper/PickTaskMapper.java

@@ -0,0 +1,13 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.PickTask;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 拣选任务mapper
+ */
+@Mapper
+public interface PickTaskMapper extends BaseMapper<PickTask> {
+
+}

src/main/java/com/wms/mapper/PickTaskRecordMapper.java

@@ -0,0 +1,12 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.PickTaskRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 拣货任务记录mapper
+ */
+@Mapper
+public interface PickTaskRecordMapper extends BaseMapper<PickTaskRecord> {
+}

src/main/java/com/wms/mapper/VehicleMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wms.entity.table.Vehicle;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 载具mapper
+ */
 @Mapper
 public interface VehicleMapper extends BaseMapper<Vehicle> {
 

src/main/java/com/wms/mapper/WorkFlowMapper.java

@@ -0,0 +1,13 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.WorkFlow;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工作流mapper
+ */
+@Mapper
+public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
+
+}

src/main/java/com/wms/mapper/WorkStationConfigMapper.java

@@ -0,0 +1,13 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.WorkStationConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工站配置mapper
+ */
+@Mapper
+public interface WorkStationConfigMapper extends BaseMapper<WorkStationConfig> {
+
+}

src/main/java/com/wms/mapper/WorkSummaryMapper.java

@@ -0,0 +1,13 @@
+package com.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms.entity.table.WorkSummary;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工作总结mapper
+ */
+@Mapper
+public interface WorkSummaryMapper extends BaseMapper<WorkSummary> {
+
+}

src/main/java/com/wms/service/ELocationConfigService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.ELocationConfig;
+
+/**
+ * 电子标签库位配置服务接口
+ */
+public interface ELocationConfigService extends IService<ELocationConfig> {
+}

src/main/java/com/wms/service/ETagLocationService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.ETagLocation;
+
+/**
+ * 电子标签服务接口
+ */
+public interface ETagLocationService extends IService<ETagLocation> {
+}

src/main/java/com/wms/service/GoodsToStationService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.GoodsToStation;
+
+/**
+ * 站台要料服务接口
+ */
+public interface GoodsToStationService extends IService<GoodsToStation> {
+}

src/main/java/com/wms/service/KateDBSHistoryService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateDBSHistory;
+
+/**
+ * 卡特DBS历史记录服务接口
+ */
+public interface KateDBSHistoryService extends IService<KateDBSHistory> {
+}

src/main/java/com/wms/service/KateDBSLastService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateDBSLast;
+
+/**
+ * 上一次导入的卡特DBS服务接口
+ */
+public interface KateDBSLastService extends IService<KateDBSLast> {
+}

src/main/java/com/wms/service/KateDBSService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateDBS;
+
+/**
+ * 卡特DBS服务接口
+ */
+public interface KateDBSService extends IService<KateDBS> {
+}

src/main/java/com/wms/service/KateOrdersHistoryService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateOrdersHistory;
+
+/**
+ * 卡特工单历史记录服务接口
+ */
+public interface KateOrdersHistoryService extends IService<KateOrdersHistory> {
+}

src/main/java/com/wms/service/KateOrdersLastService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateOrdersLast;
+
+/**
+ * 上次导入的卡特工单服务接口
+ */
+public interface KateOrdersLastService extends IService<KateOrdersLast> {
+}

src/main/java/com/wms/service/KateOrdersService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.KateOrders;
+
+/**
+ * 卡特工单服务接口
+ */
+public interface KateOrdersService extends IService<KateOrders> {
+}

src/main/java/com/wms/service/OutsideVehiclesService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.OutsideVehicles;
+
+/**
+ * 流转中的载具物料服务接口
+ */
+public interface OutsideVehiclesService extends IService<OutsideVehicles> {
+}

src/main/java/com/wms/service/PickTaskRecordService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.PickTaskRecord;
+
+/**
+ * 拣货任务记录服务接口
+ */
+public interface PickTaskRecordService extends IService<PickTaskRecord> {
+}

src/main/java/com/wms/service/PickTaskService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.PickTask;
+
+/**
+ * 拣货任务服务接口
+ */
+public interface PickTaskService extends IService<PickTask> {
+}

src/main/java/com/wms/service/WorkFlowService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.WorkFlow;
+
+/**
+ * 工作流服务接口
+ */
+public interface WorkFlowService extends IService<WorkFlow> {
+}

src/main/java/com/wms/service/WorkStationConfigService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.WorkStationConfig;
+
+/**
+ * 工站配置服务接口
+ */
+public interface WorkStationConfigService extends IService<WorkStationConfig> {
+}

src/main/java/com/wms/service/WorkSummaryService.java

@@ -0,0 +1,10 @@
+package com.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms.entity.table.WorkSummary;
+
+/**
+ * 工作总结服务接口
+ */
+public interface WorkSummaryService extends IService<WorkSummary> {
+}

src/main/java/com/wms/service/business/IWorkService.java

@@ -0,0 +1,24 @@
+package com.wms.service.business;
+
+/**
+ * 工作服务接口
+ */
+public interface IWorkService {
+    /**
+     * 创建工作
+     * @param workStation 工作站台
+     */
+    void createWork(String workStation);
+
+    /**
+     * 执行工作
+     * @param workStation 工作站台
+     */
+    void doWork(String workStation);
+
+    /**
+     * 完成工作
+     * @param workStation 工作站台
+     */
+    void finishWork(String workStation);
+}

src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java

@@ -0,0 +1,65 @@
+package com.wms.service.business.serviceImplements;
+
+import com.wms.entity.table.WorkStationConfig;
+import com.wms.service.WorkFlowService;
+import com.wms.service.WorkStationConfigService;
+import com.wms.service.business.IWorkService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 工作服务接口的实现
+ */
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class WorkServiceImplements implements IWorkService {
+    private final WorkStationConfigService workStationConfigService;// 工作站配置服务
+    private final WorkFlowService workFlowService;// 工作流服务
+    @Override
+    public void createWork(String workStation) {
+        // 当前站台分配的工位
+        List<WorkStationConfig> currentStationWorkConfigs = new ArrayList<>();
+        // 先找NWL机型
+        findNwl(workStation, currentStationWorkConfigs);
+        if (currentStationWorkConfigs.isEmpty()) {
+            // 找非NWL机型
+            findNotNwl(workStation, currentStationWorkConfigs);
+        }
+        // 然后判断是否还是为空
+        if (currentStationWorkConfigs.isEmpty()) {
+            return;
+        }
+    }
+
+    @Override
+    public void doWork(String workStation) {
+
+    }
+
+    @Override
+    public void finishWork(String workStation) {
+
+    }
+
+    /**
+     * 先找到MWL的小工位的配置
+     * @param workStation 工站
+     * @param workConfigs 工位配置
+     */
+    private void findNwl(String workStation, List<WorkStationConfig> workConfigs) {
+        workConfigs.add(new WorkStationConfig());
+    }
+
+    /**
+     * 先找到非MWL的小工位的配置
+     * @param workStation 工站
+     * @param workConfigs 工位配置
+     */
+    private void findNotNwl(String workStation, List<WorkStationConfig> workConfigs) {
+        workConfigs.add(new WorkStationConfig());
+    }
+}

src/main/java/com/wms/service/serviceImplements/ELocationConfigServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.ELocationConfig;
+import com.wms.mapper.ELocationConfigMapper;
+import com.wms.service.ELocationConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电子标签库位配置服务实现
+ */
+@Service
+public class ELocationConfigServiceImpl extends ServiceImpl<ELocationConfigMapper, ELocationConfig> implements ELocationConfigService {
+}

src/main/java/com/wms/service/serviceImplements/ETagLocationServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.ETagLocation;
+import com.wms.mapper.ETagLocationMapper;
+import com.wms.service.ETagLocationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电子标签服务实现
+ */
+@Service
+public class ETagLocationServiceImpl extends ServiceImpl<ETagLocationMapper, ETagLocation> implements ETagLocationService {
+}

src/main/java/com/wms/service/serviceImplements/GoodsToStationServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.GoodsToStation;
+import com.wms.mapper.GoodsToStationMapper;
+import com.wms.service.GoodsToStationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 站台要料服务实现
+ */
+@Service
+public class GoodsToStationServiceImpl extends ServiceImpl<GoodsToStationMapper, GoodsToStation> implements GoodsToStationService {
+}

src/main/java/com/wms/service/serviceImplements/KateDBSHistoryServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateDBSHistory;
+import com.wms.mapper.KateDBSHistoryMapper;
+import com.wms.service.KateDBSHistoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 卡特DBS历史记录服务实现
+ */
+@Service
+public class KateDBSHistoryServiceImpl extends ServiceImpl<KateDBSHistoryMapper, KateDBSHistory> implements KateDBSHistoryService {
+}

src/main/java/com/wms/service/serviceImplements/KateDBSLastServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateDBSLast;
+import com.wms.mapper.KateDBSLastMapper;
+import com.wms.service.KateDBSLastService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 上一次卡特DBS服务接口
+ */
+@Service
+public class KateDBSLastServiceImpl extends ServiceImpl<KateDBSLastMapper, KateDBSLast> implements KateDBSLastService {
+}

src/main/java/com/wms/service/serviceImplements/KateDBSServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateDBS;
+import com.wms.mapper.KateDBSMapper;
+import com.wms.service.KateDBSService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 卡特DBS服务实现
+ */
+@Service
+public class KateDBSServiceImpl extends ServiceImpl<KateDBSMapper, KateDBS> implements KateDBSService {
+}

src/main/java/com/wms/service/serviceImplements/KateOrdersHistoryServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateOrdersHistory;
+import com.wms.mapper.KateOrdersHistoryMapper;
+import com.wms.service.KateOrdersHistoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 卡特历史工单服务实现
+ */
+@Service
+public class KateOrdersHistoryServiceImpl extends ServiceImpl<KateOrdersHistoryMapper, KateOrdersHistory> implements KateOrdersHistoryService {
+}

src/main/java/com/wms/service/serviceImplements/KateOrdersLastServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateOrdersLast;
+import com.wms.mapper.KateOrdersLastMapper;
+import com.wms.service.KateOrdersLastService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 上一次导入的卡特工单服务实现
+ */
+@Service
+public class KateOrdersLastServiceImpl extends ServiceImpl<KateOrdersLastMapper, KateOrdersLast> implements KateOrdersLastService {
+}

src/main/java/com/wms/service/serviceImplements/KateOrdersServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.KateOrders;
+import com.wms.mapper.KateOrdersMapper;
+import com.wms.service.KateOrdersService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 卡特工单服务实现
+ */
+@Service
+public class KateOrdersServiceImpl extends ServiceImpl<KateOrdersMapper, KateOrders> implements KateOrdersService {
+}

src/main/java/com/wms/service/serviceImplements/OutsideVehiclesServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.OutsideVehicles;
+import com.wms.mapper.OutsideVehiclesMapper;
+import com.wms.service.OutsideVehiclesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流转中的载具物料服务实现
+ */
+@Service
+public class OutsideVehiclesServiceImpl extends ServiceImpl<OutsideVehiclesMapper, OutsideVehicles> implements OutsideVehiclesService {
+}

src/main/java/com/wms/service/serviceImplements/PickTaskRecordServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.PickTaskRecord;
+import com.wms.mapper.PickTaskRecordMapper;
+import com.wms.service.PickTaskRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 拣货任务记录服务实现
+ */
+@Service
+public class PickTaskRecordServiceImpl extends ServiceImpl<PickTaskRecordMapper, PickTaskRecord> implements PickTaskRecordService {
+}

src/main/java/com/wms/service/serviceImplements/PickTaskServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.PickTask;
+import com.wms.mapper.PickTaskMapper;
+import com.wms.service.PickTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 拣货任务服务实现类
+ */
+@Service
+public class PickTaskServiceImpl extends ServiceImpl<PickTaskMapper, PickTask> implements PickTaskService {
+}

src/main/java/com/wms/service/serviceImplements/WorkFlowServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.WorkFlow;
+import com.wms.mapper.WorkFlowMapper;
+import com.wms.service.WorkFlowService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工作流服务实现
+ */
+@Service
+public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> implements WorkFlowService {
+}

src/main/java/com/wms/service/serviceImplements/WorkStationConfigServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.WorkStationConfig;
+import com.wms.mapper.WorkStationConfigMapper;
+import com.wms.service.WorkStationConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工站配置服务实现类
+ */
+@Service
+public class WorkStationConfigServiceImpl extends ServiceImpl<WorkStationConfigMapper, WorkStationConfig> implements WorkStationConfigService {
+}

src/main/java/com/wms/service/serviceImplements/WorkSummaryServiceImpl.java

@@ -0,0 +1,14 @@
+package com.wms.service.serviceImplements;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms.entity.table.WorkSummary;
+import com.wms.mapper.WorkSummaryMapper;
+import com.wms.service.WorkSummaryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工作总结服务实现
+ */
+@Service
+public class WorkSummaryServiceImpl extends ServiceImpl<WorkSummaryMapper, WorkSummary> implements WorkSummaryService {
+}

src/main/resources/mapper/ConfigMapper.xml

@@ -2,25 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.ConfigMapper">
-    <resultMap type="Config" id="ConfigMap">
-        <result property="configId" column="config_id"/>
-        <result property="configKey" column="config_key"/>
-        <result property="configValue" column="config_value"/>
-        <result property="configType" column="config_type"/>
-        <result property="configName" column="config_name"/>
-    </resultMap>
-    <select id="selectConfigs" parameterType="String" resultMap="ConfigMap">
-        select config_id, config_key, config_value, config_type, config_name
-        from tbl_sys_config
-        <where>
-            <if test="configKey != null and configKey != ''"> and config_key = #{configKey}</if>
-        </where>
-        order by config_id
-    </select>
 
-    <update id="updateConfig" parameterType="Config">
-        update tbl_sys_config
-        set config_value = #{configValue}
-        where config_id = #{configId}
-    </update>
 </mapper>

src/main/resources/mapper/ELocationConfigMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.ELocationConfigMapper">
+
+</mapper>

src/main/resources/mapper/ETagLocationMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.ETagLocationMapper">
+
+</mapper>

src/main/resources/mapper/GoodsMapper.xml

@@ -2,97 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.GoodsMapper">
-    <resultMap type="Goods" id="GoodsMap">
-        <result property="goodsId" column="goods_id"/>
-        <result property="goodsName" column="goods_name"/>
-        <result property="goodsUnit" column="goods_unit"/>
-        <result property="itemId" column="item_id"/>
-        <result property="itemType" column="item_type"/>
-        <result property="invCategory" column="inv_category"/>
-        <result property="lifeDays" column="life_days"/>
-        <result property="organizationId" column="organization_id"/>
-        <result property="organizationCode" column="organization_code"/>
-        <result property="lastUpdateTime" column="last_update_time"/>
-        <result property="lastUpdateUser" column="last_update_user"/>
-    </resultMap>
 
-    <sql id="selectAll">
-        select goods_id, goods_name, goods_unit, item_id, item_type, inv_category, life_days, organization_id,
-               organization_code, last_update_time, last_update_user
-        from tbl_app_goods
-    </sql>
-
-    <select id="selGoods" parameterType="Goods" resultMap="GoodsMap">
-        <include refid="selectAll"/>
-        <where>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-            <if test="goodsName != null and goodsName != ''"> and goods_name = #{goodsName}</if>
-            <if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
-            <if test="itemId != null and itemId != ''"> and item_id = #{itemId}</if>
-            <if test="itemType != null and goodsId != ''"> and item_type = #{itemType}</if>
-            <if test="invCategory != null and invCategory != ''"> and inv_category = #{invCategory}</if>
-            <if test="lifeDays != null"> and life_days = #{lifeDays}</if>
-            <if test="organizationId != null and organizationId != ''"> and organization_id = #{organizationId}</if>
-            <if test="organizationCode != null and organizationCode != ''"> and organization_code = #{organizationCode}</if>
-            <if test="lastUpdateTime != null"> and last_update_time = #{lastUpdateTime}</if>
-            <if test="lastUpdateUser != null and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
-        </where>
-        order by last_update_time desc
-    </select>
-
-    <select id="selGoodsByGoodsId" parameterType="String" resultMap="GoodsMap">
-        <include refid="selectAll"/>
-        where goods_id = #{goodsId};
-    </select>
-
-    <insert id="addGoods" parameterType="Goods">
-        insert into tbl_app_goods
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="goodsId != null">goods_id,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="goodsUnit != null">goods_unit,</if>
-            <if test="itemId != null">item_id,</if>
-            <if test="itemType != null">item_type,</if>
-            <if test="invCategory != null">inv_category,</if>
-            <if test="lifeDays != null">life_days,</if>
-            <if test="organizationId != null">organization_id,</if>
-            <if test="organizationCode != null">organization_code,</if>
-            <if test="lastUpdateTime != null">last_update_time,</if>
-            <if test="lastUpdateUser != null">last_update_user,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="goodsUnit != null">#{goodsUnit},</if>
-            <if test="itemId != null">#{itemId},</if>
-            <if test="itemType != null">#{itemType},</if>
-            <if test="invCategory != null">#{invCategory},</if>
-            <if test="lifeDays != null">#{lifeDays},</if>
-            <if test="organizationId != null">#{organizationId},</if>
-            <if test="organizationCode != null">#{organizationCode},</if>
-            <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
-            <if test="lastUpdateUser != null">#{lastUpdateUser},</if>
-        </trim>
-    </insert>
-
-    <update id="modifyGoods" parameterType="Goods">
-        update tbl_app_goods
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
-            <if test="itemId != null">item_id = #{itemId},</if>
-            <if test="itemType != null">item_type = #{itemType},</if>
-            <if test="invCategory != null">inv_category = #{invCategory},</if>
-            <if test="lifeDays != null">life_days = #{lifeDays},</if>
-            <if test="organizationId != null">organization_id = #{organizationId},</if>
-            <if test="organizationCode != null">organization_code = #{organizationCode},</if>
-            <if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
-            <if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
-        </trim>
-        where goods_id = #{goodsId}
-    </update>
-
-    <delete id="deleteGoods" parameterType="String">
-        delete from tbl_app_goods where goods_id = #{goodsId}
-    </delete>
 </mapper>

src/main/resources/mapper/GoodsToStationMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.GoodsToStationMapper">
+
+</mapper>

src/main/resources/mapper/KateDBSHistoryMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateDBSHistoryMapper">
+
+</mapper>

src/main/resources/mapper/KateDBSLastMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateDBSLastMapper">
+
+</mapper>

src/main/resources/mapper/KateDBSMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateDBSMapper">
+
+</mapper>

src/main/resources/mapper/KateOrdersHistoryMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateOrdersHistoryMapper">
+
+</mapper>

src/main/resources/mapper/KateOrdersLastMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateOrdersLastMapper">
+
+</mapper>

src/main/resources/mapper/KateOrdersMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.KateOrdersMapper">
+
+</mapper>

src/main/resources/mapper/LocationMapper.xml

@@ -2,110 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.LocationMapper">
-    <resultMap type="Location" id="LocationMap">
-        <result property="locationId" column="location_id"/>
-        <result property="areaId" column="area_id"/>
-        <result property="tunnelId" column="tunnel_id"/>
-        <result property="equipmentId" column="equipment_id"/>
-        <result property="locationType" column="location_type"/>
-        <result property="queue" column="queue"/>
-        <result property="line" column="line"/>
-        <result property="layer" column="layer"/>
-        <result property="depth" column="depth"/>
-        <result property="isLock" column="is_lock"/>
-        <result property="locationStatus" column="location_status"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="markDepth" column="mark_depth"/>
-    </resultMap>
 
-    <sql id="selectAll">
-        select location_id, area_id, tunnel_id, equipment_id, location_type, queue, line, layer, depth, is_lock, location_status, goods_id, mark_depth
-        from tbl_app_location
-    </sql>
-
-    <select id="selLocations" parameterType="Location" resultMap="LocationMap">
-        <include refid="selectAll"/>
-        <where>
-            <if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
-            <if test="areaId != null"> and area_id = #{areaId}</if>
-            <if test="tunnelId != null"> and tunnel_id = #{tunnelId}</if>
-            <if test="equipmentId != null"> and equipment_id = #{equipmentId}</if>
-            <if test="locationType != null"> and location_type = #{locationType}</if>
-            <if test="queue != null"> and queue = #{queue}</if>
-            <if test="line != null"> and line = #{line}</if>
-            <if test="layer != null"> and layer = #{layer}</if>
-            <if test="depth != null"> and depth = #{depth}</if>
-            <if test="isLock != null"> and is_lock = #{isLock}</if>
-            <if test="locationStatus != null"> and location_status = #{locationStatus}</if>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-            <if test="markDepth != null"> and mark_depth = #{markDepth}</if>
-        </where>
-        order by depth desc, line asc, layer asc, queue asc
-    </select>
-
-    <select id="selNextLocation" parameterType="Location" resultMap="LocationMap">
-        <include refid="selectAll"/>
-        <where>
-            <if test="areaId != null"> and area_id = #{areaId}</if>
-            <if test="tunnelId != null"> and tunnel_id = #{tunnelId}</if>
-            <if test="equipmentId != null"> and equipment_id = #{equipmentId}</if>
-            <if test="locationType != null"> and location_type = #{locationType}</if>
-             and is_lock = 0 and location_status = 0
-        </where>
-        order by depth desc, layer asc, line desc, queue asc
-        for update
-    </select>
-
-    <select id="selLocationsWithNum" parameterType="int" resultMap="LocationMap">
-        SELECT queue, line, layer
-        FROM tbl_app_location
-        WHERE equipment_id=#{equipmentId}
-        GROUP BY queue, line, layer
-        HAVING SUM(location_status)=3-#{needLocationNum}
-        ORDER BY layer, line, queue
-    </select>
-
-    <insert id="addLocation" parameterType="Location">
-        insert into tbl_app_location
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="locationId != null">location_id,</if>
-            <if test="areaId != null">area_id,</if>
-            <if test="tunnelId != null">tunnel_id,</if>
-            <if test="equipmentId != null">equipment_id,</if>
-            <if test="locationType != null">location_type,</if>
-            <if test="queue != null">queue,</if>
-            <if test="line != null">line,</if>
-            <if test="layer != null">layer,</if>
-            <if test="depth != null">depth,</if>
-            <if test="isLock != null">is_lock,</if>
-            <if test="locationStatus != null">location_status,</if>
-            <if test="goodsId != null">goods_id,</if>
-            <if test="markDepth != null">mark_depth,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="locationId != null">#{locationId},</if>
-            <if test="areaId != null">#{areaId},</if>
-            <if test="tunnelId != null">#{tunnelId},</if>
-            <if test="equipmentId != null">#{equipmentId},</if>
-            <if test="locationType != null">#{locationType},</if>
-            <if test="queue != null">#{queue},</if>
-            <if test="line != null">#{line},</if>
-            <if test="layer != null">#{layer},</if>
-            <if test="depth != null">#{depth},</if>
-            <if test="isLock != null">#{isLock},</if>
-            <if test="locationStatus != null">#{locationStatus},</if>
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="markDepth != null">#{markDepth},</if>
-        </trim>
-    </insert>
-
-    <update id="modifyLocation" parameterType="Location">
-        update tbl_app_location
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="isLock != null">is_lock = #{isLock},</if>
-            <if test="locationStatus != null">location_status = #{locationStatus},</if>
-            <if test="goodsId != null">goods_id = #{goodsId},</if>
-        </trim>
-        where location_id = #{locationId}
-    </update>
 </mapper>

src/main/resources/mapper/MenuMapper.xml

@@ -2,17 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.MenuMapper">
-<!--    <resultMap type="com.wms.entity.table.Menu" id="MenuMap">-->
+
-<!--        <result property="menuId" column="menu_id"/>-->
-<!--        <result property="labelName" column="label_name"/>-->
-<!--        <result property="iconValue" column="icon_value"/>-->
-<!--        <result property="path" column="path"/>-->
-<!--        <result property="parentId" column="parent_id"/>-->
-<!--    </resultMap>-->
-    <select id="selMenuByRoleId" parameterType="Integer" resultType="com.wms.entity.table.Menu">
-        select tsm.menu_id, tsm.label_name, tsm.icon_value, tsm.path, tsm.parent_id
-        from tbl_sys_menu tsm left join tbl_sys_permission tsp on tsm.menu_id = tsp.menu_id
-        where tsp.role_id = #{roleId}
-        order by tsm.menu_id
-    </select>
 </mapper>

src/main/resources/mapper/OutsideVehiclesMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.OutsideVehiclesMapper">
+
+</mapper>

src/main/resources/mapper/PickTaskMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.PickTaskMapper">
+
+</mapper>

src/main/resources/mapper/PickTaskRecordMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.PickTaskRecordMapper">
+
+</mapper>

src/main/resources/mapper/StandMapper.xml

@@ -2,102 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.StandMapper">
-    <resultMap type="Stand" id="StandMap">
-        <result property="standId" column="stand_id"/>
-        <result property="allowIn" column="allow_in"/>
-        <result property="allowOut" column="allow_out"/>
-        <result property="allowInventory" column="allow_inventory"/>
-        <result property="taskId" column="task_id"/>
-        <result property="isLock" column="is_lock"/>
-        <result property="standStatus" column="stand_status"/>
-        <result property="equipmentId" column="equipment_id"/>
-        <result property="areaId" column="area_id"/>
-        <result property="standType" column="stand_type"/>
-        <result property="standIp" column="stand_ip"/>
-        <result property="outerId" column="outer_id"/>
-    </resultMap>
 
-    <sql id="selectAll">
-        select stand_id, allow_in, allow_out, allow_inventory, task_id, is_lock, stand_status, equipment_id, area_id,
-               stand_type, stand_ip, outer_id
-        from tbl_app_stand
-    </sql>
-
-    <select id="selStands" parameterType="Stand" resultMap="StandMap">
-        <include refid="selectAll"/>
-        <where>
-            <if test="standId != null and standId != ''"> and stand_id = #{standId}</if>
-            <if test="allowIn != null"> and allow_in = #{allowIn}</if>
-            <if test="allowOut != null"> and allow_out = #{allowOut}</if>
-            <if test="allowInventory != null"> and allow_inventory = #{allowInventory}</if>
-            <if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="isLock != null"> and is_lock = #{isLock}</if>
-            <if test="standStatus != null"> and stand_status = #{standStatus}</if>
-            <if test="equipmentId != null"> and equipment_id = #{equipmentId}</if>
-            <if test="areaId != null"> and area_id = #{areaId}</if>
-            <if test="standType != null"> and stand_type = #{standType}</if>
-            <if test="standIp != null and standIp != ''"> and stand_ip = #{standIp}</if>
-            <if test="outerId != null and outerId != ''"> and outer_id = #{outerId}</if>
-        </where>
-        order by stand_type, last_use_time
-    </select>
-
-    <select id="selStandById" parameterType="String" resultMap="StandMap">
-        <include refid="selectAll"/>
-        where stand_id = #{standId}
-    </select>
-
-    <insert id="addStand" parameterType="Stand">
-        insert into tbl_app_stand
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="standId != null">stand_id,</if>
-            <if test="allowIn != null">allow_in,</if>
-            <if test="allowOut != null">allow_out,</if>
-            <if test="allowInventory != null">allow_inventory,</if>
-            <if test="taskId != null">task_id,</if>
-            <if test="isLock != null">is_lock,</if>
-            <if test="standStatus != null">stand_status,</if>
-            <if test="equipmentId != null">equipment_id,</if>
-            <if test="areaId != null">area_id,</if>
-            <if test="standType != null">stand_type,</if>
-            <if test="standIp != null">stand_ip,</if>
-            <if test="outerId != null">outer_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="standId != null">#{standId},</if>
-            <if test="allowIn != null">#{allowIn},</if>
-            <if test="allowOut != null">#{allowOut},</if>
-            <if test="allowInventory != null">#{allowInventory},</if>
-            <if test="taskId != null">#{taskId},</if>
-            <if test="isLock != null">#{isLock},</if>
-            <if test="standStatus != null">#{standStatus},</if>
-            <if test="equipmentId != null">#{equipmentId},</if>
-            <if test="areaId != null">#{areaId},</if>
-            <if test="standType != null">#{standType},</if>
-            <if test="standIp != null">#{standIp},</if>
-            <if test="outerId != null">#{outerId},</if>
-        </trim>
-    </insert>
-
-    <update id="modifyStand" parameterType="Stand">
-        update tbl_app_stand
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="allowIn != null">allow_in = #{allowIn},</if>
-            <if test="allowOut != null">allow_out = #{allowOut},</if>
-            <if test="allowInventory != null">allow_inventory = #{allowInventory},</if>
-            <if test="taskId != null">task_id = #{taskId},</if>
-            <if test="isLock != null">is_lock = #{isLock},</if>
-            <if test="standStatus != null">stand_status = #{standStatus},</if>
-            <if test="equipmentId != null">equipment_id = #{equipmentId},</if>
-            <if test="areaId != null">area_id = #{areaId},</if>
-            <if test="standType != null">stand_type = #{standType},</if>
-            <if test="standIp != null">stand_ip = #{standIp},</if>
-            <if test="outerId != null">outer_id = #{outerId},</if>
-        </trim>
-        where stand_id = #{standId}
-    </update>
-
-    <delete id="deleteStand" parameterType="String">
-        delete from tbl_app_stand where stand_id = #{standId}
-    </delete>
 </mapper>

src/main/resources/mapper/StockMapper.xml

@@ -2,210 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.StockMapper">
-    <resultMap type="Stock" id="StockMap">
+    
-        <result property="stockId" column="stock_id"/>
-        <result property="locationId" column="location_id"/>
-        <result property="vehicleId" column="vehicle_id"/>
-        <result property="barcode" column="barcode"/>
-        <result property="batchNo" column="batch_no"/>
-        <result property="goodsType" column="goods_type"/>
-        <result property="specification" column="specification"/>
-        <result property="weight" column="weight"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="goodsName" column="goods_name"/>
-        <result property="originNum" column="origin_num"/>
-        <result property="realNum" column="real_num"/>
-        <result property="stockStatus" column="stock_status"/>
-        <result property="goodsStatus" column="goods_status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="lastUpdateTime" column="last_update_time"/>
-        <result property="lastUpdateUser" column="last_update_user"/>
-        <result property="remark" column="remark"/>
-        <result property="isInventory" column="is_inventory"/>
-        <result property="inventoryTaskId" column="inventory_task_id"/>
-        <result property="orderId" column="order_id"/>
-        <result property="noUseDays" column="no_use_days"/>
-        <result property="productionDate" column="production_date"/>
-        <result property="expirationDate" column="expiration_date"/>
-        <result property="tunnelId" column="tunnel_id"/>
-        <result property="goodsUnit" column="goods_unit"/>
-        <result property="weighDate" column="weigh_date"/>
-        <result property="goodsCode" column="goods_code"/>
-    </resultMap>
-
-    <sql id="selectAll">
-        select stock_id, location_id, vehicle_id, barcode, batch_no, goods_type, specification, weight, goods_id, goods_name,
-               origin_num, real_num, stock_status, goods_status, create_time, last_update_time, last_update_user,
-               remark, is_inventory, inventory_task_id, order_id, no_use_days, production_date, expiration_date, tunnel_id,
-               goods_unit, weigh_date, goods_code
-        from tbl_app_stock
-    </sql>
-
-    <select id="selStocksFront" parameterType="String" resultMap="StockMap">
-        <include refid="selectAll" />
-        <where>
-            <if test="query != null and query != ''"> barcode like concat('%', #{query}, '%') or goods_type like concat('%', #{query}, '%') or specification like concat('%', #{query}, '%') or batch_no like concat('%', #{query}, '%')</if>
-        </where>
-    </select>
-
-    <select id="selStocksByGoodsId" parameterType="Stock" resultMap="StockMap">
-        select goods_id, goods_name, SUM(real_num) as real_num
-        from tbl_app_stock
-        <where>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-        </where>
-        group by goods_id, goods_name
-    </select>
-
-    <select id="selStockOutOfDate" resultMap="StockMap">
-        <include refid="selectAll" />
-        where expiration_date &lt; now() and goods_status != 3
-    </select>
-
-    <select id="selStockNearDeadLine" parameterType="integer" resultMap="StockMap">
-        <include refid="selectAll" />
-        where DATEDIFF(EXPIRATION_DATE,CURRENT_DATE) &lt;= #{nearInterval} and goods_status != 3
-    </select>
-
-    <select id="selStockLongTimeNoUse" parameterType="integer" resultMap="StockMap">
-        <include refid="selectAll" />
-        where DATEDIFF(last_update_time,CURRENT_DATE) &lt;= #{nearInterval} and goods_status = 0
-    </select>
-
-    <select id="selStocks" parameterType="Stock" resultMap="StockMap">
-        <include refid="selectAll" />
-        <where>
-            <if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
-            <if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
-            <if test="barcode != null and barcode != ''"> and barcode = #{barcode}</if>
-            <if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
-            <if test="goodsType != null and goodsType != ''"> and goods_type = #{goodsType}</if>
-            <if test="specification != null and specification != ''"> and specification = #{specification}</if>
-            <if test="weight != null"> and weight = #{weight}</if>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-            <if test="goodsName != null and goodsName != ''"> and goods_name = #{goodsName}</if>
-            <if test="originNum != null"> and origin_num = #{originNum}</if>
-            <if test="realNum != null"> and real_num = #{realNum}</if>
-            <if test="stockStatus != null"> and stock_status = #{stockStatus}</if>
-            <if test="goodsStatus != null"> and goods_status = #{goodsStatus}</if>
-            <if test="createTime != null"> and create_time = #{createTime}</if>
-            <if test="lastUpdateTime != null"> and last_update_time = #{lastUpdateTime}</if>
-            <if test="lastUpdateUser != null and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
-            <if test="remark != null and remark != ''"> and remark = #{remark}</if>
-            <if test="isInventory != null"> and is_inventory = #{isInventory}</if>
-            <if test="inventoryTaskId != null and inventoryTaskId != ''"> and inventory_task_id = #{inventoryTaskId}</if>
-            <if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="noUseDays != null"> and no_use_days = #{noUseDays}</if>
-            <if test="productionDate != null"> and production_date = #{productionDate}</if>
-            <if test="expirationDate != null"> and expiration_date = #{expirationDate}</if>
-            <if test="tunnelId != null"> and tunnel_id = #{tunnelId}</if>
-            <if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
-            <if test="weighDate != null"> and weigh_date = #{weighDate}</if>
-            <if test="goodsCode != null and goodsCode != ''"> and goods_code = #{goodsCode}</if>
-        </where>
-        order by tunnel_id, create_time
-    </select>
-
-    <insert id="addStock" parameterType="Stock">
-        insert into tbl_app_stock
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null">stock_id,</if>
-            <if test="locationId != null">location_id,</if>
-            <if test="vehicleId != null">vehicle_id,</if>
-            <if test="barcode != null">barcode,</if>
-            <if test="batchNo != null">batch_no,</if>
-            <if test="goodsType != null">goods_type,</if>
-            <if test="specification != null">specification,</if>
-            <if test="weight != null">weight,</if>
-            <if test="goodsId != null">goods_id,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="originNum != null">origin_num,</if>
-            <if test="realNum != null">real_num,</if>
-            <if test="stockStatus != null">stock_status,</if>
-            <if test="goodsStatus != null">goods_status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="lastUpdateTime != null">last_update_time,</if>
-            <if test="lastUpdateUser != null">last_update_user,</if>
-            <if test="remark != null">remark,</if>
-            <if test="isInventory != null">is_inventory,</if>
-            <if test="inventoryTaskId != null">inventory_task_id,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="noUseDays != null">no_use_days,</if>
-            <if test="productionDate != null">production_date,</if>
-            <if test="expirationDate != null">expiration_date,</if>
-            <if test="tunnelId != null">tunnel_id,</if>
-            <if test="goodsUnit != null">goods_unit,</if>
-            <if test="weighDate != null">weigh_date,</if>
-            <if test="goodsCode != null">goods_code,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null">#{stockId},</if>
-            <if test="locationId != null">#{locationId},</if>
-            <if test="vehicleId != null">#{vehicleId},</if>
-            <if test="barcode != null">#{barcode},</if>
-            <if test="batchNo != null">#{batchNo},</if>
-            <if test="goodsType != null">#{goodsType},</if>
-            <if test="specification != null">#{specification},</if>
-            <if test="weight != null">#{weight},</if>
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="originNum != null">#{originNum},</if>
-            <if test="realNum != null">#{realNum},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="goodsStatus != null">#{goodsStatus},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
-            <if test="lastUpdateUser != null">#{lastUpdateUser},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="isInventory != null">#{isInventory},</if>
-            <if test="inventoryTaskId != null">#{inventoryTaskId},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="noUseDays != null">#{noUseDays},</if>
-            <if test="productionDate != null">#{productionDate},</if>
-            <if test="expirationDate != null">#{expirationDate},</if>
-            <if test="tunnelId != null">#{tunnelId},</if>
-            <if test="goodsUnit != null">#{goodsUnit},</if>
-            <if test="weighDate != null">#{weighDate},</if>
-            <if test="goodsCode != null">#{goodsCode},</if>
-        </trim>
-    </insert>
-
-    <update id="modifyStock" parameterType="Stock">
-        update tbl_app_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="locationId != null">location_id = #{locationId},</if>
-            <if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
-            <if test="barcode != null">barcode = #{barcode},</if>
-            <if test="batchNo != null">batch_no = #{batchNo},</if>
-            <if test="goodsType != null">goods_type = #{goodsType},</if>
-            <if test="specification != null">specification = #{specification},</if>
-            <if test="weight != null">weight = #{weight},</if>
-            <if test="goodsId != null">goods_id = #{goodsId},</if>
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="originNum != null">origin_num = #{originNum},</if>
-            <if test="realNum != null">real_num = #{realNum},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="goodsStatus != null">goods_status = #{goodsStatus},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
-            <if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="isInventory != null">is_inventory = #{isInventory},</if>
-            <if test="inventoryTaskId != null">inventory_task_id = #{inventoryTaskId},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="noUseDays != null">no_use_days = #{noUseDays},</if>
-            <if test="productionDate != null">production_date = #{productionDate},</if>
-            <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
-            <if test="tunnelId != null">tunnel_id = #{tunnelId},</if>
-            <if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
-            <if test="weighDate != null">weigh_date = #{weighDate},</if>
-            <if test="goodsCode != null">goods_code = #{goodsCode},</if>
-        </trim>
-        where stock_id = #{stockId}
-    </update>
-
-    <delete id="deleteStock" parameterType="String">
-        delete from tbl_app_stock where stock_id = #{stockId}
-    </delete>
 </mapper>

src/main/resources/mapper/TaskMapper.xml

@@ -2,184 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.TaskMapper">
-    <resultMap type="Task" id="TaskMap">
-        <result property="taskId" column="task_id"/>
-        <result property="taskType" column="task_type"/>
-        <result property="taskStatus" column="task_status"/>
-        <result property="taskGroup" column="task_group"/>
-        <result property="origin" column="origin"/>
-        <result property="destination" column="destination"/>
-        <result property="weight" column="weight"/>
-        <result property="vehicleNo" column="vehicle_no"/>
-        <result property="vehicleSize" column="vehicle_size"/>
-        <result property="createTime" column="create_time"/>
-        <result property="userName" column="user_name"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="goodsName" column="goods_name"/>
-        <result property="operateNum" column="operate_num"/>
-        <result property="totalNum" column="total_num"/>
-        <result property="taskPriority" column="task_priority"/>
-        <result property="remark1" column="remark1"/>
-        <result property="locator" column="locator"/>
-        <result property="barcode" column="barcode"/>
-        <result property="batchNo" column="batch_no"/>
-        <result property="goodsType" column="goods_type"/>
-        <result property="specification" column="specification"/>
-        <result property="productionDate" column="production_date"/>
-        <result property="expirationDate" column="expiration_date"/>
-        <result property="preTask" column="pre_task"/>
-        <result property="finishTime" column="finish_time"/>
-        <result property="goodsCode" column="goods_code"/>
-        <result property="goodsUnit" column="goods_unit"/>
-        <result property="weighDate" column="weigh_date"/>
-    </resultMap>
 
-    <sql id="selectAll">
-        select task_id, task_type, task_status, task_group, origin, destination, weight, vehicle_no, vehicle_size,
-               create_time, user_name, goods_id, goods_name, operate_num, total_num, task_priority, remark1, locator,
-               barcode, batch_no, goods_type, specification, production_date, expiration_date, pre_task, finish_time,
-               goods_code, goods_unit, weigh_date
-        from tbl_app_task
-    </sql>
-
-    <select id="selTasks" parameterType="Task" resultMap="TaskMap">
-        <include refid="selectAll" />
-        <where>
-            <if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="taskType != null"> and task_type = #{taskType}</if>
-            <if test="taskStatus != null"> and task_status = #{taskStatus}</if>
-            <if test="taskGroup != null and taskGroup != ''"> and task_group = #{taskGroup}</if>
-            <if test="origin != null and origin != ''"> and origin = #{origin}</if>
-            <if test="destination != null and destination != ''"> and destination = #{destination}</if>
-            <if test="weight != null"> and weight = #{weight}</if>
-            <if test="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
-            <if test="vehicleSize != null"> and vehicle_size = #{vehicleSize}</if>
-            <if test="createTime != null"> and create_time = #{createTime}</if>
-            <if test="userName != null and userName != ''"> and user_name = #{userName}</if>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-            <if test="goodsName != null and goodsName != ''"> and goods_name = #{goodsName}</if>
-            <if test="operateNum != null"> and operate_num = #{operateNum}</if>
-            <if test="totalNum != null"> and total_num = #{totalNum}</if>
-            <if test="taskPriority != null"> and task_priority = #{taskPriority}</if>
-            <if test="remark1 != null and remark1 != ''"> and remark1 = #{remark1}</if>
-            <if test="locator != null and locator != ''"> and locator = #{locator}</if>
-            <if test="barcode != null and barcode != ''"> and barcode = #{barcode}</if>
-            <if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
-            <if test="goodsType != null and goodsType != ''"> and goods_type = #{goodsType}</if>
-            <if test="specification != null and specification != ''"> and specification = #{specification}</if>
-            <if test="productionDate != null"> and production_date = #{productionDate}</if>
-            <if test="expirationDate != null"> and expiration_date = #{expirationDate}</if>
-            <if test="preTask != null"> and pre_task = #{preTask}</if>
-            <if test="finishTime != null"> and finish_time = #{finishTime}</if>
-            <if test="goodsCode != null and goodsCode != ''"> and goods_code = #{goodsCode}</if>
-            <if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
-            <if test="weighDate != null"> and weigh_date = #{weighDate}</if>
-        </where>
-        order by task_priority desc, task_status desc, create_time desc
-    </select>
-
-    <insert id="addTask" parameterType="Task">
-        insert into tbl_app_task
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">task_id,</if>
-            <if test="taskType != null">task_type,</if>
-            <if test="taskStatus != null">task_status,</if>
-            <if test="taskGroup != null">task_group,</if>
-            <if test="origin != null">origin,</if>
-            <if test="destination != null">destination,</if>
-            <if test="weight != null">weight,</if>
-            <if test="vehicleNo != null">vehicle_no,</if>
-            <if test="vehicleSize != null">vehicle_size,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="goodsId != null">goods_id,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="operateNum != null">operate_num,</if>
-            <if test="totalNum != null">total_num,</if>
-            <if test="taskPriority != null">task_priority,</if>
-            <if test="remark1 != null">remark1,</if>
-            <if test="locator != null">locator,</if>
-            <if test="barcode != null">barcode,</if>
-            <if test="batchNo != null">batch_no,</if>
-            <if test="goodsType != null">goods_type,</if>
-            <if test="specification != null">specification,</if>
-            <if test="productionDate != null">production_date,</if>
-            <if test="expirationDate != null">expiration_date,</if>
-            <if test="preTask != null">pre_task,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="goodsCode != null">goods_code,</if>
-            <if test="goodsUnit != null">goods_unit,</if>
-            <if test="weighDate != null">weigh_date,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">#{taskId},</if>
-            <if test="taskType != null">#{taskType},</if>
-            <if test="taskStatus != null">#{taskStatus},</if>
-            <if test="taskGroup != null">#{taskGroup},</if>
-            <if test="origin != null">#{origin},</if>
-            <if test="destination != null">#{destination},</if>
-            <if test="weight != null">#{weight},</if>
-            <if test="vehicleNo != null">#{vehicleNo},</if>
-            <if test="vehicleSize != null">#{vehicleSize},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="operateNum != null">#{operateNum},</if>
-            <if test="totalNum != null">#{totalNum},</if>
-            <if test="taskPriority != null">#{taskPriority},</if>
-            <if test="remark1 != null">#{remark1},</if>
-            <if test="locator != null">#{locator},</if>
-            <if test="barcode != null">#{barcode},</if>
-            <if test="batchNo != null">#{batchNo},</if>
-            <if test="goodsType != null">#{goodsType},</if>
-            <if test="specification != null">#{specification},</if>
-            <if test="productionDate != null">#{productionDate},</if>
-            <if test="expirationDate != null">#{expirationDate},</if>
-            <if test="preTask != null">#{preTask},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="goodsCode != null">#{goodsCode},</if>
-            <if test="goodsUnit != null">#{goodsUnit},</if>
-            <if test="weighDate != null">#{weighDate},</if>
-        </trim>
-    </insert>
-
-    <update id="executeTask" parameterType="Task">
-        update tbl_app_task
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="taskStatus != null">task_status = #{taskStatus},</if>
-            <if test="taskGroup != null">task_group = #{taskGroup},</if>
-            <if test="origin != null">origin = #{origin},</if>
-            <if test="destination != null">destination = #{destination},</if>
-            <if test="weight != null">weight = #{weight},</if>
-            <if test="vehicleNo != null">vehicle_no = #{vehicleNo},</if>
-            <if test="vehicleSize != null">vehicle_size = #{vehicleSize},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="goodsId != null">goods_id = #{goodsId},</if>
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="operateNum != null">operate_num = #{operateNum},</if>
-            <if test="totalNum != null">total_num = #{totalNum},</if>
-            <if test="taskPriority != null">task_priority = #{taskPriority},</if>
-            <if test="productionDate != null">production_date = #{productionDate},</if>
-            <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
-            <if test="remark1 != null">remark1 = #{remark1},</if>
-            <if test="locator != null">locator = #{locator},</if>
-            <if test="barcode != null">barcode = #{barcode},</if>
-            <if test="batchNo != null">batch_no = #{batchNo},</if>
-            <if test="goodsType != null">goods_type = #{goodsType},</if>
-            <if test="specification != null">specification = #{specification},</if>
-            <if test="preTask != null">pre_task = #{preTask},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="goodsCode != null">goods_code = #{goodsCode},</if>
-            <if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
-            <if test="weighDate != null">weigh_date = #{weighDate},</if>
-        </trim>
-        where task_id = #{taskId}
-    </update>
-
-    <delete id="deleteTask" parameterType="String">
-        delete from tbl_app_task where task_id = #{taskId}
-    </delete>
 </mapper>

src/main/resources/mapper/TaskRecordMapper.xml

@@ -2,184 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.TaskRecordMapper">
-    <resultMap type="Task" id="TaskMap">
-        <result property="taskId" column="task_id"/>
-        <result property="taskType" column="task_type"/>
-        <result property="taskStatus" column="task_status"/>
-        <result property="taskGroup" column="task_group"/>
-        <result property="origin" column="origin"/>
-        <result property="destination" column="destination"/>
-        <result property="weight" column="weight"/>
-        <result property="vehicleNo" column="vehicle_no"/>
-        <result property="vehicleSize" column="vehicle_size"/>
-        <result property="createTime" column="create_time"/>
-        <result property="userName" column="user_name"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="goodsName" column="goods_name"/>
-        <result property="operateNum" column="operate_num"/>
-        <result property="totalNum" column="total_num"/>
-        <result property="taskPriority" column="task_priority"/>
-        <result property="remark1" column="remark1"/>
-        <result property="locator" column="locator"/>
-        <result property="barcode" column="barcode"/>
-        <result property="batchNo" column="batch_no"/>
-        <result property="goodsType" column="goods_type"/>
-        <result property="specification" column="specification"/>
-        <result property="productionDate" column="production_date"/>
-        <result property="expirationDate" column="expiration_date"/>
-        <result property="finishTime" column="finish_time"/>
-        <result property="preTask" column="pre_task"/>
-        <result property="goodsCode" column="goods_code"/>
-        <result property="goodsUnit" column="goods_unit"/>
-        <result property="weighDate" column="weigh_date"/>
-    </resultMap>
 
-    <sql id="selectAll">
-        select task_id, task_type, task_status, task_group, origin, destination, weight, vehicle_no, vehicle_size,
-               create_time, user_name, goods_id, goods_name, operate_num, total_num, task_priority, remark1, locator,
-               barcode, batch_no, goods_type, specification, production_date, expiration_date, finish_time, pre_task,
-               goods_code, goods_unit, weigh_date
-        from tbl_app_task_bak
-    </sql>
-
-    <select id="selTasks" parameterType="Task" resultMap="TaskMap">
-        <include refid="selectAll" />
-        <where>
-            <if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="taskType != null"> and task_type = #{taskType}</if>
-            <if test="taskStatus != null"> and task_status = #{taskStatus}</if>
-            <if test="taskGroup != null and taskGroup != ''"> and task_group = #{taskGroup}</if>
-            <if test="origin != null and origin != ''"> and origin = #{origin}</if>
-            <if test="destination != null and destination != ''"> and destination = #{destination}</if>
-            <if test="weight != null"> and weight = #{weight}</if>
-            <if test="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
-            <if test="vehicleSize != null"> and vehicle_size = #{vehicleSize}</if>
-            <if test="createTime != null"> and create_time = #{createTime}</if>
-            <if test="userName != null and userName != ''"> and user_name = #{userName}</if>
-            <if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
-            <if test="goodsName != null and goodsName != ''"> and goods_name = #{goodsName}</if>
-            <if test="operateNum != null"> and operate_num = #{operateNum}</if>
-            <if test="totalNum != null"> and total_num = #{totalNum}</if>
-            <if test="taskPriority != null"> and task_priority = #{taskPriority}</if>
-            <if test="remark1 != null and remark1 != ''"> and remark1 = #{remark1}</if>
-            <if test="locator != null and locator != ''"> and locator = #{locator}</if>
-            <if test="barcode != null and barcode != ''"> and barcode = #{barcode}</if>
-            <if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
-            <if test="goodsType != null and goodsType != ''"> and goods_type = #{goodsType}</if>
-            <if test="specification != null and specification != ''"> and specification = #{specification}</if>
-            <if test="productionDate != null"> and production_date = #{productionDate}</if>
-            <if test="expirationDate != null"> and expiration_date = #{expirationDate}</if>
-            <if test="finishTime != null"> and finish_time = #{finishTime}</if>
-            <if test="preTask != null"> and pre_task = #{preTask}</if>
-            <if test="goodsCode != null and goodsCode != ''"> and goods_code = #{goodsCode}</if>
-            <if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
-            <if test="weighDate != null"> and weigh_date = #{weighDate}</if>
-        </where>
-        order by task_priority desc, task_status desc, create_time desc
-    </select>
-
-    <insert id="addTask" parameterType="Task">
-        insert into tbl_app_task_bak
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">task_id,</if>
-            <if test="taskType != null">task_type,</if>
-            <if test="taskStatus != null">task_status,</if>
-            <if test="taskGroup != null">task_group,</if>
-            <if test="origin != null">origin,</if>
-            <if test="destination != null">destination,</if>
-            <if test="weight != null">weight,</if>
-            <if test="vehicleNo != null">vehicle_no,</if>
-            <if test="vehicleSize != null">vehicle_size,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="goodsId != null">goods_id,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="operateNum != null">operate_num,</if>
-            <if test="totalNum != null">total_num,</if>
-            <if test="taskPriority != null">task_priority,</if>
-            <if test="remark1 != null">remark1,</if>
-            <if test="locator != null">locator,</if>
-            <if test="barcode != null">barcode,</if>
-            <if test="batchNo != null">batch_no,</if>
-            <if test="goodsType != null">goods_type,</if>
-            <if test="specification != null">specification,</if>
-            <if test="productionDate != null">production_date,</if>
-            <if test="expirationDate != null">expiration_date,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="preTask != null">pre_task,</if>
-            <if test="goodsCode != null">goods_code,</if>
-            <if test="goodsUnit != null">goods_unit,</if>
-            <if test="weighDate != null">weigh_date,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">#{taskId},</if>
-            <if test="taskType != null">#{taskType},</if>
-            <if test="taskStatus != null">#{taskStatus},</if>
-            <if test="taskGroup != null">#{taskGroup},</if>
-            <if test="origin != null">#{origin},</if>
-            <if test="destination != null">#{destination},</if>
-            <if test="weight != null">#{weight},</if>
-            <if test="vehicleNo != null">#{vehicleNo},</if>
-            <if test="vehicleSize != null">#{vehicleSize},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="operateNum != null">#{operateNum},</if>
-            <if test="totalNum != null">#{totalNum},</if>
-            <if test="taskPriority != null">#{taskPriority},</if>
-            <if test="remark1 != null">#{remark1},</if>
-            <if test="locator != null">#{locator},</if>
-            <if test="barcode != null">#{barcode},</if>
-            <if test="batchNo != null">#{batchNo},</if>
-            <if test="goodsType != null">#{goodsType},</if>
-            <if test="specification != null">#{specification},</if>
-            <if test="productionDate != null">#{productionDate},</if>
-            <if test="expirationDate != null">#{expirationDate},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="preTask != null">#{preTask},</if>
-            <if test="goodsCode != null">#{goodsCode},</if>
-            <if test="goodsUnit != null">#{goodsUnit},</if>
-            <if test="weighDate != null">#{weighDate},</if>
-        </trim>
-    </insert>
-
-    <update id="executeTask" parameterType="Task">
-        update tbl_app_task
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="taskStatus != null">task_status = #{taskStatus},</if>
-            <if test="taskGroup != null">task_group = #{taskGroup},</if>
-            <if test="origin != null">origin = #{origin},</if>
-            <if test="destination != null">destination = #{destination},</if>
-            <if test="weight != null">weight = #{weight},</if>
-            <if test="vehicleNo != null">vehicle_no = #{vehicleNo},</if>
-            <if test="vehicleSize != null">vehicle_size = #{vehicleSize},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="goodsId != null">goods_id = #{goodsId},</if>
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="operateNum != null">operate_num = #{operateNum},</if>
-            <if test="totalNum != null">total_num = #{totalNum},</if>
-            <if test="taskPriority != null">task_priority = #{taskPriority},</if>
-            <if test="productionDate != null">production_date = #{productionDate},</if>
-            <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
-            <if test="remark1 != null">remark1 = #{remark1},</if>
-            <if test="locator != null">locator = #{locator},</if>
-            <if test="barcode != null">barcode = #{barcode},</if>
-            <if test="batchNo != null">batch_no = #{batchNo},</if>
-            <if test="goodsType != null">goods_type = #{goodsType},</if>
-            <if test="specification != null">specification = #{specification},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="preTask != null">pre_task = #{preTask},</if>
-            <if test="goodsCode != null">goods_code = #{goodsCode},</if>
-            <if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
-            <if test="weighDate != null">weigh_date = #{weighDate},</if>
-        </trim>
-        where task_id = #{taskId}
-    </update>
-
-    <delete id="deleteTask" parameterType="String">
-        delete from tbl_app_task_bak where task_id = #{taskId}
-    </delete>
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -2,29 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.UserMapper">
-    <resultMap type="User" id="UserMap">
+
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="roleId" column="role_id"/>
-        <result property="loginAccount" column="login_account"/>
-        <result property="loginPassword" column="login_password"/>
-        <result property="addTime" column="add_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="addUser" column="add_user"/>
-    </resultMap>
-    <select id="selectUsers" parameterType="User" resultMap="UserMap">
-        select user_id, user_name, role_id, login_account, login_password, add_time, update_time, add_user
-        from tbl_sys_user
-        <where>
-            <if test="userId != null"> and user_id = #{userId}</if>
-            <if test="userName != null and userName != ''"> and user_name = #{userName}</if>
-            <if test="roleId != null"> and role_id = #{roleId}</if>
-            <if test="loginAccount != null"> and login_account = #{loginAccount}</if>
-            <if test="loginPassword != null"> and login_password = #{loginPassword}</if>
-            <if test="addTime != null"> and add_time = #{addTime}</if>
-            <if test="updateTime != null"> and update_time = #{updateTime}</if>
-            <if test="addUser != null and addUser != ''"> and add_user = #{addUser}</if>
-        </where>
-        order by user_id asc
-    </select>
 </mapper>

src/main/resources/mapper/VehicleMapper.xml

@@ -2,61 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wms.mapper.VehicleMapper">
-    <resultMap type="Vehicle" id="VehicleMap">
-        <result property="vehicleId" column="vehicle_id"/>
-        <result property="currentLocation" column="current_location"/>
-        <result property="vehicleStatus" column="vehicle_status"/>
-        <result property="isEmpty" column="is_empty"/>
-    </resultMap>
-
-    <sql id="selectAll">
-        select vehicle_id, current_location, vehicle_status, is_empty
-        from tbl_app_vehicle
-    </sql>
-
-    <select id="selVehicles" parameterType="Vehicle" resultMap="VehicleMap">
-        <include refid="selectAll"/>
-        <where>
-            <if test="vehicleId != null and vehicleId != ''"> and vehicle_id like concat("%", #{vehicleId}, "%")</if>
-            <if test="currentLocation != null and currentLocation != ''"> and current_location = #{currentLocation}</if>
-            <if test="vehicleStatus != null"> and vehicle_status = #{vehicleStatus}</if>
-            <if test="isEmpty != null"> and is_empty = #{isEmpty}</if>
-        </where>
-        order by vehicle_id
-    </select>
-
-    <select id="selVehicleById" parameterType="String" resultMap="VehicleMap">
-        <include refid="selectAll"/>
-        where vehicle_id = #{vehicleId}
-    </select>
-
-    <insert id="addVehicle" parameterType="Vehicle">
-        insert into tbl_app_vehicle
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="vehicleId != null">vehicle_id,</if>
-            <if test="currentLocation != null">current_location,</if>
-            <if test="vehicleStatus != null">vehicle_status,</if>
-            <if test="isEmpty != null">is_empty,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="vehicleId != null">#{vehicleId},</if>
-            <if test="currentLocation != null">#{currentLocation},</if>
-            <if test="vehicleStatus != null">#{vehicleStatus},</if>
-            <if test="isEmpty != null">#{isEmpty},</if>
-        </trim>
-    </insert>
-
-    <update id="modifyVehicle" parameterType="Vehicle">
-        update tbl_app_vehicle
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="currentLocation != null">current_location = #{currentLocation},</if>
-            <if test="vehicleStatus != null">vehicle_status = #{vehicleStatus},</if>
-            <if test="isEmpty != null">is_empty = #{isEmpty},</if>
-        </trim>
-        where vehicle_id = #{vehicleId}
-    </update>
-
-    <delete id="deleteVehicle" parameterType="String">
-        delete from tbl_app_vehicle where vehicle_id = #{vehicleId}
-    </delete>
 </mapper>

src/main/resources/mapper/WorkFlowMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.WorkFlowMapper">
+
+</mapper>

src/main/resources/mapper/WorkStationConfigMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.WorkStationConfigMapper">
+
+</mapper>

src/main/resources/mapper/WorkSummaryMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wms.mapper.WorkSummaryMapper">
+
+</mapper>