diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppProviderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppProviderController.java index e8daae97..ca5c84b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppProviderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppProviderController.java @@ -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 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 list = appProviderService.selectAppProviderList(appProvider); ExcelUtil util = new ExcelUtil(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)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java index 2081065c..bac02bae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java @@ -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; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppProviderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppProviderMapper.java index 16b5682d..46db8ec1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppProviderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppProviderMapper.java @@ -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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppProviderService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppProviderService.java index 6366e47b..5447045d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppProviderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppProviderService.java @@ -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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java index 842e6e15..5a7cd3a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java @@ -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()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java index 093a92d3..238b43f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java @@ -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); } } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml index ad28bd5e..7ed603c2 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml @@ -5,6 +5,7 @@ + @@ -16,7 +17,7 @@ - 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 - - where provider_id = #{providerId} + where id = #{id} insert into app_provider + id, provider_id, provider_name, provider_contact, @@ -50,6 +52,7 @@ last_update_time, + #{id}, #{providerId}, #{providerName}, #{providerContact}, @@ -72,17 +75,17 @@ last_update_user = #{lastUpdateUser}, last_update_time = #{lastUpdateTime}, - where provider_id = #{providerId} + where id = #{id} - - delete from app_provider where provider_id = #{providerId} + + delete from app_provider where id = #{id} - - delete from app_provider where provider_id in - - #{providerId} + + delete from app_provider where id in + + #{id} diff --git a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml index 28a1bb0a..0afb6d74 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml @@ -51,7 +51,7 @@ and batch_no = #{batchNo} and goods_status = #{goodsStatus} and stock_status = #{stockStatus} - and storage_id = #{storage_id} + and storage_id = #{storageId} + diff --git a/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml deleted file mode 100644 index 33c072a4..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - select goods_id, goods_name, goods_unit, goods_type, normal_vehicle_type, goods_status, remark, last_update_user, last_update_time from app_goods - - - - - - - - insert into app_goods - - goods_id, - goods_name, - goods_unit, - goods_type, - normal_vehicle_type, - goods_status, - remark, - last_update_user, - last_update_time, - - - #{goodsId}, - #{goodsName}, - #{goodsUnit}, - #{goodsType}, - #{normalVehicleType}, - #{goodsStatus}, - #{remark}, - #{lastUpdateUser}, - #{lastUpdateTime}, - - - - - update app_goods - - goods_name = #{goodsName}, - goods_unit = #{goodsUnit}, - goods_type = #{goodsType}, - normal_vehicle_type = #{normalVehicleType}, - goods_status = #{goodsStatus}, - remark = #{remark}, - last_update_user = #{lastUpdateUser}, - last_update_time = #{lastUpdateTime}, - - where goods_id = #{goodsId} - - - - delete from app_goods where goods_id = #{goodsId} - - - - delete from app_goods where goods_id in - - #{goodsId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml deleted file mode 100644 index 0451b348..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - select pair_id, goods_id from app_goods_pair - - - - - - - - insert into app_goods_pair - - pair_id, - goods_id, - - - #{pairId}, - #{goodsId}, - - - - - update app_goods_pair - - goods_id = #{goodsId}, - - where pair_id = #{pairId} - - - - delete from app_goods_pair where pair_id = #{pairId} - - - - delete from app_goods_pair where pair_id in - - #{pairId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml deleted file mode 100644 index b3da16bd..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - select led_id from app_led_config - - - - - - - - insert into app_led_config - - led_id, - - - #{ledId}, - - - - - update app_led_config - - - where led_id = #{ledId} - - - - delete from app_led_config where led_id = #{ledId} - - - - delete from app_led_config where led_id in - - #{ledId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml deleted file mode 100644 index 2d771082..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_location - - 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, - - - #{locationId}, - #{locationType}, - #{locationStatus}, - #{outerId}, - #{areaId}, - #{tunnelId}, - #{equipmentId}, - #{wRow}, - #{wCol}, - #{wLayer}, - #{wDepth}, - #{isLock}, - #{vehicleId}, - #{remark}, - #{isWorking}, - - - - - update app_location - - location_type = #{locationType}, - location_status = #{locationStatus}, - outer_id = #{outerId}, - area_id = #{areaId}, - tunnel_id = #{tunnelId}, - equipment_id = #{equipmentId}, - w_row = #{wRow}, - w_col = #{wCol}, - w_layer = #{wLayer}, - w_depth = #{wDepth}, - is_lock = #{isLock}, - vehicle_id = #{vehicleId}, - remark = #{remark}, - is_working = #{isWorking}, - - where location_id = #{locationId} - - - - delete from app_location where location_id = #{locationId} - - - - delete from app_location where location_id in - - #{locationId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml deleted file mode 100644 index 1368288d..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_pms_order_in - - list_id, - order_type, - customer_id, - order_id, - goods_id, - goods_num, - goods_code, - goods_desc, - unit, - spare1, - spare2, - order_status, - - - #{listId}, - #{orderType}, - #{customerId}, - #{orderId}, - #{goodsId}, - #{goodsNum}, - #{goodsCode}, - #{goodsDesc}, - #{unit}, - #{spare1}, - #{spare2}, - #{orderStatus}, - - - - - update app_pms_order_in - - order_type = #{orderType}, - customer_id = #{customerId}, - order_id = #{orderId}, - goods_id = #{goodsId}, - goods_num = #{goodsNum}, - goods_code = #{goodsCode}, - goods_desc = #{goodsDesc}, - unit = #{unit}, - spare1 = #{spare1}, - spare2 = #{spare2}, - order_status = #{orderStatus}, - - where list_id = #{listId} - - - - delete from app_pms_order_in where list_id = #{listId} - - - - delete from app_pms_order_in where list_id in - - #{listId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml deleted file mode 100644 index f52fbf1f..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_pms_order_out - - 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, - - - #{recordId}, - #{listId}, - #{orderType}, - #{customerId}, - #{goodsId}, - #{goodsNum}, - #{goodsDesc}, - #{spare1}, - #{spare2}, - #{pickNum}, - #{trNum}, - #{shelvesNum}, - #{stockNum}, - #{orderStatus}, - #{isLock}, - #{orderId}, - - - - - update app_pms_order_out - - list_id = #{listId}, - order_type = #{orderType}, - customer_id = #{customerId}, - goods_id = #{goodsId}, - goods_num = #{goodsNum}, - goods_desc = #{goodsDesc}, - spare1 = #{spare1}, - spare2 = #{spare2}, - pick_num = #{pickNum}, - tr_num = #{trNum}, - shelves_num = #{shelvesNum}, - stock_num = #{stockNum}, - is_lock = #{isLock}, - - where record_id = #{recordId} - - - - update app_pms_order_out - - pick_num = #{pickNum}, - is_lock = #{isLock}, - - where record_id = #{recordId} - - - - delete from app_pms_order_out where record_id = #{recordId} - - - delete from app_pms_order_out where order_id = #{orderId} - - - - delete from app_pms_order_out where record_id in - - #{recordId} - - - diff --git a/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml deleted file mode 100644 index 71bf3948..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - select provider_id, provider_name, provider_contact, provider_address, provider_status, last_update_user, last_update_time from app_provider - - - - - - - - insert into app_provider - - provider_id, - provider_name, - provider_contact, - provider_address, - provider_status, - last_update_user, - last_update_time, - - - #{providerId}, - #{providerName}, - #{providerContact}, - #{providerAddress}, - #{providerStatus}, - #{lastUpdateUser}, - #{lastUpdateTime}, - - - - - update app_provider - - provider_name = #{providerName}, - provider_contact = #{providerContact}, - provider_address = #{providerAddress}, - provider_status = #{providerStatus}, - last_update_user = #{lastUpdateUser}, - last_update_time = #{lastUpdateTime}, - - where provider_id = #{providerId} - - - - delete from app_provider where provider_id = #{providerId} - - - - delete from app_provider where provider_id in - - #{providerId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml deleted file mode 100644 index c8d2ca28..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - select stand_id, stand_name, stand_type, stand_area, stand_property, stand_status, is_lock, remark from app_stand - - - - - - - - insert into app_stand - - stand_id, - stand_name, - stand_type, - stand_area, - stand_property, - stand_status, - is_lock, - remark, - - - #{standId}, - #{standName}, - #{standType}, - #{standArea}, - #{standProperty}, - #{standStatus}, - #{isLock}, - #{remark}, - - - - - update app_stand - - stand_name = #{standName}, - stand_type = #{standType}, - stand_area = #{standArea}, - stand_property = #{standProperty}, - stand_status = #{standStatus}, - is_lock = #{isLock}, - remark = #{remark}, - - where stand_id = #{standId} - - - - delete from app_stand where stand_id = #{standId} - - - - delete from app_stand where stand_id in - - #{standId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml deleted file mode 100644 index 6358a8fc..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_stock - - 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, - - - #{stockId}, - #{vehicleId}, - #{locationId}, - #{goodsId}, - #{goodsName}, - #{goodsUnit}, - #{providerId}, - #{providerName}, - #{remainNum}, - #{originNum}, - #{batchNo}, - #{invAge}, - #{goodsStatus}, - #{stockStatus}, - #{createTime}, - #{createUser}, - #{lastUpdateTime}, - #{lastUpdateUser}, - #{remark}, - - - - - update app_stock - - vehicle_id = #{vehicleId}, - location_id = #{locationId}, - goods_id = #{goodsId}, - goods_name = #{goodsName}, - goods_unit = #{goodsUnit}, - provider_id = #{providerId}, - provider_name = #{providerName}, - remain_num = #{remainNum}, - origin_num = #{originNum}, - batch_no = #{batchNo}, - inv_age = #{invAge}, - goods_status = #{goodsStatus}, - stock_status = #{stockStatus}, - create_time = #{createTime}, - create_user = #{createUser}, - last_update_time = #{lastUpdateTime}, - last_update_user = #{lastUpdateUser}, - remark = #{remark}, - - where stock_id = #{stockId} - - - - delete from app_stock where stock_id = #{stockId} - - - - delete from app_stock where stock_id in - - #{stockId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml deleted file mode 100644 index 9e7a687e..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_task_bak - - 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, - - - #{taskId}, - #{taskType}, - #{taskStatus}, - #{taskPriority}, - #{vehicleId}, - #{origin}, - #{destination}, - #{wcsTaskId}, - #{createTime}, - #{finishTime}, - #{goodsId}, - #{opNum}, - #{stockNum}, - #{opUser}, - #{preTask}, - - - - - update app_task_bak - - task_type = #{taskType}, - task_status = #{taskStatus}, - task_priority = #{taskPriority}, - vehicle_id = #{vehicleId}, - origin = #{origin}, - destination = #{destination}, - wcs_task_id = #{wcsTaskId}, - create_time = #{createTime}, - finish_time = #{finishTime}, - goods_id = #{goodsId}, - op_num = #{opNum}, - stock_num = #{stockNum}, - op_user = #{opUser}, - pre_task = #{preTask}, - - where task_id = #{taskId} - - - - delete from app_task_bak where task_id = #{taskId} - - - - delete from app_task_bak where task_id in - - #{taskId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml deleted file mode 100644 index 686802d8..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_task - - 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, - - - #{taskId}, - #{taskType}, - #{taskStatus}, - #{taskPriority}, - #{vehicleId}, - #{origin}, - #{destination}, - #{wcsTaskId}, - #{createTime}, - #{finishTime}, - #{goodsId}, - #{opNum}, - #{stockNum}, - #{opUser}, - #{preTask}, - - - - - update app_task - - task_type = #{taskType}, - task_status = #{taskStatus}, - task_priority = #{taskPriority}, - vehicle_id = #{vehicleId}, - origin = #{origin}, - destination = #{destination}, - wcs_task_id = #{wcsTaskId}, - create_time = #{createTime}, - finish_time = #{finishTime}, - goods_id = #{goodsId}, - op_num = #{opNum}, - stock_num = #{stockNum}, - op_user = #{opUser}, - pre_task = #{preTask}, - - where task_id = #{taskId} - - - - delete from app_task where task_id = #{taskId} - - - - delete from app_task where task_id in - - #{taskId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml deleted file mode 100644 index f5653181..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - select vehicle_id, vehicle_type, vehicle_status, location_id, is_empty, is_lock, last_in_time, last_in_user, remark from app_vehicle - - - - - - - - insert into app_vehicle - - vehicle_id, - vehicle_type, - vehicle_status, - location_id, - is_empty, - is_lock, - last_in_time, - last_in_user, - remark, - - - #{vehicleId}, - #{vehicleType}, - #{vehicleStatus}, - #{locationId}, - #{isEmpty}, - #{isLock}, - #{lastInTime}, - #{lastInUser}, - #{remark}, - - - - - update app_vehicle - - vehicle_type = #{vehicleType}, - vehicle_status = #{vehicleStatus}, - location_id = #{locationId}, - is_empty = #{isEmpty}, - is_lock = #{isLock}, - last_in_time = #{lastInTime}, - last_in_user = #{lastInUser}, - remark = #{remark}, - - where vehicle_id = #{vehicleId} - - - - delete from app_vehicle where vehicle_id = #{vehicleId} - - - - delete from app_vehicle where vehicle_id in - - #{vehicleId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml deleted file mode 100644 index 8ce3dccc..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - select wave_id, out_rule, is_chad, wave_status, order_wbs, remark, wave_destination from app_wave - - - - - - - - insert into app_wave - - wave_id, - out_rule, - is_chad, - wave_status, - order_wbs, - remark, - wave_destination, - - - #{waveId}, - #{outRule}, - #{isChad}, - #{waveStatus}, - #{orderWbs}, - #{remark}, - #{waveDestination}, - - - - - update app_wave - - out_rule = #{outRule}, - is_chad = #{isChad}, - wave_status = #{waveStatus}, - order_wbs = #{orderWbs}, - remark = #{remark}, - wave_destination = #{waveDestination}, - - where wave_id = #{waveId} - - - - delete from app_wave where wave_id = #{waveId} - - - - delete from app_wave where wave_id in - - #{waveId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml deleted file mode 100644 index a5c55511..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_wcs_task_bak - - wcs_task_id, - wcs_task_status, - wcs_task_type, - task_priority, - vehicle_id, - origin, - destination, - create_time, - send_time, - finish_time, - remark, - - - #{wcsTaskId}, - #{wcsTaskStatus}, - #{wcsTaskType}, - #{taskPriority}, - #{vehicleId}, - #{origin}, - #{destination}, - #{createTime}, - #{sendTime}, - #{finishTime}, - #{remark}, - - - - - update app_wcs_task_bak - - wcs_task_status = #{wcsTaskStatus}, - wcs_task_type = #{wcsTaskType}, - task_priority = #{taskPriority}, - vehicle_id = #{vehicleId}, - origin = #{origin}, - destination = #{destination}, - create_time = #{createTime}, - send_time = #{sendTime}, - finish_time = #{finishTime}, - remark = #{remark}, - - where wcs_task_id = #{wcsTaskId} - - - - delete from app_wcs_task_bak where wcs_task_id = #{wcsTaskId} - - - - delete from app_wcs_task_bak where wcs_task_id in - - #{wcsTaskId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml deleted file mode 100644 index 0f3980e8..00000000 --- a/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into app_wcs_task - - wcs_task_id, - wcs_task_status, - wcs_task_type, - task_priority, - vehicle_id, - origin, - destination, - create_time, - send_time, - finish_time, - remark, - - - #{wcsTaskId}, - #{wcsTaskStatus}, - #{wcsTaskType}, - #{taskPriority}, - #{vehicleId}, - #{origin}, - #{destination}, - #{createTime}, - #{sendTime}, - #{finishTime}, - #{remark}, - - - - - update app_wcs_task - - wcs_task_status = #{wcsTaskStatus}, - wcs_task_type = #{wcsTaskType}, - task_priority = #{taskPriority}, - vehicle_id = #{vehicleId}, - origin = #{origin}, - destination = #{destination}, - create_time = #{createTime}, - send_time = #{sendTime}, - finish_time = #{finishTime}, - remark = #{remark}, - - where wcs_task_id = #{wcsTaskId} - - - - delete from app_wcs_task where wcs_task_id = #{wcsTaskId} - - - - delete from app_wcs_task where wcs_task_id in - - #{wcsTaskId} - - - \ No newline at end of file