From a1741ace8b6ed8a8b0b05644062fb5885b3fe62c Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 6 Mar 2025 11:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpad=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppPmsController.java | 21 +++++++++++++++++++ .../app/AppPmsOrderInController.java | 16 -------------- .../src/main/resources/application-druid.yml | 12 +++++------ .../ruoyi/app/mapper/AppPmsOrderInMapper.java | 3 ++- .../impl/AppPmsOrderInServiceImpl.java | 6 ++++-- .../mapper/app/AppPmsOrderInMapper.xml | 5 +++-- 6 files changed, 36 insertions(+), 27 deletions(-) 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 94ecbeee..b3d25bbc 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,6 +1,7 @@ package com.ruoyi.web.controller.app; import com.ruoyi.app.domain.*; +import com.ruoyi.app.domain.DTO.PmsStockInCompleteReq; import com.ruoyi.app.service.IAppPendingStorageService; import com.ruoyi.app.service.IAppPmsOrderInService; import com.ruoyi.app.service.IAppPmsOrderOutService; @@ -20,6 +21,7 @@ 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.data.annotation.QueryAnnotation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -136,4 +138,23 @@ public class AppPmsController extends BaseController { return insertRow == orderOutRequests.size() ? success("success") : error("出库单保存失败"); } + + /** + * 模糊查询，查询入库单表 + * @param param 查询参数 + * @return 返回结果 + */ + @Anonymous + @GetMapping(value = "/getInfoWithString") + public AjaxResult getInfoWithString(@RequestParam("param") String param) + { + return success(appPmsOrderInService.getInfoWithString(param)); + } + + @Anonymous + @PostMapping("/pmsStockInComplete") + public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) { + return toAjax(appPmsOrderInService.pmsStockInComplete(request)); + } + } 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 d0b813c3..93b41760 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 @@ -108,21 +108,5 @@ public class AppPmsOrderInController extends BaseController return toAjax(appPmsOrderInService.deleteAppPmsOrderInByListIds(listIds)); } - /** - * 模糊查询，查询入库单表 - * @param param 查询参数 - * @return 返回结果 - */ - @Anonymous - @GetMapping(value = "/getInfoWithString/{str}") - public AjaxResult getInfoWithString(@PathVariable("str") String param) - { - return success(appPmsOrderInService.getInfoWithString(param)); - } - - @PostMapping("/pmsStockInComplete") - public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) { - return toAjax(appPmsOrderInService.pmsStockInComplete(request)); - } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 4997d97c..8817724f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,12 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://112.4.208.194:3001/wms_xugongteji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: developer - password: developer -# url: jdbc:mysql://10.24.0.62:3306/wms_tp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: wcs -# password: Wcs123 +# url: jdbc:mysql://112.4.208.194:3001/wms_xugongteji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: developer +# password: developer + url: jdbc:mysql://10.24.0.62:3306/wms_tp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: wcs + password: Wcs123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java index 71a4f435..851b641e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.app.mapper; import com.ruoyi.app.domain.AppPendingStorage; import com.ruoyi.app.domain.AppPmsOrderIn; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -54,7 +55,7 @@ public interface AppPmsOrderInMapper public int deleteAppPmsOrderInByListId(String listId); - public List selectAppPmsOrderInListWithParam(String param); + public List selectAppPmsOrderInListWithParam(@Param("param") String param); /** * 批量删除【请填写功能名称】 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 5a7cd3a2..a32a71e1 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 @@ -1,5 +1,6 @@ package com.ruoyi.app.service.impl; +import java.math.BigDecimal; import java.util.List; import com.ruoyi.app.domain.AppPendingStorage; @@ -11,6 +12,7 @@ import com.ruoyi.app.mapper.AppPmsOrderInMapper; import com.ruoyi.app.service.IAppPmsOrderInService; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.IdUtils; import org.apache.ibatis.javassist.compiler.ast.Variable; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -106,10 +108,9 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService @Override public List getInfoWithString(String param) { if(StringUtils.isEmpty(param)) { - return appPmsOrderInMapper.selectAppPmsOrderInList(new AppPmsOrderIn()); + return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(""); } return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(param); - } @Override @@ -132,6 +133,7 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService AppPmsOrderIn appPmsOrderInInsert = appPmsOrderIns.get(0); AppPendingStorage appPendingStorage = new AppPendingStorage(); BeanUtils.copyProperties(appPmsOrderInInsert, appPendingStorage); + appPendingStorage.setRecordId(IdUtils.randomUUID()); appPendingStorage.setVehicleNo(request.getVehicleNo()); appPendingStorage.setGoodsNum(pmsInDatum.getGoodsNum()); appPendingStorage.setStatus(1); diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 6114542f..74b08ca6 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -74,9 +74,10 @@ - - where list_id like '%#{param}%' or order_id like '%#{param}%' or goods_id like '%#{param}%' or goods_code like '%#{param}%' or goods_desc like '%#{param}%' + where (list_id like concat('%',#{param},'%') or order_id like concat('%',#{param},'%') or goods_id like concat('%',#{param},'%') +or goods_code like concat('%',#{param},'%') or goods_desc like concat('%',#{param},'%')) and remaining_num > 0