FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
15066119699 2025-03-06 10:15:39 +08:00
parent 36908bf9d3
commit 69fc7a5b68
24 changed files with 51 additions and 1544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppProviderController.java
View File

@ -32,8 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/app/provider")
public class AppProviderController extends BaseController
{
public class AppProviderController extends BaseController {
@Autowired
private IAppProviderService appProviderService;
@ -43,8 +42,7 @@ public class AppProviderController extends BaseController
@PreAuthorize("@ss.hasPermi('system:provider:list')")
@GetMapping("/list")
@EnhanceDataList(entityType = AppProvider.class)
public TableDataInfo list(AppProvider appProvider)
{
public TableDataInfo list(AppProvider appProvider) {
startPage();
List<AppProvider> list = appProviderService.selectAppProviderList(appProvider);
return getDataTable(list);
@ -56,8 +54,7 @@ public class AppProviderController extends BaseController
@PreAuthorize("@ss.hasPermi('system:provider:export')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, AppProvider appProvider)
{
public void export(HttpServletResponse response, AppProvider appProvider) {
List<AppProvider> list = appProviderService.selectAppProviderList(appProvider);
ExcelUtil<AppProvider> util = new ExcelUtil<AppProvider>(AppProvider.class);
util.exportExcel(response, list, "【请填写功能名称】数据");
@ -68,9 +65,8 @@ public class AppProviderController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:provider:query')")
@GetMapping(value = "/{providerId}")
public AjaxResult getInfo(@PathVariable("providerId") String providerId)
{
return success(appProviderService.selectAppProviderByProviderId(providerId));
public AjaxResult getInfo(@PathVariable("providerId") String providerId) {
return success(appProviderService.selectAppProviderById(providerId));
}
/**
@ -79,8 +75,7 @@ public class AppProviderController extends BaseController
@PreAuthorize("@ss.hasPermi('system:provider:add')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppProvider appProvider)
{
public AjaxResult add(@RequestBody AppProvider appProvider) {
return toAjax(appProviderService.insertAppProvider(appProvider));
}
@ -90,8 +85,7 @@ public class AppProviderController extends BaseController
@PreAuthorize("@ss.hasPermi('system:provider:edit')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppProvider appProvider)
{
public AjaxResult edit(@RequestBody AppProvider appProvider) {
return toAjax(appProviderService.updateAppProvider(appProvider));
}
@ -101,8 +95,7 @@ public class AppProviderController extends BaseController
@PreAuthorize("@ss.hasPermi('system:provider:remove')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
@DeleteMapping("/{providerIds}")
public AjaxResult remove(@PathVariable String[] providerIds)
{
return toAjax(appProviderService.deleteAppProviderByProviderIds(providerIds));
public AjaxResult remove(@PathVariable String[] providerIds) {
return toAjax(appProviderService.deleteAppProviderByIds(providerIds));
}
}

16
ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java
View File

@ -18,7 +18,11 @@ public class AppProvider extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 供应商id */
/** 主键 */
private Long id;
/** 供应商编码 */
@Excel(name = "供应商编码")
private String providerId;
/** 供应商名称 */
@ -33,7 +37,7 @@ public class AppProvider extends BaseEntity
@Excel(name = "地址")
private String providerAddress;
/** 供应商状态 */
/** 供应商状态 0 启用 1 停用*/
@Excel(name = "状态")
private Long providerStatus;
@ -51,6 +55,14 @@ public class AppProvider extends BaseEntity
private Integer type;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getType() {
return type;
}

6
ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppProviderMapper.java
View File

@ -18,7 +18,7 @@ public interface AppProviderMapper
* @param providerId 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
public AppProvider selectAppProviderByProviderId(String providerId);
public AppProvider selectAppProviderById(String providerId);
/**
* 查询【请填写功能名称】列表
@ -50,7 +50,7 @@ public interface AppProviderMapper
* @param providerId 【请填写功能名称】主键
* @return 结果
*/
public int deleteAppProviderByProviderId(String providerId);
public int deleteAppProviderById(String providerId);
/**
* 批量删除【请填写功能名称】
@ -58,5 +58,5 @@ public interface AppProviderMapper
* @param providerIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteAppProviderByProviderIds(String[] providerIds);
public int deleteAppProviderByIds(String[] providerIds);
}

6
ruoyi-system/src/main/java/com/ruoyi/app/service/IAppProviderService.java
View File

@ -18,7 +18,7 @@ public interface IAppProviderService
* @param providerId 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
public AppProvider selectAppProviderByProviderId(String providerId);
public AppProvider selectAppProviderById(String providerId);
/**
* 查询【请填写功能名称】列表
@ -50,7 +50,7 @@ public interface IAppProviderService
* @param providerIds 需要删除的【请填写功能名称】主键集合
* @return 结果
*/
public int deleteAppProviderByProviderIds(String[] providerIds);
public int deleteAppProviderByIds(String[] providerIds);
/**
* 删除【请填写功能名称】信息
@ -58,5 +58,5 @@ public interface IAppProviderService
* @param providerId 【请填写功能名称】主键
* @return 结果
*/
public int deleteAppProviderByProviderId(String providerId);
public int deleteAppProviderById(String providerId);
}

2
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
View File

@ -129,7 +129,7 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService
continue;
}
// 将订单数据插入码盘表
AppPmsOrderIn appPmsOrderInInsert = appPmsOrderIns.getFirst();
AppPmsOrderIn appPmsOrderInInsert = appPmsOrderIns.get(0);
AppPendingStorage appPendingStorage = new AppPendingStorage();
BeanUtils.copyProperties(appPmsOrderInInsert, appPendingStorage);
appPendingStorage.setVehicleNo(request.getVehicleNo());

12
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java
View File

@ -26,8 +26,8 @@ public class AppProviderServiceImpl implements IAppProviderService {
* @return 【请填写功能名称】
*/
@Override
public AppProvider selectAppProviderByProviderId(String providerId) {
return appProviderMapper.selectAppProviderByProviderId(providerId);
public AppProvider selectAppProviderById(String providerId) {
return appProviderMapper.selectAppProviderById(providerId);
}
/**
@ -70,8 +70,8 @@ public class AppProviderServiceImpl implements IAppProviderService {
* @return 结果
*/
@Override
public int deleteAppProviderByProviderIds(String[] providerIds) {
return appProviderMapper.deleteAppProviderByProviderIds(providerIds);
public int deleteAppProviderByIds(String[] providerIds) {
return appProviderMapper.deleteAppProviderByIds(providerIds);
}
/**
@ -81,7 +81,7 @@ public class AppProviderServiceImpl implements IAppProviderService {
* @return 结果
*/
@Override
public int deleteAppProviderByProviderId(String providerId) {
return appProviderMapper.deleteAppProviderByProviderId(providerId);
public int deleteAppProviderById(String providerId) {
return appProviderMapper.deleteAppProviderById(providerId);
}
}

23
ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml
View File

@ -5,6 +5,7 @@
<mapper namespace="com.ruoyi.app.mapper.AppProviderMapper">
<resultMap type="AppProvider" id="AppProviderResult">
<result property="id" column="id" />
<result property="providerId" column="provider_id" />
<result property="providerName" column="provider_name" />
<result property="providerContact" column="provider_contact" />
@ -16,7 +17,7 @@
</resultMap>
<sql id="selectAppProviderVo">
select provider_id, provider_name, provider_contact, provider_address, provider_status, provider_type,last_update_user, last_update_time from app_provider
select id,provider_id, provider_name, provider_contact, provider_address, provider_status, provider_type,last_update_user, last_update_time from app_provider
</sql>
<select id="selectAppProviderList" parameterType="AppProvider" resultMap="AppProviderResult">
@ -32,14 +33,15 @@
</where>
</select>
<select id="selectAppProviderByProviderId" parameterType="String" resultMap="AppProviderResult">
<select id="selectAppProviderById" parameterType="String" resultMap="AppProviderResult">
<include refid="selectAppProviderVo"/>
where provider_id = #{providerId}
where id = #{id}
</select>
<insert id="insertAppProvider" parameterType="AppProvider">
insert into app_provider
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="providerId != null">provider_id,</if>
<if test="providerName != null">provider_name,</if>
<if test="providerContact != null">provider_contact,</if>
@ -50,6 +52,7 @@
<if test="lastUpdateTime != null">last_update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="providerId != null">#{providerId},</if>
<if test="providerName != null">#{providerName},</if>
<if test="providerContact != null">#{providerContact},</if>
@ -72,17 +75,17 @@
<if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
<if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
</trim>
where provider_id = #{providerId}
where id = #{id}
</update>
<delete id="deleteAppProviderByProviderId" parameterType="String">
delete from app_provider where provider_id = #{providerId}
<delete id="deleteAppProviderById" parameterType="String">
delete from app_provider where id = #{id}
</delete>
<delete id="deleteAppProviderByProviderIds" parameterType="String">
delete from app_provider where provider_id in
<foreach item="providerId" collection="array" open="(" separator="," close=")">
#{providerId}
<delete id="deleteAppProviderByIds" parameterType="String">
delete from app_provider where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

2
ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml
View File

@ -51,7 +51,7 @@
<if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
<if test="goodsStatus != null "> and goods_status = #{goodsStatus}</if>
<if test="stockStatus != null "> and stock_status = #{stockStatus}</if>
<if test="storage_id != null"> and storage_id = #{storage_id}</if>
<if test="storageId != null"> and storage_id = #{storageId}</if>
</where>
</select>
<select id="selectStockByGoodsId" parameterType="AppStock" resultMap="AppStockResult">

9
ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
View File

@ -203,17 +203,10 @@
</foreach>
</update>
<update id="updatePlcId" parameterType="AppTask">
update app_task
<trim prefix="SET" suffixOverrides=",">
<if test="plcId != null">plc_id = #{plcId}</if>
</trim>
where task_status = #{taskStatus} AND vehicle_id = #{vehicleId}
</update>
<delete id="deleteAppTaskByTaskId" parameterType="String">
delete from app_task where task_id = #{taskId}
</delete>
<select id="selectPlcList" resultMap="AppTask">
<select id="selectPlcList" resultMap="AppTaskResult">
<include refid="selectAppTaskVo"/>
where task_status = 0 AND plc_id is null
</select>

92
ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml
View File

@ -1,92 +0,0 @@
<?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.ruoyi.system.mapper.AppGoodsMapper">
<resultMap type="AppGoods" id="AppGoodsResult">
<result property="goodsId" column="goods_id" />
<result property="goodsName" column="goods_name" />
<result property="goodsUnit" column="goods_unit" />
<result property="goodsType" column="goods_type" />
<result property="normalVehicleType" column="normal_vehicle_type" />
<result property="goodsStatus" column="goods_status" />
<result property="remark" column="remark" />
<result property="lastUpdateUser" column="last_update_user" />
<result property="lastUpdateTime" column="last_update_time" />
</resultMap>
<sql id="selectAppGoodsVo">
select goods_id, goods_name, goods_unit, goods_type, normal_vehicle_type, goods_status, remark, last_update_user, last_update_time from app_goods
</sql>
<select id="selectAppGoodsList" parameterType="AppGoods" resultMap="AppGoodsResult">
<include refid="selectAppGoodsVo"/>
<where>
<if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
<if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
<if test="goodsType != null and goodsType != ''"> and goods_type = #{goodsType}</if>
<if test="normalVehicleType != null and normalVehicleType != ''"> and normal_vehicle_type = #{normalVehicleType}</if>
<if test="goodsStatus != null "> and goods_status = #{goodsStatus}</if>
<if test="lastUpdateUser != null and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
<if test="lastUpdateTime != null "> and last_update_time = #{lastUpdateTime}</if>
</where>
</select>
<select id="selectAppGoodsByGoodsId" parameterType="String" resultMap="AppGoodsResult">
<include refid="selectAppGoodsVo"/>
where goods_id = #{goodsId}
</select>
<insert id="insertAppGoods" parameterType="AppGoods">
insert into app_goods
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="goodsId != null">goods_id,</if>
<if test="goodsName != null">goods_name,</if>
<if test="goodsUnit != null and goodsUnit != ''">goods_unit,</if>
<if test="goodsType != null">goods_type,</if>
<if test="normalVehicleType != null">normal_vehicle_type,</if>
<if test="goodsStatus != null">goods_status,</if>
<if test="remark != null">remark,</if>
<if test="lastUpdateUser != null">last_update_user,</if>
<if test="lastUpdateTime != null">last_update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="goodsId != null">#{goodsId},</if>
<if test="goodsName != null">#{goodsName},</if>
<if test="goodsUnit != null and goodsUnit != ''">#{goodsUnit},</if>
<if test="goodsType != null">#{goodsType},</if>
<if test="normalVehicleType != null">#{normalVehicleType},</if>
<if test="goodsStatus != null">#{goodsStatus},</if>
<if test="remark != null">#{remark},</if>
<if test="lastUpdateUser != null">#{lastUpdateUser},</if>
<if test="lastUpdateTime != null">#{lastUpdateTime},</if>
</trim>
</insert>
<update id="updateAppGoods" parameterType="AppGoods">
update app_goods
<trim prefix="SET" suffixOverrides=",">
<if test="goodsName != null">goods_name = #{goodsName},</if>
<if test="goodsUnit != null and goodsUnit != ''">goods_unit = #{goodsUnit},</if>
<if test="goodsType != null">goods_type = #{goodsType},</if>
<if test="normalVehicleType != null">normal_vehicle_type = #{normalVehicleType},</if>
<if test="goodsStatus != null">goods_status = #{goodsStatus},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
<if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
</trim>
where goods_id = #{goodsId}
</update>
<delete id="deleteAppGoodsByGoodsId" parameterType="String">
delete from app_goods where goods_id = #{goodsId}
</delete>
<delete id="deleteAppGoodsByGoodsIds" parameterType="String">
delete from app_goods where goods_id in
<foreach item="goodsId" collection="array" open="(" separator="," close=")">
#{goodsId}
</foreach>
</delete>
</mapper>

58
ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml
View File

@ -1,58 +0,0 @@
<?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.ruoyi.system.mapper.AppGoodsPairMapper">
<resultMap type="AppGoodsPair" id="AppGoodsPairResult">
<result property="pairId" column="pair_id" />
<result property="goodsId" column="goods_id" />
</resultMap>
<sql id="selectAppGoodsPairVo">
select pair_id, goods_id from app_goods_pair
</sql>
<select id="selectAppGoodsPairList" parameterType="AppGoodsPair" resultMap="AppGoodsPairResult">
<include refid="selectAppGoodsPairVo"/>
<where>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
</where>
</select>
<select id="selectAppGoodsPairByPairId" parameterType="String" resultMap="AppGoodsPairResult">
<include refid="selectAppGoodsPairVo"/>
where pair_id = #{pairId}
</select>
<insert id="insertAppGoodsPair" parameterType="AppGoodsPair">
insert into app_goods_pair
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="pairId != null">pair_id,</if>
<if test="goodsId != null and goodsId != ''">goods_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pairId != null">#{pairId},</if>
<if test="goodsId != null and goodsId != ''">#{goodsId},</if>
</trim>
</insert>
<update id="updateAppGoodsPair" parameterType="AppGoodsPair">
update app_goods_pair
<trim prefix="SET" suffixOverrides=",">
<if test="goodsId != null and goodsId != ''">goods_id = #{goodsId},</if>
</trim>
where pair_id = #{pairId}
</update>
<delete id="deleteAppGoodsPairByPairId" parameterType="String">
delete from app_goods_pair where pair_id = #{pairId}
</delete>
<delete id="deleteAppGoodsPairByPairIds" parameterType="String">
delete from app_goods_pair where pair_id in
<foreach item="pairId" collection="array" open="(" separator="," close=")">
#{pairId}
</foreach>
</delete>
</mapper>

53
ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml
View File

@ -1,53 +0,0 @@
<?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.ruoyi.system.mapper.AppLedConfigMapper">
<resultMap type="AppLedConfig" id="AppLedConfigResult">
<result property="ledId" column="led_id" />
</resultMap>
<sql id="selectAppLedConfigVo">
select led_id from app_led_config
</sql>
<select id="selectAppLedConfigList" parameterType="AppLedConfig" resultMap="AppLedConfigResult">
<include refid="selectAppLedConfigVo"/>
<where>
</where>
</select>
<select id="selectAppLedConfigByLedId" parameterType="String" resultMap="AppLedConfigResult">
<include refid="selectAppLedConfigVo"/>
where led_id = #{ledId}
</select>
<insert id="insertAppLedConfig" parameterType="AppLedConfig">
insert into app_led_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ledId != null">led_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ledId != null">#{ledId},</if>
</trim>
</insert>
<update id="updateAppLedConfig" parameterType="AppLedConfig">
update app_led_config
<trim prefix="SET" suffixOverrides=",">
</trim>
where led_id = #{ledId}
</update>
<delete id="deleteAppLedConfigByLedId" parameterType="String">
delete from app_led_config where led_id = #{ledId}
</delete>
<delete id="deleteAppLedConfigByLedIds" parameterType="String">
delete from app_led_config where led_id in
<foreach item="ledId" collection="array" open="(" separator="," close=")">
#{ledId}
</foreach>
</delete>
</mapper>

122
ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml
View File

@ -1,122 +0,0 @@
<?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.ruoyi.system.mapper.AppLocationMapper">
<resultMap type="AppLocation" id="AppLocationResult">
<result property="locationId" column="location_id" />
<result property="locationType" column="location_type" />
<result property="locationStatus" column="location_status" />
<result property="outerId" column="outer_id" />
<result property="areaId" column="area_id" />
<result property="tunnelId" column="tunnel_id" />
<result property="equipmentId" column="equipment_id" />
<result property="wRow" column="w_row" />
<result property="wCol" column="w_col" />
<result property="wLayer" column="w_layer" />
<result property="wDepth" column="w_depth" />
<result property="isLock" column="is_lock" />
<result property="vehicleId" column="vehicle_id" />
<result property="remark" column="remark" />
<result property="isWorking" column="is_working" />
</resultMap>
<sql id="selectAppLocationVo">
select location_id, location_type, location_status, outer_id, area_id, tunnel_id, equipment_id, w_row, w_col, w_layer, w_depth, is_lock, vehicle_id, remark, is_working from app_location
</sql>
<select id="selectAppLocationList" parameterType="AppLocation" resultMap="AppLocationResult">
<include refid="selectAppLocationVo"/>
<where>
<if test="locationType != null "> and location_type = #{locationType}</if>
<if test="locationStatus != null "> and location_status = #{locationStatus}</if>
<if test="outerId != null and outerId != ''"> and outer_id = #{outerId}</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="wRow != null "> and w_row = #{wRow}</if>
<if test="wCol != null "> and w_col = #{wCol}</if>
<if test="wLayer != null "> and w_layer = #{wLayer}</if>
<if test="wDepth != null "> and w_depth = #{wDepth}</if>
<if test="isLock != null "> and is_lock = #{isLock}</if>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="isWorking != null "> and is_working = #{isWorking}</if>
</where>
</select>
<select id="selectAppLocationByLocationId" parameterType="String" resultMap="AppLocationResult">
<include refid="selectAppLocationVo"/>
where location_id = #{locationId}
</select>
<insert id="insertAppLocation" parameterType="AppLocation">
insert into app_location
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="locationId != null">location_id,</if>
<if test="locationType != null">location_type,</if>
<if test="locationStatus != null">location_status,</if>
<if test="outerId != null">outer_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="wRow != null">w_row,</if>
<if test="wCol != null">w_col,</if>
<if test="wLayer != null">w_layer,</if>
<if test="wDepth != null">w_depth,</if>
<if test="isLock != null">is_lock,</if>
<if test="vehicleId != null">vehicle_id,</if>
<if test="remark != null">remark,</if>
<if test="isWorking != null">is_working,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="locationId != null">#{locationId},</if>
<if test="locationType != null">#{locationType},</if>
<if test="locationStatus != null">#{locationStatus},</if>
<if test="outerId != null">#{outerId},</if>
<if test="areaId != null">#{areaId},</if>
<if test="tunnelId != null">#{tunnelId},</if>
<if test="equipmentId != null">#{equipmentId},</if>
<if test="wRow != null">#{wRow},</if>
<if test="wCol != null">#{wCol},</if>
<if test="wLayer != null">#{wLayer},</if>
<if test="wDepth != null">#{wDepth},</if>
<if test="isLock != null">#{isLock},</if>
<if test="vehicleId != null">#{vehicleId},</if>
<if test="remark != null">#{remark},</if>
<if test="isWorking != null">#{isWorking},</if>
</trim>
</insert>
<update id="updateAppLocation" parameterType="AppLocation">
update app_location
<trim prefix="SET" suffixOverrides=",">
<if test="locationType != null">location_type = #{locationType},</if>
<if test="locationStatus != null">location_status = #{locationStatus},</if>
<if test="outerId != null">outer_id = #{outerId},</if>
<if test="areaId != null">area_id = #{areaId},</if>
<if test="tunnelId != null">tunnel_id = #{tunnelId},</if>
<if test="equipmentId != null">equipment_id = #{equipmentId},</if>
<if test="wRow != null">w_row = #{wRow},</if>
<if test="wCol != null">w_col = #{wCol},</if>
<if test="wLayer != null">w_layer = #{wLayer},</if>
<if test="wDepth != null">w_depth = #{wDepth},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
<if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="isWorking != null">is_working = #{isWorking},</if>
</trim>
where location_id = #{locationId}
</update>
<delete id="deleteAppLocationByLocationId" parameterType="String">
delete from app_location where location_id = #{locationId}
</delete>
<delete id="deleteAppLocationByLocationIds" parameterType="String">
delete from app_location where location_id in
<foreach item="locationId" collection="array" open="(" separator="," close=")">
#{locationId}
</foreach>
</delete>
</mapper>

108
ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml
View File

@ -1,108 +0,0 @@
<?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.ruoyi.system.mapper.AppPmsOrderInMapper">
<resultMap type="AppPmsOrderIn" id="AppPmsOrderInResult">
<result property="listId" column="list_id" />
<result property="orderType" column="order_type" />
<result property="customerId" column="customer_id" />
<result property="orderId" column="order_id" />
<result property="goodsId" column="goods_id" />
<result property="goodsNum" column="goods_num" />
<result property="goodsCode" column="goods_code" />
<result property="goodsDesc" column="goods_desc" />
<result property="unit" column="unit" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="orderStatus" column="order_status" />
</resultMap>
<sql id="selectAppPmsOrderInVo">
select list_id, order_type, customer_id, order_id, goods_id, goods_num, goods_code, goods_desc, unit, spare1, spare2, order_status from app_pms_order_in
</sql>
<select id="selectAppPmsOrderInList" parameterType="AppPmsOrderIn" resultMap="AppPmsOrderInResult">
<include refid="selectAppPmsOrderInVo"/>
<where>
<if test="orderType != null "> and order_type = #{orderType}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
<if test="goodsNum != null "> and goods_num = #{goodsNum}</if>
<if test="goodsCode != null and goodsCode != ''"> and goods_code = #{goodsCode}</if>
<if test="goodsDesc != null and goodsDesc != ''"> and goods_desc = #{goodsDesc}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="orderStatus != null "> and order_status = #{orderStatus}</if>
</where>
</select>
<select id="selectAppPmsOrderInByListId" parameterType="String" resultMap="AppPmsOrderInResult">
<include refid="selectAppPmsOrderInVo"/>
where list_id = #{listId}
</select>
<insert id="insertAppPmsOrderIn" parameterType="AppPmsOrderIn">
insert into app_pms_order_in
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="listId != null">list_id,</if>
<if test="orderType != null">order_type,</if>
<if test="customerId != null and customerId != ''">customer_id,</if>
<if test="orderId != null and orderId != ''">order_id,</if>
<if test="goodsId != null and goodsId != ''">goods_id,</if>
<if test="goodsNum != null">goods_num,</if>
<if test="goodsCode != null and goodsCode != ''">goods_code,</if>
<if test="goodsDesc != null and goodsDesc != ''">goods_desc,</if>
<if test="unit != null and unit != ''">unit,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="orderStatus != null">order_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="listId != null">#{listId},</if>
<if test="orderType != null">#{orderType},</if>
<if test="customerId != null and customerId != ''">#{customerId},</if>
<if test="orderId != null and orderId != ''">#{orderId},</if>
<if test="goodsId != null and goodsId != ''">#{goodsId},</if>
<if test="goodsNum != null">#{goodsNum},</if>
<if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
<if test="goodsDesc != null and goodsDesc != ''">#{goodsDesc},</if>
<if test="unit != null and unit != ''">#{unit},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="orderStatus != null">#{orderStatus},</if>
</trim>
</insert>
<update id="updateAppPmsOrderIn" parameterType="AppPmsOrderIn">
update app_pms_order_in
<trim prefix="SET" suffixOverrides=",">
<if test="orderType != null">order_type = #{orderType},</if>
<if test="customerId != null and customerId != ''">customer_id = #{customerId},</if>
<if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
<if test="goodsId != null and goodsId != ''">goods_id = #{goodsId},</if>
<if test="goodsNum != null">goods_num = #{goodsNum},</if>
<if test="goodsCode != null and goodsCode != ''">goods_code = #{goodsCode},</if>
<if test="goodsDesc != null and goodsDesc != ''">goods_desc = #{goodsDesc},</if>
<if test="unit != null and unit != ''">unit = #{unit},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="orderStatus != null">order_status = #{orderStatus},</if>
</trim>
where list_id = #{listId}
</update>
<delete id="deleteAppPmsOrderInByListId" parameterType="String">
delete from app_pms_order_in where list_id = #{listId}
</delete>
<delete id="deleteAppPmsOrderInByListIds" parameterType="String">
delete from app_pms_order_in where list_id in
<foreach item="listId" collection="array" open="(" separator="," close=")">
#{listId}
</foreach>
</delete>
</mapper>

130
ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml
View File

@ -1,130 +0,0 @@
<?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.ruoyi.app.mapper.AppPmsOrderOutMapper">
<resultMap type="AppPmsOrderOut" id="AppPmsOrderOutResult">
<id property="recordId" column="record_id" />
<result property="listId" column="list_id" />
<result property="orderType" column="order_type" />
<result property="customerId" column="customer_id" />
<result property="goodsId" column="goods_id" />
<result property="goodsNum" column="goods_num" />
<result property="pickNum" column="pick_num" />
<result property="trNum" column="tr_num" />
<result property="shelvesNum" column="shelves_num" />
<result property="stockNum" column="stock_num" />
<result property="goodsDesc" column="goods_desc" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="orderStatus" column="order_status" />
<result property="isLock" column="is_lock" />
<result property="orderId" column="order_id" />
</resultMap>
<sql id="selectAppPmsOrderOutVo">
select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id from app_pms_order_out
</sql>
<select id="selectAppPmsOrderOutList" parameterType="AppPmsOrderOut" resultMap="AppPmsOrderOutResult">
<include refid="selectAppPmsOrderOutVo"/>
<where>
<if test="listId != null "> and list_id = #{listId}</if>
<if test="orderType != null "> and order_type = #{orderType}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="isLock != null and isLock != ''"> and is_lock = #{isLock}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
</where>
</select>
<select id="selectAppPmsOrderOutByListId" parameterType="String" resultMap="AppPmsOrderOutResult">
<include refid="selectAppPmsOrderOutVo"/>
where record_id = #{recordId}
</select>
<insert id="insertAppPmsOrderOut" parameterType="AppPmsOrderOut">
insert into app_pms_order_out
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="listId != null">list_id,</if>
<if test="orderType != null">order_type,</if>
<if test="customerId != null and customerId != ''">customer_id,</if>
<if test="goodsId != null and goodsId != ''">goods_id,</if>
<if test="goodsNum != null">goods_num,</if>
<if test="goodsDesc != null and goodsDesc != ''">goods_desc,</if>
<if test="spare1 != null and spare1 != ''">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="pickNum != null">pick_num,</if>
<if test="trNum != null">tr_num,</if>
<if test="shelvesNum != null">shelves_num,</if>
<if test="stockNum != null">stock_num,</if>
<if test="orderStatus != null">order_status,</if>
<if test="isLock != null">is_lock,</if>
<if test="orderId != null">order_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="listId != null">#{listId},</if>
<if test="orderType != null">#{orderType},</if>
<if test="customerId != null and customerId != ''">#{customerId},</if>
<if test="goodsId != null and goodsId != ''">#{goodsId},</if>
<if test="goodsNum != null">#{goodsNum},</if>
<if test="goodsDesc != null and goodsDesc != ''">#{goodsDesc},</if>
<if test="spare1 != null and spare1 != ''">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="pickNum != null">#{pickNum},</if>
<if test="trNum != null">#{trNum},</if>
<if test="shelvesNum != null">#{shelvesNum},</if>
<if test="stockNum != null">#{stockNum},</if>
<if test="orderStatus != null">#{orderStatus},</if>
<if test="isLock != null">#{isLock},</if>
<if test="orderId != null">#{orderId},</if>
</trim>
</insert>
<update id="updateAppPmsOrderOut" parameterType="AppPmsOrderOut">
update app_pms_order_out
<trim prefix="SET" suffixOverrides=",">
<if test="listId != null">list_id = #{listId},</if>
<if test="orderType != null">order_type = #{orderType},</if>
<if test="customerId != null and customerId != ''">customer_id = #{customerId},</if>
<if test="goodsId != null and goodsId != ''">goods_id = #{goodsId},</if>
<if test="goodsNum != null">goods_num = #{goodsNum},</if>
<if test="goodsDesc != null and goodsDesc != ''">goods_desc = #{goodsDesc},</if>
<if test="spare1 != null and spare1 != ''">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="pickNum != null">pick_num = #{pickNum},</if>
<if test="trNum != null">tr_num = #{trNum},</if>
<if test="shelvesNum != null">shelves_num = #{shelvesNum},</if>
<if test="stockNum != null">stock_num = #{stockNum},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
</trim>
where record_id = #{recordId}
</update>
<update id="updatePickNum" parameterType="AppPmsOrderOut">
update app_pms_order_out
<trim prefix="SET" suffixOverrides=",">
<if test="pickNum != null">pick_num = #{pickNum},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
</trim>
where record_id = #{recordId}
</update>
<delete id="deleteAppPmsOrderOutByListId" parameterType="String">
delete from app_pms_order_out where record_id = #{recordId}
</delete>
<delete id="deleteAppPmsOrderOutByOrderId" parameterType="AppPmsOrderOut">
delete from app_pms_order_out where order_id = #{orderId}
</delete>
<delete id="deleteAppPmsOrderOutByListIds" parameterType="String">
delete from app_pms_order_out where record_id in
<foreach item="record_id" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>

83
ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml
View File

@ -1,83 +0,0 @@
<?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.ruoyi.system.mapper.AppProviderMapper">
<resultMap type="AppProvider" id="AppProviderResult">
<result property="providerId" column="provider_id" />
<result property="providerName" column="provider_name" />
<result property="providerContact" column="provider_contact" />
<result property="providerAddress" column="provider_address" />
<result property="providerStatus" column="provider_status" />
<result property="lastUpdateUser" column="last_update_user" />
<result property="lastUpdateTime" column="last_update_time" />
</resultMap>
<sql id="selectAppProviderVo">
select provider_id, provider_name, provider_contact, provider_address, provider_status, last_update_user, last_update_time from app_provider
</sql>
<select id="selectAppProviderList" parameterType="AppProvider" resultMap="AppProviderResult">
<include refid="selectAppProviderVo"/>
<where>
<if test="providerName != null and providerName != ''"> and provider_name like concat('%', #{providerName}, '%')</if>
<if test="providerContact != null "> and provider_contact = #{providerContact}</if>
<if test="providerAddress != null and providerAddress != ''"> and provider_address = #{providerAddress}</if>
<if test="providerStatus != null "> and provider_status = #{providerStatus}</if>
<if test="lastUpdateUser != null and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
<if test="lastUpdateTime != null "> and last_update_time = #{lastUpdateTime}</if>
</where>
</select>
<select id="selectAppProviderByProviderId" parameterType="String" resultMap="AppProviderResult">
<include refid="selectAppProviderVo"/>
where provider_id = #{providerId}
</select>
<insert id="insertAppProvider" parameterType="AppProvider">
insert into app_provider
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="providerId != null">provider_id,</if>
<if test="providerName != null">provider_name,</if>
<if test="providerContact != null">provider_contact,</if>
<if test="providerAddress != null">provider_address,</if>
<if test="providerStatus != null">provider_status,</if>
<if test="lastUpdateUser != null">last_update_user,</if>
<if test="lastUpdateTime != null">last_update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="providerId != null">#{providerId},</if>
<if test="providerName != null">#{providerName},</if>
<if test="providerContact != null">#{providerContact},</if>
<if test="providerAddress != null">#{providerAddress},</if>
<if test="providerStatus != null">#{providerStatus},</if>
<if test="lastUpdateUser != null">#{lastUpdateUser},</if>
<if test="lastUpdateTime != null">#{lastUpdateTime},</if>
</trim>
</insert>
<update id="updateAppProvider" parameterType="AppProvider">
update app_provider
<trim prefix="SET" suffixOverrides=",">
<if test="providerName != null">provider_name = #{providerName},</if>
<if test="providerContact != null">provider_contact = #{providerContact},</if>
<if test="providerAddress != null">provider_address = #{providerAddress},</if>
<if test="providerStatus != null">provider_status = #{providerStatus},</if>
<if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
<if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
</trim>
where provider_id = #{providerId}
</update>
<delete id="deleteAppProviderByProviderId" parameterType="String">
delete from app_provider where provider_id = #{providerId}
</delete>
<delete id="deleteAppProviderByProviderIds" parameterType="String">
delete from app_provider where provider_id in
<foreach item="providerId" collection="array" open="(" separator="," close=")">
#{providerId}
</foreach>
</delete>
</mapper>

87
ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml
View File

@ -1,87 +0,0 @@
<?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.ruoyi.system.mapper.AppStandMapper">
<resultMap type="AppStand" id="AppStandResult">
<result property="standId" column="stand_id" />
<result property="standName" column="stand_name" />
<result property="standType" column="stand_type" />
<result property="standArea" column="stand_area" />
<result property="standProperty" column="stand_property" />
<result property="standStatus" column="stand_status" />
<result property="isLock" column="is_lock" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectAppStandVo">
select stand_id, stand_name, stand_type, stand_area, stand_property, stand_status, is_lock, remark from app_stand
</sql>
<select id="selectAppStandList" parameterType="AppStand" resultMap="AppStandResult">
<include refid="selectAppStandVo"/>
<where>
<if test="standName != null and standName != ''"> and stand_name like concat('%', #{standName}, '%')</if>
<if test="standType != null and standType != ''"> and stand_type = #{standType}</if>
<if test="standArea != null and standArea != ''"> and stand_area = #{standArea}</if>
<if test="standProperty != null and standProperty != ''"> and stand_property = #{standProperty}</if>
<if test="standStatus != null "> and stand_status = #{standStatus}</if>
<if test="isLock != null "> and is_lock = #{isLock}</if>
</where>
</select>
<select id="selectAppStandByStandId" parameterType="String" resultMap="AppStandResult">
<include refid="selectAppStandVo"/>
where stand_id = #{standId}
</select>
<insert id="insertAppStand" parameterType="AppStand">
insert into app_stand
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="standId != null">stand_id,</if>
<if test="standName != null and standName != ''">stand_name,</if>
<if test="standType != null and standType != ''">stand_type,</if>
<if test="standArea != null and standArea != ''">stand_area,</if>
<if test="standProperty != null and standProperty != ''">stand_property,</if>
<if test="standStatus != null">stand_status,</if>
<if test="isLock != null">is_lock,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="standId != null">#{standId},</if>
<if test="standName != null and standName != ''">#{standName},</if>
<if test="standType != null and standType != ''">#{standType},</if>
<if test="standArea != null and standArea != ''">#{standArea},</if>
<if test="standProperty != null and standProperty != ''">#{standProperty},</if>
<if test="standStatus != null">#{standStatus},</if>
<if test="isLock != null">#{isLock},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateAppStand" parameterType="AppStand">
update app_stand
<trim prefix="SET" suffixOverrides=",">
<if test="standName != null and standName != ''">stand_name = #{standName},</if>
<if test="standType != null and standType != ''">stand_type = #{standType},</if>
<if test="standArea != null and standArea != ''">stand_area = #{standArea},</if>
<if test="standProperty != null and standProperty != ''">stand_property = #{standProperty},</if>
<if test="standStatus != null">stand_status = #{standStatus},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where stand_id = #{standId}
</update>
<delete id="deleteAppStandByStandId" parameterType="String">
delete from app_stand where stand_id = #{standId}
</delete>
<delete id="deleteAppStandByStandIds" parameterType="String">
delete from app_stand where stand_id in
<foreach item="standId" collection="array" open="(" separator="," close=")">
#{standId}
</foreach>
</delete>
</mapper>

141
ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml
View File

@ -1,141 +0,0 @@
<?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.ruoyi.system.mapper.AppStockMapper">
<resultMap type="AppStock" id="AppStockResult">
<result property="stockId" column="stock_id" />
<result property="vehicleId" column="vehicle_id" />
<result property="locationId" column="location_id" />
<result property="goodsId" column="goods_id" />
<result property="goodsName" column="goods_name" />
<result property="goodsUnit" column="goods_unit" />
<result property="providerId" column="provider_id" />
<result property="providerName" column="provider_name" />
<result property="remainNum" column="remain_num" />
<result property="originNum" column="origin_num" />
<result property="batchNo" column="batch_no" />
<result property="invAge" column="inv_age" />
<result property="goodsStatus" column="goods_status" />
<result property="stockStatus" column="stock_status" />
<result property="createTime" column="create_time" />
<result property="createUser" column="create_user" />
<result property="lastUpdateTime" column="last_update_time" />
<result property="lastUpdateUser" column="last_update_user" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectAppStockVo">
select stock_id, vehicle_id, location_id, goods_id, goods_name, goods_unit, provider_id, provider_name, remain_num, origin_num, batch_no, inv_age, goods_status, stock_status, create_time, create_user, last_update_time, last_update_user, remark from app_stock
</sql>
<select id="selectAppStockList" parameterType="AppStock" resultMap="AppStockResult">
<include refid="selectAppStockVo"/>
<where>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
<if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
<if test="goodsUnit != null and goodsUnit != ''"> and goods_unit = #{goodsUnit}</if>
<if test="providerId != null and providerId != ''"> and provider_id = #{providerId}</if>
<if test="providerName != null and providerName != ''"> and provider_name like concat('%', #{providerName}, '%')</if>
<if test="remainNum != null "> and remain_num = #{remainNum}</if>
<if test="originNum != null "> and origin_num = #{originNum}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
<if test="invAge != null "> and inv_age = #{invAge}</if>
<if test="goodsStatus != null "> and goods_status = #{goodsStatus}</if>
<if test="stockStatus != null "> and stock_status = #{stockStatus}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="lastUpdateTime != null "> and last_update_time = #{lastUpdateTime}</if>
<if test="lastUpdateUser != null and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
</where>
</select>
<select id="selectAppStockByStockId" parameterType="String" resultMap="AppStockResult">
<include refid="selectAppStockVo"/>
where stock_id = #{stockId}
</select>
<insert id="insertAppStock" parameterType="AppStock">
insert into app_stock
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="stockId != null">stock_id,</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id,</if>
<if test="locationId != null and locationId != ''">location_id,</if>
<if test="goodsId != null and goodsId != ''">goods_id,</if>
<if test="goodsName != null">goods_name,</if>
<if test="goodsUnit != null">goods_unit,</if>
<if test="providerId != null and providerId != ''">provider_id,</if>
<if test="providerName != null">provider_name,</if>
<if test="remainNum != null">remain_num,</if>
<if test="originNum != null">origin_num,</if>
<if test="batchNo != null">batch_no,</if>
<if test="invAge != null">inv_age,</if>
<if test="goodsStatus != null">goods_status,</if>
<if test="stockStatus != null">stock_status,</if>
<if test="createTime != null">create_time,</if>
<if test="createUser != null">create_user,</if>
<if test="lastUpdateTime != null">last_update_time,</if>
<if test="lastUpdateUser != null">last_update_user,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockId != null">#{stockId},</if>
<if test="vehicleId != null and vehicleId != ''">#{vehicleId},</if>
<if test="locationId != null and locationId != ''">#{locationId},</if>
<if test="goodsId != null and goodsId != ''">#{goodsId},</if>
<if test="goodsName != null">#{goodsName},</if>
<if test="goodsUnit != null">#{goodsUnit},</if>
<if test="providerId != null and providerId != ''">#{providerId},</if>
<if test="providerName != null">#{providerName},</if>
<if test="remainNum != null">#{remainNum},</if>
<if test="originNum != null">#{originNum},</if>
<if test="batchNo != null">#{batchNo},</if>
<if test="invAge != null">#{invAge},</if>
<if test="goodsStatus != null">#{goodsStatus},</if>
<if test="stockStatus != null">#{stockStatus},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUser != null">#{createUser},</if>
<if test="lastUpdateTime != null">#{lastUpdateTime},</if>
<if test="lastUpdateUser != null">#{lastUpdateUser},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateAppStock" parameterType="AppStock">
update app_stock
<trim prefix="SET" suffixOverrides=",">
<if test="vehicleId != null and vehicleId != ''">vehicle_id = #{vehicleId},</if>
<if test="locationId != null and locationId != ''">location_id = #{locationId},</if>
<if test="goodsId != null and goodsId != ''">goods_id = #{goodsId},</if>
<if test="goodsName != null">goods_name = #{goodsName},</if>
<if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
<if test="providerId != null and providerId != ''">provider_id = #{providerId},</if>
<if test="providerName != null">provider_name = #{providerName},</if>
<if test="remainNum != null">remain_num = #{remainNum},</if>
<if test="originNum != null">origin_num = #{originNum},</if>
<if test="batchNo != null">batch_no = #{batchNo},</if>
<if test="invAge != null">inv_age = #{invAge},</if>
<if test="goodsStatus != null">goods_status = #{goodsStatus},</if>
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createUser != null">create_user = #{createUser},</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>
</trim>
where stock_id = #{stockId}
</update>
<delete id="deleteAppStockByStockId" parameterType="String">
delete from app_stock where stock_id = #{stockId}
</delete>
<delete id="deleteAppStockByStockIds" parameterType="String">
delete from app_stock where stock_id in
<foreach item="stockId" collection="array" open="(" separator="," close=")">
#{stockId}
</foreach>
</delete>
</mapper>

122
ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml
View File

@ -1,122 +0,0 @@
<?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.ruoyi.system.mapper.AppTaskBakMapper">
<resultMap type="AppTaskBak" id="AppTaskBakResult">
<result property="taskId" column="task_id" />
<result property="taskType" column="task_type" />
<result property="taskStatus" column="task_status" />
<result property="taskPriority" column="task_priority" />
<result property="vehicleId" column="vehicle_id" />
<result property="origin" column="origin" />
<result property="destination" column="destination" />
<result property="wcsTaskId" column="wcs_task_id" />
<result property="createTime" column="create_time" />
<result property="finishTime" column="finish_time" />
<result property="goodsId" column="goods_id" />
<result property="opNum" column="op_num" />
<result property="stockNum" column="stock_num" />
<result property="opUser" column="op_user" />
<result property="preTask" column="pre_task" />
</resultMap>
<sql id="selectAppTaskBakVo">
select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task from app_task_bak
</sql>
<select id="selectAppTaskBakList" parameterType="AppTaskBak" resultMap="AppTaskBakResult">
<include refid="selectAppTaskBakVo"/>
<where>
<if test="taskType != null "> and task_type = #{taskType}</if>
<if test="taskStatus != null "> and task_status = #{taskStatus}</if>
<if test="taskPriority != null "> and task_priority = #{taskPriority}</if>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="origin != null and origin != ''"> and origin = #{origin}</if>
<if test="destination != null and destination != ''"> and destination = #{destination}</if>
<if test="wcsTaskId != null and wcsTaskId != ''"> and wcs_task_id = #{wcsTaskId}</if>
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
<if test="opNum != null "> and op_num = #{opNum}</if>
<if test="stockNum != null "> and stock_num = #{stockNum}</if>
<if test="opUser != null and opUser != ''"> and op_user = #{opUser}</if>
<if test="preTask != null and preTask != ''"> and pre_task = #{preTask}</if>
</where>
</select>
<select id="selectAppTaskBakByTaskId" parameterType="String" resultMap="AppTaskBakResult">
<include refid="selectAppTaskBakVo"/>
where task_id = #{taskId}
</select>
<insert id="insertAppTaskBak" parameterType="AppTaskBak">
insert into 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="taskPriority != null">task_priority,</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id,</if>
<if test="origin != null">origin,</if>
<if test="destination != null">destination,</if>
<if test="wcsTaskId != null">wcs_task_id,</if>
<if test="createTime != null">create_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="goodsId != null">goods_id,</if>
<if test="opNum != null">op_num,</if>
<if test="stockNum != null">stock_num,</if>
<if test="opUser != null">op_user,</if>
<if test="preTask != null">pre_task,</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="taskPriority != null">#{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">#{vehicleId},</if>
<if test="origin != null">#{origin},</if>
<if test="destination != null">#{destination},</if>
<if test="wcsTaskId != null">#{wcsTaskId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="goodsId != null">#{goodsId},</if>
<if test="opNum != null">#{opNum},</if>
<if test="stockNum != null">#{stockNum},</if>
<if test="opUser != null">#{opUser},</if>
<if test="preTask != null">#{preTask},</if>
</trim>
</insert>
<update id="updateAppTaskBak" parameterType="AppTaskBak">
update app_task_bak
<trim prefix="SET" suffixOverrides=",">
<if test="taskType != null">task_type = #{taskType},</if>
<if test="taskStatus != null">task_status = #{taskStatus},</if>
<if test="taskPriority != null">task_priority = #{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id = #{vehicleId},</if>
<if test="origin != null">origin = #{origin},</if>
<if test="destination != null">destination = #{destination},</if>
<if test="wcsTaskId != null">wcs_task_id = #{wcsTaskId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="goodsId != null">goods_id = #{goodsId},</if>
<if test="opNum != null">op_num = #{opNum},</if>
<if test="stockNum != null">stock_num = #{stockNum},</if>
<if test="opUser != null">op_user = #{opUser},</if>
<if test="preTask != null">pre_task = #{preTask},</if>
</trim>
where task_id = #{taskId}
</update>
<delete id="deleteAppTaskBakByTaskId" parameterType="String">
delete from app_task_bak where task_id = #{taskId}
</delete>
<delete id="deleteAppTaskBakByTaskIds" parameterType="String">
delete from app_task_bak where task_id in
<foreach item="taskId" collection="array" open="(" separator="," close=")">
#{taskId}
</foreach>
</delete>
</mapper>

122
ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml
View File

@ -1,122 +0,0 @@
<?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.ruoyi.system.mapper.AppTaskMapper">
<resultMap type="AppTask" id="AppTaskResult">
<result property="taskId" column="task_id" />
<result property="taskType" column="task_type" />
<result property="taskStatus" column="task_status" />
<result property="taskPriority" column="task_priority" />
<result property="vehicleId" column="vehicle_id" />
<result property="origin" column="origin" />
<result property="destination" column="destination" />
<result property="wcsTaskId" column="wcs_task_id" />
<result property="createTime" column="create_time" />
<result property="finishTime" column="finish_time" />
<result property="goodsId" column="goods_id" />
<result property="opNum" column="op_num" />
<result property="stockNum" column="stock_num" />
<result property="opUser" column="op_user" />
<result property="preTask" column="pre_task" />
</resultMap>
<sql id="selectAppTaskVo">
select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task from app_task
</sql>
<select id="selectAppTaskList" parameterType="AppTask" resultMap="AppTaskResult">
<include refid="selectAppTaskVo"/>
<where>
<if test="taskType != null "> and task_type = #{taskType}</if>
<if test="taskStatus != null "> and task_status = #{taskStatus}</if>
<if test="taskPriority != null "> and task_priority = #{taskPriority}</if>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="origin != null and origin != ''"> and origin = #{origin}</if>
<if test="destination != null and destination != ''"> and destination = #{destination}</if>
<if test="wcsTaskId != null and wcsTaskId != ''"> and wcs_task_id = #{wcsTaskId}</if>
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
<if test="opNum != null "> and op_num = #{opNum}</if>
<if test="stockNum != null "> and stock_num = #{stockNum}</if>
<if test="opUser != null and opUser != ''"> and op_user = #{opUser}</if>
<if test="preTask != null and preTask != ''"> and pre_task = #{preTask}</if>
</where>
</select>
<select id="selectAppTaskByTaskId" parameterType="String" resultMap="AppTaskResult">
<include refid="selectAppTaskVo"/>
where task_id = #{taskId}
</select>
<insert id="insertAppTask" parameterType="AppTask">
insert into 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="taskPriority != null">task_priority,</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id,</if>
<if test="origin != null">origin,</if>
<if test="destination != null">destination,</if>
<if test="wcsTaskId != null">wcs_task_id,</if>
<if test="createTime != null">create_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="goodsId != null">goods_id,</if>
<if test="opNum != null">op_num,</if>
<if test="stockNum != null">stock_num,</if>
<if test="opUser != null">op_user,</if>
<if test="preTask != null">pre_task,</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="taskPriority != null">#{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">#{vehicleId},</if>
<if test="origin != null">#{origin},</if>
<if test="destination != null">#{destination},</if>
<if test="wcsTaskId != null">#{wcsTaskId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="goodsId != null">#{goodsId},</if>
<if test="opNum != null">#{opNum},</if>
<if test="stockNum != null">#{stockNum},</if>
<if test="opUser != null">#{opUser},</if>
<if test="preTask != null">#{preTask},</if>
</trim>
</insert>
<update id="updateAppTask" parameterType="AppTask">
update app_task
<trim prefix="SET" suffixOverrides=",">
<if test="taskType != null">task_type = #{taskType},</if>
<if test="taskStatus != null">task_status = #{taskStatus},</if>
<if test="taskPriority != null">task_priority = #{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id = #{vehicleId},</if>
<if test="origin != null">origin = #{origin},</if>
<if test="destination != null">destination = #{destination},</if>
<if test="wcsTaskId != null">wcs_task_id = #{wcsTaskId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="goodsId != null">goods_id = #{goodsId},</if>
<if test="opNum != null">op_num = #{opNum},</if>
<if test="stockNum != null">stock_num = #{stockNum},</if>
<if test="opUser != null">op_user = #{opUser},</if>
<if test="preTask != null">pre_task = #{preTask},</if>
</trim>
where task_id = #{taskId}
</update>
<delete id="deleteAppTaskByTaskId" parameterType="String">
delete from app_task where task_id = #{taskId}
</delete>
<delete id="deleteAppTaskByTaskIds" parameterType="String">
delete from app_task where task_id in
<foreach item="taskId" collection="array" open="(" separator="," close=")">
#{taskId}
</foreach>
</delete>
</mapper>

92
ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml
View File

@ -1,92 +0,0 @@
<?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.ruoyi.system.mapper.AppVehicleMapper">
<resultMap type="AppVehicle" id="AppVehicleResult">
<result property="vehicleId" column="vehicle_id" />
<result property="vehicleType" column="vehicle_type" />
<result property="vehicleStatus" column="vehicle_status" />
<result property="locationId" column="location_id" />
<result property="isEmpty" column="is_empty" />
<result property="isLock" column="is_lock" />
<result property="lastInTime" column="last_in_time" />
<result property="lastInUser" column="last_in_user" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectAppVehicleVo">
select vehicle_id, vehicle_type, vehicle_status, location_id, is_empty, is_lock, last_in_time, last_in_user, remark from app_vehicle
</sql>
<select id="selectAppVehicleList" parameterType="AppVehicle" resultMap="AppVehicleResult">
<include refid="selectAppVehicleVo"/>
<where>
<if test="vehicleType != null and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
<if test="vehicleStatus != null "> and vehicle_status = #{vehicleStatus}</if>
<if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
<if test="isEmpty != null "> and is_empty = #{isEmpty}</if>
<if test="isLock != null "> and is_lock = #{isLock}</if>
<if test="lastInTime != null "> and last_in_time = #{lastInTime}</if>
<if test="lastInUser != null and lastInUser != ''"> and last_in_user = #{lastInUser}</if>
</where>
</select>
<select id="selectAppVehicleByVehicleId" parameterType="String" resultMap="AppVehicleResult">
<include refid="selectAppVehicleVo"/>
where vehicle_id = #{vehicleId}
</select>
<insert id="insertAppVehicle" parameterType="AppVehicle">
insert into app_vehicle
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="vehicleId != null">vehicle_id,</if>
<if test="vehicleType != null and vehicleType != ''">vehicle_type,</if>
<if test="vehicleStatus != null">vehicle_status,</if>
<if test="locationId != null">location_id,</if>
<if test="isEmpty != null">is_empty,</if>
<if test="isLock != null">is_lock,</if>
<if test="lastInTime != null">last_in_time,</if>
<if test="lastInUser != null">last_in_user,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="vehicleId != null">#{vehicleId},</if>
<if test="vehicleType != null and vehicleType != ''">#{vehicleType},</if>
<if test="vehicleStatus != null">#{vehicleStatus},</if>
<if test="locationId != null">#{locationId},</if>
<if test="isEmpty != null">#{isEmpty},</if>
<if test="isLock != null">#{isLock},</if>
<if test="lastInTime != null">#{lastInTime},</if>
<if test="lastInUser != null">#{lastInUser},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateAppVehicle" parameterType="AppVehicle">
update app_vehicle
<trim prefix="SET" suffixOverrides=",">
<if test="vehicleType != null and vehicleType != ''">vehicle_type = #{vehicleType},</if>
<if test="vehicleStatus != null">vehicle_status = #{vehicleStatus},</if>
<if test="locationId != null">location_id = #{locationId},</if>
<if test="isEmpty != null">is_empty = #{isEmpty},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
<if test="lastInTime != null">last_in_time = #{lastInTime},</if>
<if test="lastInUser != null">last_in_user = #{lastInUser},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where vehicle_id = #{vehicleId}
</update>
<delete id="deleteAppVehicleByVehicleId" parameterType="String">
delete from app_vehicle where vehicle_id = #{vehicleId}
</delete>
<delete id="deleteAppVehicleByVehicleIds" parameterType="String">
delete from app_vehicle where vehicle_id in
<foreach item="vehicleId" collection="array" open="(" separator="," close=")">
#{vehicleId}
</foreach>
</delete>
</mapper>

82
ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml
View File

@ -1,82 +0,0 @@
<?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.ruoyi.system.mapper.AppWaveMapper">
<resultMap type="AppWave" id="AppWaveResult">
<result property="waveId" column="wave_id" />
<result property="outRule" column="out_rule" />
<result property="isChad" column="is_chad" />
<result property="waveStatus" column="wave_status" />
<result property="orderWbs" column="order_wbs" />
<result property="remark" column="remark" />
<result property="waveDestination" column="wave_destination" />
</resultMap>
<sql id="selectAppWaveVo">
select wave_id, out_rule, is_chad, wave_status, order_wbs, remark, wave_destination from app_wave
</sql>
<select id="selectAppWaveList" parameterType="AppWave" resultMap="AppWaveResult">
<include refid="selectAppWaveVo"/>
<where>
<if test="outRule != null "> and out_rule = #{outRule}</if>
<if test="isChad != null "> and is_chad = #{isChad}</if>
<if test="waveStatus != null "> and wave_status = #{waveStatus}</if>
<if test="orderWbs != null and orderWbs != ''"> and order_wbs = #{orderWbs}</if>
<if test="waveDestination != null and waveDestination != ''"> and wave_destination = #{waveDestination}</if>
</where>
</select>
<select id="selectAppWaveByWaveId" parameterType="String" resultMap="AppWaveResult">
<include refid="selectAppWaveVo"/>
where wave_id = #{waveId}
</select>
<insert id="insertAppWave" parameterType="AppWave">
insert into app_wave
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="waveId != null">wave_id,</if>
<if test="outRule != null">out_rule,</if>
<if test="isChad != null">is_chad,</if>
<if test="waveStatus != null">wave_status,</if>
<if test="orderWbs != null">order_wbs,</if>
<if test="remark != null">remark,</if>
<if test="waveDestination != null and waveDestination != ''">wave_destination,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="waveId != null">#{waveId},</if>
<if test="outRule != null">#{outRule},</if>
<if test="isChad != null">#{isChad},</if>
<if test="waveStatus != null">#{waveStatus},</if>
<if test="orderWbs != null">#{orderWbs},</if>
<if test="remark != null">#{remark},</if>
<if test="waveDestination != null and waveDestination != ''">#{waveDestination},</if>
</trim>
</insert>
<update id="updateAppWave" parameterType="AppWave">
update app_wave
<trim prefix="SET" suffixOverrides=",">
<if test="outRule != null">out_rule = #{outRule},</if>
<if test="isChad != null">is_chad = #{isChad},</if>
<if test="waveStatus != null">wave_status = #{waveStatus},</if>
<if test="orderWbs != null">order_wbs = #{orderWbs},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="waveDestination != null and waveDestination != ''">wave_destination = #{waveDestination},</if>
</trim>
where wave_id = #{waveId}
</update>
<delete id="deleteAppWaveByWaveId" parameterType="String">
delete from app_wave where wave_id = #{waveId}
</delete>
<delete id="deleteAppWaveByWaveIds" parameterType="String">
delete from app_wave where wave_id in
<foreach item="waveId" collection="array" open="(" separator="," close=")">
#{waveId}
</foreach>
</delete>
</mapper>

101
ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml
View File

@ -1,101 +0,0 @@
<?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.ruoyi.system.mapper.AppWcsTaskBakMapper">
<resultMap type="AppWcsTaskBak" id="AppWcsTaskBakResult">
<result property="wcsTaskId" column="wcs_task_id" />
<result property="wcsTaskStatus" column="wcs_task_status" />
<result property="wcsTaskType" column="wcs_task_type" />
<result property="taskPriority" column="task_priority" />
<result property="vehicleId" column="vehicle_id" />
<result property="origin" column="origin" />
<result property="destination" column="destination" />
<result property="createTime" column="create_time" />
<result property="sendTime" column="send_time" />
<result property="finishTime" column="finish_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectAppWcsTaskBakVo">
select wcs_task_id, wcs_task_status, wcs_task_type, task_priority, vehicle_id, origin, destination, create_time, send_time, finish_time, remark from app_wcs_task_bak
</sql>
<select id="selectAppWcsTaskBakList" parameterType="AppWcsTaskBak" resultMap="AppWcsTaskBakResult">
<include refid="selectAppWcsTaskBakVo"/>
<where>
<if test="wcsTaskStatus != null "> and wcs_task_status = #{wcsTaskStatus}</if>
<if test="wcsTaskType != null "> and wcs_task_type = #{wcsTaskType}</if>
<if test="taskPriority != null "> and task_priority = #{taskPriority}</if>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="origin != null and origin != ''"> and origin = #{origin}</if>
<if test="destination != null and destination != ''"> and destination = #{destination}</if>
<if test="sendTime != null "> and send_time = #{sendTime}</if>
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
</where>
</select>
<select id="selectAppWcsTaskBakByWcsTaskId" parameterType="String" resultMap="AppWcsTaskBakResult">
<include refid="selectAppWcsTaskBakVo"/>
where wcs_task_id = #{wcsTaskId}
</select>
<insert id="insertAppWcsTaskBak" parameterType="AppWcsTaskBak">
insert into app_wcs_task_bak
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wcsTaskId != null">wcs_task_id,</if>
<if test="wcsTaskStatus != null">wcs_task_status,</if>
<if test="wcsTaskType != null">wcs_task_type,</if>
<if test="taskPriority != null">task_priority,</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id,</if>
<if test="origin != null and origin != ''">origin,</if>
<if test="destination != null and destination != ''">destination,</if>
<if test="createTime != null">create_time,</if>
<if test="sendTime != null">send_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wcsTaskId != null">#{wcsTaskId},</if>
<if test="wcsTaskStatus != null">#{wcsTaskStatus},</if>
<if test="wcsTaskType != null">#{wcsTaskType},</if>
<if test="taskPriority != null">#{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">#{vehicleId},</if>
<if test="origin != null and origin != ''">#{origin},</if>
<if test="destination != null and destination != ''">#{destination},</if>
<if test="createTime != null">#{createTime},</if>
<if test="sendTime != null">#{sendTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateAppWcsTaskBak" parameterType="AppWcsTaskBak">
update app_wcs_task_bak
<trim prefix="SET" suffixOverrides=",">
<if test="wcsTaskStatus != null">wcs_task_status = #{wcsTaskStatus},</if>
<if test="wcsTaskType != null">wcs_task_type = #{wcsTaskType},</if>
<if test="taskPriority != null">task_priority = #{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id = #{vehicleId},</if>
<if test="origin != null and origin != ''">origin = #{origin},</if>
<if test="destination != null and destination != ''">destination = #{destination},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="sendTime != null">send_time = #{sendTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where wcs_task_id = #{wcsTaskId}
</update>
<delete id="deleteAppWcsTaskBakByWcsTaskId" parameterType="String">
delete from app_wcs_task_bak where wcs_task_id = #{wcsTaskId}
</delete>
<delete id="deleteAppWcsTaskBakByWcsTaskIds" parameterType="String">
delete from app_wcs_task_bak where wcs_task_id in
<foreach item="wcsTaskId" collection="array" open="(" separator="," close=")">
#{wcsTaskId}
</foreach>
</delete>
</mapper>

101
ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml
View File

@ -1,101 +0,0 @@
<?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.ruoyi.system.mapper.AppWcsTaskMapper">
<resultMap type="AppWcsTask" id="AppWcsTaskResult">
<result property="wcsTaskId" column="wcs_task_id" />
<result property="wcsTaskStatus" column="wcs_task_status" />
<result property="wcsTaskType" column="wcs_task_type" />
<result property="taskPriority" column="task_priority" />
<result property="vehicleId" column="vehicle_id" />
<result property="origin" column="origin" />
<result property="destination" column="destination" />
<result property="createTime" column="create_time" />
<result property="sendTime" column="send_time" />
<result property="finishTime" column="finish_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectAppWcsTaskVo">
select wcs_task_id, wcs_task_status, wcs_task_type, task_priority, vehicle_id, origin, destination, create_time, send_time, finish_time, remark from app_wcs_task
</sql>
<select id="selectAppWcsTaskList" parameterType="AppWcsTask" resultMap="AppWcsTaskResult">
<include refid="selectAppWcsTaskVo"/>
<where>
<if test="wcsTaskStatus != null "> and wcs_task_status = #{wcsTaskStatus}</if>
<if test="wcsTaskType != null "> and wcs_task_type = #{wcsTaskType}</if>
<if test="taskPriority != null "> and task_priority = #{taskPriority}</if>
<if test="vehicleId != null and vehicleId != ''"> and vehicle_id = #{vehicleId}</if>
<if test="origin != null and origin != ''"> and origin = #{origin}</if>
<if test="destination != null and destination != ''"> and destination = #{destination}</if>
<if test="sendTime != null "> and send_time = #{sendTime}</if>
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
</where>
</select>
<select id="selectAppWcsTaskByWcsTaskId" parameterType="String" resultMap="AppWcsTaskResult">
<include refid="selectAppWcsTaskVo"/>
where wcs_task_id = #{wcsTaskId}
</select>
<insert id="insertAppWcsTask" parameterType="AppWcsTask">
insert into app_wcs_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wcsTaskId != null">wcs_task_id,</if>
<if test="wcsTaskStatus != null">wcs_task_status,</if>
<if test="wcsTaskType != null">wcs_task_type,</if>
<if test="taskPriority != null">task_priority,</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id,</if>
<if test="origin != null and origin != ''">origin,</if>
<if test="destination != null and destination != ''">destination,</if>
<if test="createTime != null">create_time,</if>
<if test="sendTime != null">send_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wcsTaskId != null">#{wcsTaskId},</if>
<if test="wcsTaskStatus != null">#{wcsTaskStatus},</if>
<if test="wcsTaskType != null">#{wcsTaskType},</if>
<if test="taskPriority != null">#{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">#{vehicleId},</if>
<if test="origin != null and origin != ''">#{origin},</if>
<if test="destination != null and destination != ''">#{destination},</if>
<if test="createTime != null">#{createTime},</if>
<if test="sendTime != null">#{sendTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateAppWcsTask" parameterType="AppWcsTask">
update app_wcs_task
<trim prefix="SET" suffixOverrides=",">
<if test="wcsTaskStatus != null">wcs_task_status = #{wcsTaskStatus},</if>
<if test="wcsTaskType != null">wcs_task_type = #{wcsTaskType},</if>
<if test="taskPriority != null">task_priority = #{taskPriority},</if>
<if test="vehicleId != null and vehicleId != ''">vehicle_id = #{vehicleId},</if>
<if test="origin != null and origin != ''">origin = #{origin},</if>
<if test="destination != null and destination != ''">destination = #{destination},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="sendTime != null">send_time = #{sendTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where wcs_task_id = #{wcsTaskId}
</update>
<delete id="deleteAppWcsTaskByWcsTaskId" parameterType="String">
delete from app_wcs_task where wcs_task_id = #{wcsTaskId}
</delete>
<delete id="deleteAppWcsTaskByWcsTaskIds" parameterType="String">
delete from app_wcs_task where wcs_task_id in
<foreach item="wcsTaskId" collection="array" open="(" separator="," close=")">
#{wcsTaskId}
</foreach>
</delete>
</mapper>