From 828420badeb7c60f4afc7a3a97626fe5836eca29 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 22 May 2025 14:29:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/mapper/QcDefectDetailMapper.java | 4 +- .../qms/mapper/QcDefectInfoMapper.java | 4 +- .../wms/controller/WmsPdaApiController.java | 16 ++++- .../controller/api/MachineApiController.java | 61 +++++++++++++++++++ 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java index 575decd..d15310c 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java @@ -1,8 +1,9 @@ package org.dromara.qms.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.qms.domain.QcDefectDetail; import org.dromara.qms.domain.vo.QcDefectDetailVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; /** * 病疵详细Mapper接口 @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author LionLi * @date 2025-01-10 */ +@Repository public interface QcDefectDetailMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java index f38ee04..3a54743 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java @@ -1,8 +1,9 @@ package org.dromara.qms.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.qms.domain.QcDefectInfo; import org.dromara.qms.domain.vo.QcDefectInfoVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; /** * 病疵信息Mapper接口 @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author LionLi * @date 2025-01-10 */ +@Repository public interface QcDefectInfoMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java index 98bd172..7a468ec 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java @@ -317,10 +317,24 @@ public class WmsPdaApiController extends BaseController { return result ? R.ok() : R.fail(); } - + /** + * 查询机台 + * @return + */ @PostMapping("/selectMachineInfo") public R> slectMachineInfo() { List list = apiService.slectMachineInfo(); return R.ok(list); } + + /** + * 查询机台工位 + * @return prod_base_station_info + */ + @PostMapping("/selectMachineStationList") + public R> selectMachineStationList(Long machineId) { + List list = apiService.selectMachineStationList(machineId); + return list == null ? R.fail() : R.ok(list); + } + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java new file mode 100644 index 0000000..66f6872 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java @@ -0,0 +1,61 @@ +package org.dromara.wms.controller.api; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.web.core.BaseController; +import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; +import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; +import org.dromara.wms.domain.vo.WmsInventoryVo; +import org.dromara.wms.service.IWmsHppStorePlaceService; +import org.dromara.wms.service.IWmsPdaApiService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/machineApi") +public class MachineApiController extends BaseController { + + private final IWmsPdaApiService apiService; + + private final IWmsHppStorePlaceService wmsHppStorePlaceService; + + + /** + * 半成品入库提交 + * + * @param vo xinx + */ + @ApiEncrypt + @PostMapping("/semi/submitInstore") + public R semiSubmitInStoreInfo(@RequestBody WmsHppInStockDetailVo vo) { + // 验证库位条码 + WmsHppStorePlaceVo wmsPsmStorePlace = wmsHppStorePlaceService.selectStorePlaceInfoByCode(vo.getStorePlaceCode()); + if (wmsPsmStorePlace == null) { + return R.fail("库位编码扫描错误"); + } + vo.setStorePlaceId(wmsPsmStorePlace.getObjId()); + Boolean result = apiService.updataInStoreRecord(vo); + return result ? R.ok() : R.fail(); + } + + + + // 根据库位查询库存 + @PostMapping("/storeCheck/selectInventory") + public R> storeCheckSelectInventory(String locationCode, String type) { + List list = apiService.storeCheckSelectInventory(locationCode, type); + if (list == null || list.isEmpty()) { + return R.fail(); + } + return R.ok(list); + } + + + +} From e33259c7c2fe98f12f2db4108e50508c40341ba1 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 22 May 2025 15:56:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=8A=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/WmsPdaApiController.java | 2 +- .../wms/domain/WmsHppInStockDetail.java | 7 ++--- .../wms/mapper/WmsHppInStockDetailMapper.java | 9 +++---- .../service/impl/WmsPdaApiServiceImpl.java | 21 +++++++++------ .../mapper/wms/WmsHppInStockDetailMapper.xml | 27 +++++++++++++++++-- 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java index 7a468ec..9f93d7d 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java @@ -183,7 +183,7 @@ public class WmsPdaApiController extends BaseController { public R semiSelectVehicleInfo(String code) { WmsHppInStockDetailVo wmsHppInStockDetailVo = apiService.semiSelectVehicleInfo(code); if (wmsHppInStockDetailVo == null) { - return R.fail("载具没有绑定物料，或者载具编码扫描错误"); + return R.fail("流转卡号扫描错误"); } return R.ok(wmsHppInStockDetailVo); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java index ee215a4..7131862 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java @@ -1,9 +1,9 @@ package org.dromara.wms.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serial; import java.math.BigDecimal; @@ -95,5 +95,6 @@ public class WmsHppInStockDetail{ @TableField(exist = false) private String storePlaceCode; + private String unitName; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java index 1c78b78..a0f1c5f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java @@ -1,6 +1,5 @@ package org.dromara.wms.mapper; -import org.apache.ibatis.annotations.Select; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsHppInStockDetail; import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; @@ -14,9 +13,9 @@ import org.springframework.stereotype.Repository; */ @Repository public interface WmsHppInStockDetailMapper extends BaseMapperPlus { - @Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" + - " material_id,material_spec,instock_num,material_code,unit_name\n" + - "from wms_hpp_in_stock_detail where store_place_id is null and shelf_no=#{code}\n" + - "order by create_time") + // @Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" + + // " material_id,material_spec,instock_num,material_code,unit_name\n" + + // "from wms_hpp_in_stock_detail where store_place_id is null and shelf_no=#{code}\n" + + // "order by create_time") WmsHppInStockDetailVo semiSelectVehicleInfo(String code); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java index 5a0557d..c20bae6 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java @@ -8,6 +8,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.translation.annotation.Translation; import org.dromara.wms.domain.*; @@ -26,7 +27,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { private final WmsOutstockRecordMapper wmsOutstockRecordMapper; private final WmsPdaApiMapper apiMapper; - private final WmsHppInStockDetailMapper baseMapper; + private final WmsPsmInStockMapper wmsPsmInStockMapper; private final WmsPsmInLoadDetailMapper wmsPsmInLoadDetailMapper; private final WmsInventoryCheckRecordMapper wmsInventoryCheckRecordMapper; @@ -105,17 +106,21 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { @Override public WmsHppInStockDetailVo semiSelectVehicleInfo(String code) { - return baseMapper.semiSelectVehicleInfo(code); + return hppInStockDetailMapper.semiSelectVehicleInfo(code); } @Override public Boolean updataInStoreRecord(WmsHppInStockDetailVo vo) { - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId()) - .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId()) - .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime()) - .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername()); - int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper); + // LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + // lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId()) + // .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId()) + // .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime()) + // .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername()); + // int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper); + + WmsHppInStockDetail convert = MapstructUtils.convert(vo, WmsHppInStockDetail.class); + + int rows = hppInStockDetailMapper.insert(convert); if (rows > 0) { // System.out.println("更新成功"); WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail(); diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml index 9062cbc..fb7c7e2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml @@ -1,7 +1,30 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + From 755c7834408db31b4b12a7b46a3a8ea7fd800b41 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 22 May 2025 17:21:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci(pom.xml):=20=E4=BF=AE=E5=A4=8D=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将环境标识从 devw改为 dev，统一环境配置 - 更新 pom.xml 文件中的环境配置属性 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e9b0e53..b415946 100644 --- a/pom.xml +++ b/pom.xml @@ -71,10 +71,10 @@ - devw + dev - devw + dev 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP