From a5a6325bd53e3b62c1f7cb0f4c05c26762a916e9 Mon Sep 17 00:00:00 2001 From: chc0125 <844857777@qq.com> Date: Sun, 23 Feb 2025 10:26:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppGoodsController.java | 2 + .../app/AppGoodsPairController.java | 5 +- .../app/AppLedConfigController.java | 5 +- .../controller/app/AppLocationController.java | 3 + .../app/AppPendingStorageController.java | 106 +++++++ .../web/controller/app/AppPmsController.java | 35 ++- .../app/AppPmsOrderInController.java | 5 +- .../app/AppPmsOrderOutController.java | 3 + .../controller/app/AppProviderController.java | 3 + .../controller/app/AppStandController.java | 3 + .../controller/app/AppStockController.java | 17 +- .../controller/app/AppTaskBakController.java | 5 +- .../web/controller/app/AppTaskController.java | 260 +++++++++++++++++- .../controller/app/AppVehicleController.java | 3 + .../web/controller/app/AppWaveController.java | 3 + .../app/AppWcsTaskBakController.java | 5 +- .../controller/app/AppWcsTaskController.java | 8 + .../controller/section/DataListAspect.java | 72 +++++ .../controller/section/EnhanceDataList.java | 12 + .../web/controller/section/ListColumns.java | 15 + .../java/com/ruoyi/web/domain/WcsDate.java | 72 +++++ .../ruoyi/web/domain/WcsLocationRequest.java | 52 ++++ .../ruoyi/common/core/page/TableDataInfo.java | 15 +- .../framework/config/SecurityConfig.java | 2 +- .../com/ruoyi/generator/util/ColumnUtils.java | 73 +++++ .../com/ruoyi/app/domain/AppLedConfig.java | 2 + .../com/ruoyi/app/domain/AppLocation.java | 1 + .../ruoyi/app/domain/AppPendingStorage.java | 237 ++++++++++++++++ .../com/ruoyi/app/domain/AppPmsOrderIn.java | 47 +++- .../app/mapper/AppPendingStorageMapper.java | 63 +++++ .../app/service/IAppLocationService.java | 2 + .../service/IAppPendingStorageService.java | 63 +++++ .../app/service/IAppPmsOrderInService.java | 2 + .../service/impl/AppLocationServiceImpl.java | 35 +++ .../impl/AppPendingStorageServiceImpl.java | 98 +++++++ .../impl/AppPmsOrderInServiceImpl.java | 2 + .../mapper/app/AppPendingStorageMapper.xml | 135 +++++++++ .../mapper/app/AppPmsOrderInMapper.xml | 29 +- .../mapper/system/AppGoodsMapper.xml | 92 +++++++ .../mapper/system/AppGoodsPairMapper.xml | 58 ++++ .../mapper/system/AppLedConfigMapper.xml | 53 ++++ .../mapper/system/AppLocationMapper.xml | 122 ++++++++ .../mapper/system/AppPmsOrderInMapper.xml | 108 ++++++++ .../mapper/system/AppPmsOrderOutMapper.xml | 93 +++++++ .../mapper/system/AppProviderMapper.xml | 83 ++++++ .../mapper/system/AppStandMapper.xml | 87 ++++++ .../mapper/system/AppStockMapper.xml | 141 ++++++++++ .../mapper/system/AppTaskBakMapper.xml | 122 ++++++++ .../resources/mapper/system/AppTaskMapper.xml | 122 ++++++++ .../mapper/system/AppVehicleMapper.xml | 92 +++++++ .../resources/mapper/system/AppWaveMapper.xml | 82 ++++++ .../mapper/system/AppWcsTaskBakMapper.xml | 101 +++++++ .../mapper/system/AppWcsTaskMapper.xml | 101 +++++++ 53 files changed, 2925 insertions(+), 32 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/DataListAspect.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/EnhanceDataList.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/ListColumns.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsDate.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsLocationRequest.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/util/ColumnUtils.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java index c4d80b24..57879901 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.AppGoods; import com.ruoyi.app.service.IAppGoodsService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +41,7 @@ public class AppGoodsController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:goods:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppGoods.class) public TableDataInfo list(AppGoods appGoods) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsPairController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsPairController.java index f0e6c413..dce17426 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsPairController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsPairController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppGoods; import com.ruoyi.app.domain.AppGoodsPair; import com.ruoyi.app.service.IAppGoodsPairService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/app/goodsPair") +@RequestMapping("/app/pair") public class AppGoodsPairController extends BaseController { @Autowired @@ -40,6 +42,7 @@ public class AppGoodsPairController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:pair:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppGoodsPair.class) public TableDataInfo list(AppGoodsPair appGoodsPair) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLedConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLedConfigController.java index 1d577aa4..e94d4fb0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLedConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLedConfigController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppGoodsPair; import com.ruoyi.app.domain.AppLedConfig; import com.ruoyi.app.service.IAppLedConfigService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/app/ledConfig") +@RequestMapping("/app/led") public class AppLedConfigController extends BaseController { @Autowired @@ -40,6 +42,7 @@ public class AppLedConfigController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppLedConfig.class) public TableDataInfo list(AppLedConfig appLedConfig) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java index 4f11ce5c..4db7fe27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java @@ -4,10 +4,12 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppLedConfig; import com.ruoyi.app.domain.AppLocation; import com.ruoyi.app.service.IAppLocationService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.web.controller.section.EnhanceDataList; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -46,6 +48,7 @@ public class AppLocationController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:location:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppLocation.class) public TableDataInfo list(AppLocation appLocation) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java new file mode 100644 index 00000000..c999ff9b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java @@ -0,0 +1,106 @@ +package com.ruoyi.web.controller.app; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.app.domain.AppPendingStorage; +import com.ruoyi.app.service.IAppPendingStorageService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 入库码盘Controller + * + * @author ruoyi + * @date 2025-02-22 + */ +@RestController +@RequestMapping("/system/storage") +public class AppPendingStorageController extends BaseController +{ + @Autowired + private IAppPendingStorageService appPendingStorageService; + + /** + * 查询入库码盘列表 + */ + @PreAuthorize("@ss.hasPermi('system:storage:list')") + @GetMapping("/list") + public TableDataInfo list(AppPendingStorage appPendingStorage) + { + startPage(); + List list = appPendingStorageService.selectAppPendingStorageList(appPendingStorage); + return getDataTable(list); + } + + /** + * 导出入库码盘列表 + */ + @PreAuthorize("@ss.hasPermi('system:storage:export')") + @Log(title = "入库码盘", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppPendingStorage appPendingStorage) + { + List list = appPendingStorageService.selectAppPendingStorageList(appPendingStorage); + ExcelUtil util = new ExcelUtil(AppPendingStorage.class); + util.exportExcel(response, list, "入库码盘数据"); + } + + /** + * 获取入库码盘详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:storage:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") String recordId) + { + return success(appPendingStorageService.selectAppPendingStorageByRecordId(recordId)); + } + + /** + * 新增入库码盘 + */ + @PreAuthorize("@ss.hasPermi('system:storage:add')") + @Log(title = "入库码盘", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppPendingStorage appPendingStorage) + { + return toAjax(appPendingStorageService.insertAppPendingStorage(appPendingStorage)); + } + + /** + * 修改入库码盘 + */ + @PreAuthorize("@ss.hasPermi('system:storage:edit')") + @Log(title = "入库码盘", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppPendingStorage appPendingStorage) + { + return toAjax(appPendingStorageService.updateAppPendingStorage(appPendingStorage)); + } + + /** + * 删除入库码盘 + */ + @PreAuthorize("@ss.hasPermi('system:storage:remove')") + @Log(title = "入库码盘", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable String[] recordIds) + { + return toAjax(appPendingStorageService.deleteAppPendingStorageByRecordIds(recordIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index b885076a..e5c951f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -1,14 +1,17 @@ package com.ruoyi.web.controller.app; import com.ruoyi.app.domain.AppLocation; +import com.ruoyi.app.domain.AppPendingStorage; import com.ruoyi.app.domain.AppPmsOrderIn; import com.ruoyi.app.domain.AppTask; +import com.ruoyi.app.service.IAppPendingStorageService; import com.ruoyi.app.service.IAppPmsOrderInService; import com.ruoyi.app.service.IAppPmsOrderOutService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.OperatorType; @@ -17,14 +20,14 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.web.domain.PmsOrderInRequest; import com.ruoyi.web.domain.PmsOrderOutRequest; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.math.BigDecimal; +import java.util.*; /** * 【请填写功能名称】Controller @@ -41,6 +44,9 @@ public class AppPmsController extends BaseController @Autowired private IAppPmsOrderOutService appPmsOrderOutService;// 出库单 + @Autowired + private IAppPendingStorageService appPendingStorageService; + private final List orderInTypeList = Arrays.asList(1, 2, 3, 4, 5, 6); /** @@ -54,8 +60,9 @@ public class AppPmsController extends BaseController { // TODO // 判断数据是否缺失 + Integer orderType = orderInRequest.getOrderType(); if (StringUtils.isEmpty(orderInRequest.getListId()) - || orderInTypeList.contains(orderInRequest.getOrderType()) + || !orderInTypeList.contains(orderInRequest.getOrderType()) || StringUtils.isEmpty(orderInRequest.getCustomerId()) || StringUtils.isEmpty(orderInRequest.getOrderId()) || StringUtils.isEmpty(orderInRequest.getGoodsId()) @@ -69,10 +76,24 @@ public class AppPmsController extends BaseController if (existAppPmsOrderIn != null) { return error("入库单号重复。"); } + AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); + BeanUtils.copyProperties(orderInRequest,appPmsOrderIn); + appPmsOrderIn.setOrderType(Long.valueOf(orderInRequest.getOrderType())); + appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPmsOrderIn.setUsedNum(BigDecimal.valueOf(0)); + appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPmsOrderIn.setOrderStatus(Long.valueOf(0)); + appPmsOrderIn.setCreateTime(new Date()); + appPmsOrderIn.setUpdateTime(new Date()); - - - return success(); + AppPendingStorage appPendingStorage = new AppPendingStorage(); + appPendingStorage.setRecordId(UUID.randomUUID().toString()); + BeanUtils.copyProperties(appPmsOrderIn, appPendingStorage); + int i = appPendingStorageService.insertAppPendingStorage(appPendingStorage); + if (i == 0) { + return error("存入入库码盘信息失败"); + } + return toAjax(appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java index 2f289681..741e8ba3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppLocation; import com.ruoyi.app.domain.AppPmsOrderIn; import com.ruoyi.app.service.IAppPmsOrderInService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/app/pmwOrderIn") +@RequestMapping("/app/pmsOrderIn") public class AppPmsOrderInController extends BaseController { @Autowired @@ -40,6 +42,7 @@ public class AppPmsOrderInController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:in:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppPmsOrderIn.class) public TableDataInfo list(AppPmsOrderIn appPmsOrderIn) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderOutController.java index 96978b44..62ae26cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderOutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderOutController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppPmsOrderIn; import com.ruoyi.app.domain.AppPmsOrderOut; import com.ruoyi.app.service.IAppPmsOrderOutService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +42,7 @@ public class AppPmsOrderOutController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:out:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppPmsOrderOut.class) public TableDataInfo list(AppPmsOrderOut appPmsOrderOut) { startPage(); 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 7b0c8a48..e8daae97 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 @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppPmsOrderOut; import com.ruoyi.app.domain.AppProvider; import com.ruoyi.app.service.IAppProviderService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +42,7 @@ public class AppProviderController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:provider:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppProvider.class) public TableDataInfo list(AppProvider appProvider) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java index 9e73b1be..8689d944 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppProvider; import com.ruoyi.app.domain.AppStand; import com.ruoyi.app.service.IAppStandService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +42,7 @@ public class AppStandController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:stand:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppStand.class) public TableDataInfo list(AppStand appStand) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStockController.java index 57d4d967..cf7bd1e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStockController.java @@ -4,7 +4,9 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.AppStock; +import com.ruoyi.app.domain.AppTaskBak; import com.ruoyi.app.service.IAppStockService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/system/stock") +@RequestMapping("/app/stock") public class AppStockController extends BaseController { @Autowired @@ -38,8 +40,9 @@ public class AppStockController extends BaseController /** * 查询【请填写功能名称】列表 */ - @PreAuthorize("@ss.hasPermi('system:stock:list')") + @PreAuthorize("@ss.hasPermi('app:stock:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppStock.class) public TableDataInfo list(AppStock appStock) { startPage(); @@ -50,7 +53,7 @@ public class AppStockController extends BaseController /** * 导出【请填写功能名称】列表 */ - @PreAuthorize("@ss.hasPermi('system:stock:export')") + @PreAuthorize("@ss.hasPermi('app:stock:export')") @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, AppStock appStock) @@ -63,7 +66,7 @@ public class AppStockController extends BaseController /** * 获取【请填写功能名称】详细信息 */ - @PreAuthorize("@ss.hasPermi('system:stock:query')") + @PreAuthorize("@ss.hasPermi('app:stock:query')") @GetMapping(value = "/{stockId}") public AjaxResult getInfo(@PathVariable("stockId") String stockId) { @@ -73,7 +76,7 @@ public class AppStockController extends BaseController /** * 新增【请填写功能名称】 */ - @PreAuthorize("@ss.hasPermi('system:stock:add')") + @PreAuthorize("@ss.hasPermi('app:stock:add')") @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody AppStock appStock) @@ -84,7 +87,7 @@ public class AppStockController extends BaseController /** * 修改【请填写功能名称】 */ - @PreAuthorize("@ss.hasPermi('system:stock:edit')") + @PreAuthorize("@ss.hasPermi('app:stock:edit')") @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AppStock appStock) @@ -95,7 +98,7 @@ public class AppStockController extends BaseController /** * 删除【请填写功能名称】 */ - @PreAuthorize("@ss.hasPermi('system:stock:remove')") + @PreAuthorize("@ss.hasPermi('app:stock:remove')") @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @DeleteMapping("/{stockIds}") public AjaxResult remove(@PathVariable String[] stockIds) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskBakController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskBakController.java index c9c69ef2..55e56dfa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskBakController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskBakController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppStand; import com.ruoyi.app.domain.AppTaskBak; import com.ruoyi.app.service.IAppTaskBakService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/app/taskBak") +@RequestMapping("/app/taskbak") public class AppTaskBakController extends BaseController { @Autowired @@ -40,6 +42,7 @@ public class AppTaskBakController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:bak:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppTaskBak.class) public TableDataInfo list(AppTaskBak appTaskBak) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 17d8cf94..610304df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -1,20 +1,26 @@ package com.ruoyi.web.controller.app; +import java.math.BigDecimal; import java.util.*; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.app.domain.AppLocation; -import com.ruoyi.app.domain.AppTask; -import com.ruoyi.app.domain.AppWcsTask; -import com.ruoyi.app.service.IAppLocationService; -import com.ruoyi.app.service.IAppTaskService; -import com.ruoyi.app.service.IAppWcsTaskBakService; -import com.ruoyi.app.service.IAppWcsTaskService; + +import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.app.domain.*; +import com.ruoyi.app.service.*; +import com.ruoyi.app.service.impl.AppPendingStorageServiceImpl; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.web.domain.TaskResultFeedRequest; +import com.ruoyi.web.controller.section.EnhanceDataList; +import com.ruoyi.web.domain.*; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -29,6 +35,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.client.RestTemplate; /** * 【请填写功能名称】Controller @@ -48,14 +55,23 @@ public class AppTaskController extends BaseController private IAppWcsTaskService appWcsTaskService; @Autowired private IAppWcsTaskBakService appWcsTaskBakService; + @Autowired + private IAppPmsOrderInService appPmsOrderInService; + @Autowired + private IAppTaskBakService appTaskBakService; + @Autowired + private IAppStockService appStockService; private final List wcsTaskStatusList = Arrays.asList(1, 2, 3, 4, 5, 100, 998, 999); + @Autowired + private AppPendingStorageServiceImpl appPendingStorageServiceImpl; /** * 查询【请填写功能名称】列表 */ @PreAuthorize("@ss.hasPermi('system:task:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppTask.class) public TableDataInfo list(AppTask appTask) { startPage(); @@ -229,4 +245,232 @@ public class AppTaskController extends BaseController return error("处理任务反馈错误。"); } + + @ApiOperation("生成库位") + @PostMapping("/sendLocation") + @Transactional(rollbackFor = Exception.class) + @Anonymous + public AjaxResult sendLocation(@RequestBody WcsLocationRequest wcsStackerTask) + { + if(ObjectUtil.isEmpty(wcsStackerTask.getPoint())|| + ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){ + return error("缺少请求数据"); + } + AppTask appTask = new AppTask(); + appTask.setVehicleId(wcsStackerTask.getVehicleNo()); + List appTasks = appTaskService.selectAppTaskList(appTask); + if(appTasks.size()>0){ + return error("此托盘任务已存在"); + } + + AppTask appTask2 = new AppTask(); + BeanUtils.copyProperties(wcsStackerTask, appTask2); + appTask2.setTaskId("RK"+System.currentTimeMillis()); + appTask2.setWcsTaskId("RK"+System.currentTimeMillis()); + appTask2.setTaskStatus(1); + appTask2.setTaskType(1); + appTask2.setOrigin(wcsStackerTask.getPoint()); + appTask2.setTaskPriority(1); + String location = appLocationService.sendLocation(); + appTask2.setDestination(location); + appTask2.setVehicleId(wcsStackerTask.getVehicleNo()); + int i1 = appTaskService.insertAppTask(appTask2); + if(i1 == 0 ){ + return error("wms生成入库任务异常"); + } + AppWcsTask appTask1 = new AppWcsTask(); + BeanUtils.copyProperties(wcsStackerTask, appTask); + appTask1.setWcsTaskId(appTask2.getTaskId()); + appTask1.setWcsTaskStatus(1); + appTask1.setWcsTaskType(appTask2.getTaskType()); + appTask1.setOrigin("101"); + appTask1.setTaskPriority(appTask2.getTaskPriority()); + appTask1.setDestination(location); + appTask1.setSendTime(new Date()); + appTask1.setVehicleId(appTask2.getVehicleId()); + int i = appWcsTaskService.insertAppWcsTask(appTask1); + if(i == 0 ){ + return error("wcs生成入库任务异常"); + } + + WcsDate wcsDate = new WcsDate(); + wcsDate.setTaskId(appTask2.getTaskId()); + wcsDate.setUser("WMS"); + wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo()); + wcsDate.setDestination(location); + return success(wcsDate); + } + + @ApiOperation("任务反馈") + @PostMapping("/taskResult") + @Anonymous + @Transactional + public AjaxResult taskResult(@RequestBody TaskResultFeedRequest taskResultFeedRequest) + { + if(ObjectUtil.isEmpty(taskResultFeedRequest.getTaskId()) || + ObjectUtil.isEmpty(taskResultFeedRequest.getVehicleNo())){ + return error("缺少请求数据"); + } + AppTask appTask1 = appTaskService.selectAppTaskByTaskId(taskResultFeedRequest.getTaskId()); + if(ObjectUtil.isEmpty(appTask1)){ + return error("wms任务不存在"); + } + AppWcsTask appWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(taskResultFeedRequest.getTaskId()); + if(ObjectUtil.isEmpty(appWcsTask)){ + return error("wcs任务不存在"); + } + if(ObjectUtil.isNotEmpty(taskResultFeedRequest.getTaskStatus())){ + if(!wcsTaskStatusList.contains(taskResultFeedRequest.getTaskStatus())){ + return error("缺少请求数据"); + } + AppTask appTask = new AppTask(); + appTask.setTaskId(taskResultFeedRequest.getTaskId()); + appTask.setTaskStatus(taskResultFeedRequest.getTaskStatus()); + int i = appTaskService.updateAppTask(appTask); + if (i == 0 ){ + return error("wms更新任务信息失败"); + } + AppWcsTask appWcsTask1 = new AppWcsTask(); + appWcsTask1.setWcsTaskId(taskResultFeedRequest.getTaskId()); + appWcsTask1.setWcsTaskStatus(taskResultFeedRequest.getTaskStatus()); + int i1 = appWcsTaskService.updateAppWcsTask(appWcsTask1); + if (i1 == 0 ){ + return error("wcs更新任务信息失败"); + } + } + //wcs反馈 + if(taskResultFeedRequest.getTaskStatus() == 100){ + AppTask appTask = new AppTask(); + appTask.setVehicleId(taskResultFeedRequest.getVehicleNo()); + List appTasks = appTaskService.selectAppTaskList(appTask); + AppWcsTask appWcsTask1 = new AppWcsTask(); + appWcsTask1.setVehicleId(taskResultFeedRequest.getVehicleNo()); + List appWcsTasks = appWcsTaskService.selectAppWcsTaskList(appWcsTask1); + + if(ObjectUtil.isEmpty(appTasks)){ + return error("该托盘不存在wms任务"); + } + if(ObjectUtil.isEmpty(appWcsTasks)){ + return error("该托盘不存在wcs任务"); + } + for (AppWcsTask appWcsTask3 : appWcsTasks) { + //wcs移存到历史表中 + AppWcsTask appWcsTask2 = appWcsTaskService.selectAppWcsTaskByWcsTaskId(appWcsTask3.getWcsTaskId()); + AppWcsTaskBak appWcsTask4 = new AppWcsTaskBak(); + BeanUtils.copyProperties(appWcsTask2, appWcsTask4); + appWcsTask4.setFinishTime(new Date()); + appWcsTaskBakService.insertAppWcsTaskBak(appWcsTask4); + appWcsTaskService.deleteAppWcsTaskByWcsTaskId(appWcsTask2.getWcsTaskId()); + } + for(AppTask appTask2 : appTasks){ + if(ObjectUtil.isEmpty(appTask2.getGoodsId())){ + return error("此托盘未绑定物料"); + } + AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); + appPmsOrderIn.setGoodsId(appTask2.getGoodsId()); + List appPmsOrderIns = appPmsOrderInService.selectAppPmsOrderInList(appPmsOrderIn); + if(ObjectUtil.isEmpty(appPmsOrderIns)){ + return error("该物料任务单不存在"); + } + + //物料操作数量 + BigDecimal opNum = appTask2.getOpNum(); + + String url = "http://localhost:9430/app/task/kk"; + RestTemplate restTemplate = new RestTemplate(); + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + //连接超时时间 + factory.setConnectTimeout(5000); + // 读取超时时间 + factory.setReadTimeout(10000); + restTemplate.setRequestFactory(factory); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + + PmsOrderInRequest orderInRequest = new PmsOrderInRequest(); + orderInRequest.setOrderId(appPmsOrderIns.get(0).getOrderId()); + orderInRequest.setGoodsId(appPmsOrderIns.get(0).getGoodsId()); + if(ObjectUtil.isNotEmpty(appTask2.getOpNum())){ + orderInRequest.setGoodsNum(appTask2.getOpNum().intValue()); + }else{ + orderInRequest.setGoodsNum(appPmsOrderIns.get(0).getGoodsNum().intValue()); + } + orderInRequest.setGoodsCode(appPmsOrderIns.get(0).getGoodsCode()); + orderInRequest.setSpare1(appPmsOrderIns.get(0).getSpare1()); + orderInRequest.setSpare2(appPmsOrderIns.get(0).getSpare2()); + + + //修改库位状态 + AppLocation appLocation = new AppLocation(); + appLocation.setLocationId(appTask2.getDestination()); + appLocation.setLocationStatus(2); + appLocationService.updateAppLocation(appLocation); + //更新库存 + AppStock appStock = new AppStock(); + appStock.setStockId(appTask2.getGoodsId()); + appStock.setGoodsId(appTask2.getGoodsId()); + appStock.setVehicleId(appTask2.getVehicleId()); + appStock.setLocationId(appTask2.getDestination()); + appStock.setOriginNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appStock.setGoodsUnit(appPmsOrderIns.get(0).getUnit()); + appStockService.insertAppStock(appStock); + //wms移存到历史表 + AppTaskBak appTaskBak = new AppTaskBak(); + BeanUtils.copyProperties(appTask2, appTaskBak); + appTaskBak.setCreateTime(new Date()); + appTaskBak.setOpNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appTaskBak.setFinishTime(new Date()); + appTaskBakService.insertAppTaskBak(appTaskBak); + appTaskService.deleteAppTaskByTaskId(appTask2.getTaskId()); + //更新pms任务表 + AppPmsOrderIn appPmsOrderIn1 = new AppPmsOrderIn(); + appPmsOrderIn1.setGoodsId(appTask2.getGoodsId()); + appPmsOrderIn1.setOrderStatus(Long.valueOf(0)); + List appPmsOrderIns1 = appPmsOrderInService.selectAppPmsOrderInList(appPmsOrderIn1); + if(ObjectUtil.isEmpty(appPmsOrderIns1)){ + return error("物料未绑定托盘"); + } + AppPmsOrderIn appPmsOrderIn2 = appPmsOrderIns1.get(0); + appPmsOrderIn2.setOrderStatus(2L); + appPmsOrderIn2.setUsedNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPmsOrderIn2.setRemainingNum(appPmsOrderIn2.getGoodsNum().subtract(BigDecimal.valueOf(orderInRequest.getGoodsNum()))); + int i1 = appPmsOrderInService.updateAppPmsOrderIn(appPmsOrderIn2); + if(i1 == 0 ){ + return error("pms任务表更新失败"); + } + //更新码盘表 + AppPendingStorage appPendingStorage = new AppPendingStorage(); + appPendingStorage.setGoodsId(appTask2.getGoodsId()); + appPendingStorage.setStatus(Long.valueOf(1)); + List appPendingStorages = appPendingStorageServiceImpl.selectAppPendingStorageList(appPendingStorage); + if(ObjectUtil.isEmpty(appPendingStorages)){ + return error("未查询到码盘信息"); + } + AppPendingStorage appPendingStorage1 = appPendingStorages.get(0); + appPendingStorage1.setStatus(Long.valueOf(3)); + appPendingStorage1.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPendingStorage1.setUpdateTime(new Date()); + int i = appPendingStorageServiceImpl.updateAppPendingStorage(appPendingStorage1); + if(i == 0){ + return error("码盘表信息更新失败"); + } + + HttpEntity requestEntity = new HttpEntity<>(orderInRequest, headers); + String response = restTemplate.postForObject(url, requestEntity, String.class); + boolean contains = response.contains("200"); + if(!contains){ + return error("上报pms失败"); + } + + } + + } + return success(); + } + @PostMapping("/kk") + @Anonymous + public AjaxResult kk(@RequestBody PmsOrderInRequest orderInRequest) + { + return success(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java index 6fa43b44..6b2e37c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppTask; import com.ruoyi.app.domain.AppVehicle; import com.ruoyi.app.service.IAppVehicleService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +42,7 @@ public class AppVehicleController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:vehicle:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppVehicle.class) public TableDataInfo list(AppVehicle appVehicle) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWaveController.java index b1361041..16ddef84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWaveController.java @@ -3,9 +3,11 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppVehicle; import com.ruoyi.app.domain.AppWave; import com.ruoyi.app.service.IAppWaveService; import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -41,6 +43,7 @@ public class AppWaveController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:wave:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppWave.class) public TableDataInfo list(AppWave appWave) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskBakController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskBakController.java index 079fc6db..c4b0f712 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskBakController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskBakController.java @@ -3,8 +3,10 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.AppWave; import com.ruoyi.app.domain.AppWcsTaskBak; import com.ruoyi.app.service.IAppWcsTaskBakService; +import com.ruoyi.web.controller.section.EnhanceDataList; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2025-01-15 */ @RestController -@RequestMapping("/app/WcsTaskBak") +@RequestMapping("/app/wcsTaskBak") public class AppWcsTaskBakController extends BaseController { @Autowired @@ -40,6 +42,7 @@ public class AppWcsTaskBakController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:bak:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppWcsTaskBak.class) public TableDataInfo list(AppWcsTaskBak appWcsTaskBak) { startPage(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskController.java index d328e334..772c63ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppWcsTaskController.java @@ -4,7 +4,12 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.AppWcsTask; +import com.ruoyi.app.domain.AppWcsTaskBak; import com.ruoyi.app.service.IAppWcsTaskService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.web.controller.section.EnhanceDataList; +import com.ruoyi.web.domain.PmsOrderInRequest; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -40,6 +45,7 @@ public class AppWcsTaskController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:task:list')") @GetMapping("/list") + @EnhanceDataList(entityType = AppWcsTask.class) public TableDataInfo list(AppWcsTask appWcsTask) { startPage(); @@ -102,4 +108,6 @@ public class AppWcsTaskController extends BaseController { return toAjax(appWcsTaskService.deleteAppWcsTaskByWcsTaskIds(wcsTaskIds)); } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/DataListAspect.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/DataListAspect.java new file mode 100644 index 00000000..3ec4c0e1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/DataListAspect.java @@ -0,0 +1,72 @@ +package com.ruoyi.web.controller.section; + + + +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.generator.util.ColumnUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Aspect +@Component +public class DataListAspect { + + @Pointcut("@annotation(EnhanceDataList)") + public void dataListPointcut() {} + + //分页不处理 + @Around(value = "dataListPointcut()") + public Object around(ProceedingJoinPoint joinPoint) throws Throwable { + // 先执行目标方法 + Object result = joinPoint.proceed(); + + // 检查结果是否为 TableDataInfo 实例 + if (result instanceof TableDataInfo) { + TableDataInfo dataTable = (TableDataInfo) result; + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + EnhanceDataList enhanceDataList = signature.getMethod().getAnnotation(EnhanceDataList.class); + + // 设置列信息 + dataTable.setColumns(ColumnUtils.getColumnsJson(enhanceDataList.entityType())); + + // 在这里添加其他逻辑来修改 dataTable + // 例如重新计算 total 或修改 rows + // dataTable.setTotal(newTotal); + // dataTable.setRows(newRows); + + return dataTable; // 返回修改后的 dataTable + } + + return result; // 如果结果不是 TableDataInfo 实例，直接返回原结果 + } + + + + //集合类 + @Pointcut("@annotation(ListColumns)") + public void list() {} + + @Around("list()") + public Object lists(ProceedingJoinPoint joinPoint) throws Throwable { + Object result = joinPoint.proceed(); + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + ListColumns columns = signature.getMethod().getAnnotation(ListColumns.class); + if (result instanceof Map) { + Map map = (Map) result; + // 确保list也被放入map中 + if (joinPoint.getArgs().length > 0 && joinPoint.getArgs()[0] instanceof List) { + map.put("list", joinPoint.getArgs()[0]); + } + map.put("columns", ColumnUtils.getColumnsJson(columns.value())); + } + return result; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/EnhanceDataList.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/EnhanceDataList.java new file mode 100644 index 00000000..b4190e97 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/EnhanceDataList.java @@ -0,0 +1,12 @@ +package com.ruoyi.web.controller.section; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface EnhanceDataList { + Class entityType(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/ListColumns.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/ListColumns.java new file mode 100644 index 00000000..977f7167 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/ListColumns.java @@ -0,0 +1,15 @@ +package com.ruoyi.web.controller.section; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ListColumns { + Class value(); +} + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsDate.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsDate.java new file mode 100644 index 00000000..c861bebb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsDate.java @@ -0,0 +1,72 @@ +package com.ruoyi.web.domain; + +public class WcsDate { + /** + * 任务号 + */ + private String taskId; + /** + * 用户 + */ + private String user; + /** + * 载具号 + */ + private String vehicleNo ; + /** + * 终点位置 + */ + private String destination; + + private String spare1; + + private String spare2; + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getVehicleNo() { + return vehicleNo; + } + + public void setVehicleNo(String vehicleNo) { + this.vehicleNo = vehicleNo; + } + + public String getDestination() { + return destination; + } + + public void setDestination(String destination) { + this.destination = destination; + } + + public String getSpare1() { + return spare1; + } + + public void setSpare1(String spare1) { + this.spare1 = spare1; + } + + public String getSpare2() { + return spare2; + } + + public void setSpare2(String spare2) { + this.spare2 = spare2; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsLocationRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsLocationRequest.java new file mode 100644 index 00000000..93aa75d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/WcsLocationRequest.java @@ -0,0 +1,52 @@ +package com.ruoyi.web.domain; + +public class WcsLocationRequest { + /** + * 点位 + */ + private String point; + /** + * 载具编号 + */ + private String vehicleNo; + /** + * 条码信息 + */ + private String codeMessage ; + /** + * 备注 + */ + private String remark; + + public String getPoint() { + return point; + } + + public void setPoint(String point) { + this.point = point; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCodeMessage() { + return codeMessage; + } + + public void setCodeMessage(String codeMessage) { + this.codeMessage = codeMessage; + } + + public String getVehicleNo() { + return vehicleNo; + } + + public void setVehicleNo(String vehicleNo) { + this.vehicleNo = vehicleNo; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index a3487b8e..e8f0e455 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -1,11 +1,13 @@ package com.ruoyi.common.core.page; +import cn.hutool.json.JSONArray; + import java.io.Serializable; import java.util.List; /** * 表格分页数据对象 - * + * * @author ruoyi */ public class TableDataInfo implements Serializable @@ -30,10 +32,19 @@ public class TableDataInfo implements Serializable public TableDataInfo() { } + private JSONArray columns; + + public JSONArray getColumns() { + return columns; + } + + public void setColumns(JSONArray columns) { + this.columns = columns; + } /** * 分页 - * + * * @param list 列表数据 * @param total 总记录数 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index b04beffb..9fe874a7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,7 +114,7 @@ public class SecurityConfig requests.antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn","/app/task/sendLocation", "/app/task/taskResult","/app/task/kk").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/ColumnUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/ColumnUtils.java new file mode 100644 index 00000000..cf47760f --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/ColumnUtils.java @@ -0,0 +1,73 @@ +package com.ruoyi.generator.util; + + + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; + + + + +import com.ruoyi.common.annotation.Excel; + +import java.lang.reflect.Field; + +/** + * 动态加载列表和中文名称 + */ +public class ColumnUtils { + + public static JSONArray getColumnsJson(Class clazz) { + JSONArray columns = new JSONArray(); + Field[] fields = clazz.getDeclaredFields(); + int key = 0; + + for (Field field : fields) { + Excel excelAnnotation = field.getAnnotation(Excel.class); + if (excelAnnotation != null) { + JSONObject column = new JSONObject(); +// column.put("seq", key++); + if(!String.class.isAssignableFrom(field.getType())){ + column.put("type", "number"); + column.put("sortable", "custom"); + } + if (field.getName().equals("createTime")) { + column.put("prop", field.getName()); + column.put("label", excelAnnotation.name()); + column.put("sortable", true); + column.put("width", 180); + } + column.put("prop", field.getName()); + column.put("label", excelAnnotation.name()); +// column.put("visible", true); // 假设所有列默认都是可见的 +// column.put("columnName", field.getName()); // 设置列ID + columns.put(column); + } + } + Class superclass = clazz.getSuperclass(); + Field[] declaredFields = superclass.getDeclaredFields(); + for (Field declaredField : declaredFields) { + Excel excelAnnotation = declaredField.getAnnotation(Excel.class); + if (excelAnnotation != null) { + JSONObject column = new JSONObject(); +// column.put("seq", key++); + if(!String.class.isAssignableFrom(declaredField.getType())){ + column.put("type", "number"); + column.put("sortable", "custom"); + } + if (declaredField.getName().equals("createTime")) { + column.put("prop", declaredField.getName()); + column.put("label", excelAnnotation.name()); + column.put("sortable", true); + column.put("width", 180); + } + column.put("prop", declaredField.getName()); + column.put("label", excelAnnotation.name()); +// column.put("visible", true); // 假设所有列默认都是可见的 +// column.put("columnName", declaredField.getName()); // 设置列ID + columns.put(column); + } + } + return columns; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLedConfig.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLedConfig.java index 96cd2c87..020a081e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLedConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLedConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.app.domain; +import com.ruoyi.common.annotation.Excel; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; @@ -15,6 +16,7 @@ public class AppLedConfig extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + @Excel(name = "主键") private String ledId; public void setLedId(String ledId) diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java index 20347316..5da1a7c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java @@ -16,6 +16,7 @@ public class AppLocation extends BaseEntity private static final Long serialVersionUID = 1L; /** 库位号 */ + @Excel(name = "库位号") private String locationId; /** 库位类型 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java new file mode 100644 index 00000000..fdd8c645 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPendingStorage.java @@ -0,0 +1,237 @@ +package com.ruoyi.app.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 入库码盘对象 app_pending_storage + * + * @author ruoyi + * @date 2025-02-22 + */ +public class AppPendingStorage extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录号，主键 */ + private String recordId; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String listId; + + /** 订单类型 */ + @Excel(name = "订单类型") + private Long orderType; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 订单号 */ + @Excel(name = "订单号") + private String orderId; + + /** 物料号 */ + @Excel(name = "物料号") + private String goodsId; + + /** 物料数量 */ + @Excel(name = "物料数量") + private BigDecimal goodsNum; + + /** 物料条码 */ + @Excel(name = "物料条码") + private String goodsCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String goodsDesc; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** */ + @Excel(name = "") + private String spare1; + + /** */ + @Excel(name = "") + private String spare2; + + /** 状态：1-码盘成功；2-正在入库；3-入库完成；4-异常 */ + @Excel(name = "状态：1-码盘成功；2-正在入库；3-入库完成；4-异常") + private Long status; + + /** 码盘类型：1-其他物料入库；2-pms入库 */ + @Excel(name = "码盘类型：1-其他物料入库；2-pms入库") + private Long storageType; + + /** 创建人 */ + @Excel(name = "创建人") + private String createPerson; + + public void setRecordId(String recordId) + { + this.recordId = recordId; + } + + public String getRecordId() + { + return recordId; + } + public void setListId(String listId) + { + this.listId = listId; + } + + public String getListId() + { + return listId; + } + public void setOrderType(Long orderType) + { + this.orderType = orderType; + } + + public Long getOrderType() + { + return orderType; + } + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + public void setOrderId(String orderId) + { + this.orderId = orderId; + } + + public String getOrderId() + { + return orderId; + } + public void setGoodsId(String goodsId) + { + this.goodsId = goodsId; + } + + public String getGoodsId() + { + return goodsId; + } + public void setGoodsNum(BigDecimal goodsNum) + { + this.goodsNum = goodsNum; + } + + public BigDecimal getGoodsNum() + { + return goodsNum; + } + public void setGoodsCode(String goodsCode) + { + this.goodsCode = goodsCode; + } + + public String getGoodsCode() + { + return goodsCode; + } + public void setGoodsDesc(String goodsDesc) + { + this.goodsDesc = goodsDesc; + } + + public String getGoodsDesc() + { + return goodsDesc; + } + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setStorageType(Long storageType) + { + this.storageType = storageType; + } + + public Long getStorageType() + { + return storageType; + } + public void setCreatePerson(String createPerson) + { + this.createPerson = createPerson; + } + + public String getCreatePerson() + { + return createPerson; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("listId", getListId()) + .append("orderType", getOrderType()) + .append("customerId", getCustomerId()) + .append("orderId", getOrderId()) + .append("goodsId", getGoodsId()) + .append("goodsNum", getGoodsNum()) + .append("goodsCode", getGoodsCode()) + .append("goodsDesc", getGoodsDesc()) + .append("unit", getUnit()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("status", getStatus()) + .append("storageType", getStorageType()) + .append("createTime", getCreateTime()) + .append("createPerson", getCreatePerson()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java index d947d275..68a8c83d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java @@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * 【请填写功能名称】对象 app_pms_order_in * * @author ruoyi - * @date 2025-01-14 + * @date 2025-02-22 */ public class AppPmsOrderIn extends BaseEntity { @@ -39,6 +39,14 @@ public class AppPmsOrderIn extends BaseEntity @Excel(name = "数量") private BigDecimal goodsNum; + /** 使用数量（已入库数量） */ + @Excel(name = "使用数量", readConverterExp = "已=入库数量") + private BigDecimal usedNum; + + /** 剩余数量 */ + @Excel(name = "剩余数量") + private BigDecimal remainingNum; + /** 物料条码 */ @Excel(name = "物料条码") private String goodsCode; @@ -59,6 +67,10 @@ public class AppPmsOrderIn extends BaseEntity @Excel(name = "预留2") private String spare2; + /** 订单状态 */ + @Excel(name = "订单状态") + private Long orderStatus; + public void setListId(String listId) { this.listId = listId; @@ -113,6 +125,24 @@ public class AppPmsOrderIn extends BaseEntity { return goodsNum; } + public void setUsedNum(BigDecimal usedNum) + { + this.usedNum = usedNum; + } + + public BigDecimal getUsedNum() + { + return usedNum; + } + public void setRemainingNum(BigDecimal remainingNum) + { + this.remainingNum = remainingNum; + } + + public BigDecimal getRemainingNum() + { + return remainingNum; + } public void setGoodsCode(String goodsCode) { this.goodsCode = goodsCode; @@ -158,6 +188,15 @@ public class AppPmsOrderIn extends BaseEntity { return spare2; } + public void setOrderStatus(Long orderStatus) + { + this.orderStatus = orderStatus; + } + + public Long getOrderStatus() + { + return orderStatus; + } @Override public String toString() { @@ -168,11 +207,17 @@ public class AppPmsOrderIn extends BaseEntity .append("orderId", getOrderId()) .append("goodsId", getGoodsId()) .append("goodsNum", getGoodsNum()) + .append("usedNum", getUsedNum()) + .append("remainingNum", getRemainingNum()) .append("goodsCode", getGoodsCode()) .append("goodsDesc", getGoodsDesc()) .append("unit", getUnit()) .append("spare1", getSpare1()) .append("spare2", getSpare2()) + .append("orderStatus", getOrderStatus()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java new file mode 100644 index 00000000..9a49d8ac --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPendingStorageMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.app.mapper; + +import com.ruoyi.app.domain.AppPendingStorage; + +import java.util.List; + + +/** + * 入库码盘Mapper接口 + * + * @author ruoyi + * @date 2025-02-22 + */ +public interface AppPendingStorageMapper +{ + /** + * 查询入库码盘 + * + * @param recordId 入库码盘主键 + * @return 入库码盘 + */ + public AppPendingStorage selectAppPendingStorageByRecordId(String recordId); + + /** + * 查询入库码盘列表 + * + * @param appPendingStorage 入库码盘 + * @return 入库码盘集合 + */ + public List selectAppPendingStorageList(AppPendingStorage appPendingStorage); + + /** + * 新增入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + public int insertAppPendingStorage(AppPendingStorage appPendingStorage); + + /** + * 修改入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + public int updateAppPendingStorage(AppPendingStorage appPendingStorage); + + /** + * 删除入库码盘 + * + * @param recordId 入库码盘主键 + * @return 结果 + */ + public int deleteAppPendingStorageByRecordId(String recordId); + + /** + * 批量删除入库码盘 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppPendingStorageByRecordIds(String[] recordIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java index b23c9b67..6443f28e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java @@ -73,4 +73,6 @@ public interface IAppLocationService * @return 库位 */ AppLocation requestLocation(int equipmentId); + + String sendLocation(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java new file mode 100644 index 00000000..26b6800e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPendingStorageService.java @@ -0,0 +1,63 @@ +package com.ruoyi.app.service; + +import com.ruoyi.app.domain.AppPendingStorage; + +import java.util.List; + + +/** + * 入库码盘Service接口 + * + * @author ruoyi + * @date 2025-02-22 + */ +public interface IAppPendingStorageService +{ + /** + * 查询入库码盘 + * + * @param recordId 入库码盘主键 + * @return 入库码盘 + */ + public AppPendingStorage selectAppPendingStorageByRecordId(String recordId); + + /** + * 查询入库码盘列表 + * + * @param appPendingStorage 入库码盘 + * @return 入库码盘集合 + */ + public List selectAppPendingStorageList(AppPendingStorage appPendingStorage); + + /** + * 新增入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + public int insertAppPendingStorage(AppPendingStorage appPendingStorage); + + /** + * 修改入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + public int updateAppPendingStorage(AppPendingStorage appPendingStorage); + + /** + * 批量删除入库码盘 + * + * @param recordIds 需要删除的入库码盘主键集合 + * @return 结果 + */ + public int deleteAppPendingStorageByRecordIds(String[] recordIds); + + /** + * 删除入库码盘信息 + * + * @param recordId 入库码盘主键 + * @return 结果 + */ + public int deleteAppPendingStorageByRecordId(String recordId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java index 3fcd4b04..d0c6bbf1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java @@ -2,6 +2,7 @@ package com.ruoyi.app.service; import com.ruoyi.app.domain.AppPmsOrderIn; + import java.util.List; /** @@ -59,4 +60,5 @@ public interface IAppPmsOrderInService * @return 结果 */ public int deleteAppPmsOrderInByListId(String listId); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java index 5a1c7888..c79706b7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java @@ -5,11 +5,13 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import cn.hutool.core.util.ObjectUtil; import com.ruoyi.app.domain.AppLocation; import com.ruoyi.app.mapper.AppLocationMapper; import com.ruoyi.app.service.IAppLocationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 【请填写功能名称】Service业务层处理 @@ -136,6 +138,39 @@ public class AppLocationServiceImpl implements IAppLocationService { return resultLocation; } + @Override + @Transactional + public String sendLocation() { + AppLocation appLocation = new AppLocation(); + appLocation.setLocationStatus(0); + appLocation.setIsLock(0); + //查询可用库位 + List appLocations = appLocationMapper.selectAppLocationList(appLocation); + if (appLocations == null || appLocations.isEmpty()) { + throw new RuntimeException("库位已满"); + } + //筛选深度 + List collect = appLocations.stream().filter(l -> l.getwDepth().equals(2)).collect(Collectors.toList()); + List collect1 = appLocations.stream().filter(l -> l.getwDepth().equals(1)).collect(Collectors.toList()); + //定义库位 + String locationId = null; + if(ObjectUtil.isNotEmpty(collect)){ + locationId = collect.get(0).getLocationId(); + }else{ + locationId =collect1.get(0).getLocationId(); + } + AppLocation location = new AppLocation(); + location.setLocationId(locationId); + location.setLocationStatus(1); + //更新库位为任务中 + int i = appLocationMapper.updateAppLocation(location); + if(i == 0 ){ + throw new RuntimeException("库位更新失败"); + } + return locationId; + + } + /** * 是否是最内层可用库位 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java new file mode 100644 index 00000000..0a4690ab --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java @@ -0,0 +1,98 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; + +import com.ruoyi.app.domain.AppPendingStorage; +import com.ruoyi.app.mapper.AppPendingStorageMapper; +import com.ruoyi.app.service.IAppPendingStorageService; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 入库码盘Service业务层处理 + * + * @author ruoyi + * @date 2025-02-22 + */ +@Service +public class AppPendingStorageServiceImpl implements IAppPendingStorageService +{ + @Autowired + private AppPendingStorageMapper appPendingStorageMapper; + + /** + * 查询入库码盘 + * + * @param recordId 入库码盘主键 + * @return 入库码盘 + */ + @Override + public AppPendingStorage selectAppPendingStorageByRecordId(String recordId) + { + return appPendingStorageMapper.selectAppPendingStorageByRecordId(recordId); + } + + /** + * 查询入库码盘列表 + * + * @param appPendingStorage 入库码盘 + * @return 入库码盘 + */ + @Override + public List selectAppPendingStorageList(AppPendingStorage appPendingStorage) + { + return appPendingStorageMapper.selectAppPendingStorageList(appPendingStorage); + } + + /** + * 新增入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + @Override + public int insertAppPendingStorage(AppPendingStorage appPendingStorage) + { + appPendingStorage.setCreateTime(DateUtils.getNowDate()); + return appPendingStorageMapper.insertAppPendingStorage(appPendingStorage); + } + + /** + * 修改入库码盘 + * + * @param appPendingStorage 入库码盘 + * @return 结果 + */ + @Override + public int updateAppPendingStorage(AppPendingStorage appPendingStorage) + { + appPendingStorage.setUpdateTime(DateUtils.getNowDate()); + return appPendingStorageMapper.updateAppPendingStorage(appPendingStorage); + } + + /** + * 批量删除入库码盘 + * + * @param recordIds 需要删除的入库码盘主键 + * @return 结果 + */ + @Override + public int deleteAppPendingStorageByRecordIds(String[] recordIds) + { + return appPendingStorageMapper.deleteAppPendingStorageByRecordIds(recordIds); + } + + /** + * 删除入库码盘信息 + * + * @param recordId 入库码盘主键 + * @return 结果 + */ + @Override + public int deleteAppPendingStorageByRecordId(String recordId) + { + return appPendingStorageMapper.deleteAppPendingStorageByRecordId(recordId); + } +} 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 0b90391a..b5bc7307 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 @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.app.domain.AppPmsOrderIn; import com.ruoyi.app.mapper.AppPmsOrderInMapper; import com.ruoyi.app.service.IAppPmsOrderInService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -91,4 +92,5 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService { return appPmsOrderInMapper.deleteAppPmsOrderInByListId(listId); } + } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml new file mode 100644 index 00000000..d1e815d0 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select record_id, list_id, order_type, customer_id, order_id, goods_id, goods_num, goods_code, goods_desc, unit, spare1, spare2, status, storage_type, create_time, create_person, update_time, remark from app_pending_storage + + + + + + + + insert into app_pending_storage + + record_id, + list_id, + order_type, + customer_id, + order_id, + goods_id, + goods_num, + goods_code, + goods_desc, + unit, + spare1, + spare2, + status, + storage_type, + create_time, + create_person, + update_time, + remark, + + + #{recordId}, + #{listId}, + #{orderType}, + #{customerId}, + #{orderId}, + #{goodsId}, + #{goodsNum}, + #{goodsCode}, + #{goodsDesc}, + #{unit}, + #{spare1}, + #{spare2}, + #{status}, + #{storageType}, + #{createTime}, + #{createPerson}, + #{updateTime}, + #{remark}, + + + + + update app_pending_storage + + list_id = #{listId}, + 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}, + status = #{status}, + storage_type = #{storageType}, + create_time = #{createTime}, + create_person = #{createPerson}, + update_time = #{updateTime}, + remark = #{remark}, + + where record_id = #{recordId} + + + + delete from app_pending_storage where record_id = #{recordId} + + + + delete from app_pending_storage where record_id in + + #{recordId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 1c3d7213..2b685807 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -11,15 +11,21 @@ + + + + + + - select list_id, order_type, customer_id, order_id, goods_id, goods_num, goods_code, goods_desc, unit, spare1, spare2 from app_pms_order_in + select list_id, order_type, customer_id, order_id, goods_id, goods_num, used_num, remaining_num, goods_code, goods_desc, unit, spare1, spare2, order_status, create_time, update_time, remark from app_pms_order_in @@ -52,11 +61,17 @@ order_id, goods_id, goods_num, + used_num, + remaining_num, goods_code, goods_desc, unit, spare1, spare2, + order_status, + create_time, + update_time, + remark, #{listId}, @@ -65,11 +80,17 @@ #{orderId}, #{goodsId}, #{goodsNum}, + #{usedNum}, + #{remainingNum}, #{goodsCode}, #{goodsDesc}, #{unit}, #{spare1}, #{spare2}, + #{orderStatus}, + #{createTime}, + #{updateTime}, + #{remark}, @@ -81,11 +102,17 @@ order_id = #{orderId}, goods_id = #{goodsId}, goods_num = #{goodsNum}, + used_num = #{usedNum}, + remaining_num = #{remainingNum}, goods_code = #{goodsCode}, goods_desc = #{goodsDesc}, unit = #{unit}, spare1 = #{spare1}, spare2 = #{spare2}, + order_status = #{orderStatus}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, where list_id = #{listId} diff --git a/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml new file mode 100644 index 00000000..33c072a4 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppGoodsMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..0451b348 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppGoodsPairMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + 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 new file mode 100644 index 00000000..b3da16bd --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppLedConfigMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + 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 new file mode 100644 index 00000000..2d771082 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppLocationMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..1368288d --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderInMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..89bcc1ec --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppPmsOrderOutMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + select list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2, order_status from app_pms_order_out + + + + + + + + insert into app_pms_order_out + + list_id, + order_type, + customer_id, + goods_id, + goods_num, + goods_desc, + spare1, + spare2, + order_status, + + + #{listId}, + #{orderType}, + #{customerId}, + #{goodsId}, + #{goodsNum}, + #{goodsDesc}, + #{spare1}, + #{spare2}, + #{orderStatus}, + + + + + update app_pms_order_out + + order_type = #{orderType}, + customer_id = #{customerId}, + goods_id = #{goodsId}, + goods_num = #{goodsNum}, + goods_desc = #{goodsDesc}, + spare1 = #{spare1}, + spare2 = #{spare2}, + order_status = #{orderStatus}, + + where list_id = #{listId} + + + + delete from app_pms_order_out where list_id = #{listId} + + + + delete from app_pms_order_out where list_id in + + #{listId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml new file mode 100644 index 00000000..71bf3948 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppProviderMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..c8d2ca28 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppStandMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..6358a8fc --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppStockMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..9e7a687e --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppTaskBakMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..686802d8 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppTaskMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..f5653181 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppVehicleMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..8ce3dccc --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppWaveMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..a5c55511 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskBakMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..0f3980e8 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/AppWcsTaskMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + 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