From ac795d4c8d79521cd30af08c297dee18bc7d27e5 Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 7 May 2025 15:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Qc=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E4=BB=93=E5=BA=93=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/PdaApiController.java | 27 ++++++++++-- .../org/dromara/api/domain/QcTaskInfo.java | 12 ++++++ .../org/dromara/api/mapper/PdaApiMapper.java | 10 +++++ .../dromara/api/service/IPdaApiService.java | 4 +- .../api/service/impl/IPdaApiServiceImpl.java | 10 ++++- .../resources/mapper/api/PdaApiMapper.xml | 23 +++++++++++ .../qms/dubbo/RemoteQmsApiServiceImpl.java | 24 ++++------- .../wms/controller/WmsPdaApiController.java | 41 +++++++++++-------- .../dromara/wms/domain/BaseMachineInfo.java | 10 +++++ .../wms/domain/WmsHppStorageDetail.java | 1 + .../dromara/wms/domain/WmsPsmStorePlace.java | 14 +++---- .../wms/domain/bo/WmsPsmStorePlaceBo.java | 9 ++-- .../wms/domain/vo/WmsPsmStorePlaceVo.java | 4 +- .../dromara/wms/mapper/WmsPdaApiMapper.java | 6 +-- .../wms/mapper/WmsPsmStorePlaceMapper.java | 2 + .../wms/service/IWmsPdaApiService.java | 2 + .../service/impl/WmsPdaApiServiceImpl.java | 6 +++ .../impl/WmsPsmStorePlaceServiceImpl.java | 26 +++++++----- .../resources/mapper/wms/WmsPdaApiMapper.xml | 9 +++- 19 files changed, 170 insertions(+), 70 deletions(-) create mode 100644 ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/QcTaskInfo.java create mode 100644 ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/mapper/PdaApiMapper.java create mode 100644 ruoyi-modules/hwmom-api/src/main/resources/mapper/api/PdaApiMapper.xml create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java index 34c1601..c9080cb 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java @@ -3,12 +3,16 @@ package org.dromara.api.controller; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.api.domain.QcTaskInfo; import org.dromara.api.service.IPdaApiService; import org.dromara.common.core.domain.R; import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -35,8 +39,25 @@ public class PdaApiController { public BaseMaterial getMaterialInfo(@PathVariable(value = "MaterialCode", required = false) String MaterialCode) { return iPdaApiService.getMaterialInfo(MaterialCode); } + + @GetMapping(value = {"/getMaterialInfo"}) + public R getCheckMaterialInfo(String code) { + QcTaskInfo qcTaskInfo = iPdaApiService.getCheckMaterialInfo(code); + if (qcTaskInfo == null) { + return R.fail("查询失败"); + } + return R.ok(qcTaskInfo); + } + + @GetMapping("/getDefectDetail") - public List getDefectDetail(@NotBlank(message = "{defect.type.not.blank}") String defectType) { - return iPdaApiService.getDefectDetail(defectType); + public R< List> getDefectDetail(@NotBlank(message = "{defect.type.not.blank}") String defectType) { + + + List defectDetail = iPdaApiService.getDefectDetail(defectType); + if (defectDetail == null) { + return R.fail(); + } + return R.ok(defectDetail); } } diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/QcTaskInfo.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/QcTaskInfo.java new file mode 100644 index 0000000..cebf766 --- /dev/null +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/QcTaskInfo.java @@ -0,0 +1,12 @@ +package org.dromara.api.domain; + +import lombok.Data; + +@Data +public class QcTaskInfo { + private String taskId; + private Long materialId; + private String materialName; + private String operation; + +} diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/mapper/PdaApiMapper.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/mapper/PdaApiMapper.java new file mode 100644 index 0000000..b637658 --- /dev/null +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/mapper/PdaApiMapper.java @@ -0,0 +1,10 @@ +package org.dromara.api.mapper; + +import org.apache.ibatis.annotations.Param; +import org.dromara.api.domain.QcTaskInfo; +import org.springframework.stereotype.Repository; + +@Repository +public interface PdaApiMapper { + QcTaskInfo getCheckMaterialInfo(@Param("code") String code); +} diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java index cc63145..2fef57b 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java @@ -1,6 +1,6 @@ package org.dromara.api.service; -import org.dromara.common.core.domain.R; +import org.dromara.api.domain.QcTaskInfo; import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.vo.RemoteDefectVo; @@ -17,4 +17,6 @@ public interface IPdaApiService { BaseMaterial getMaterialInfo(String materialCode); List getDefectDetail(String defectType); + + QcTaskInfo getCheckMaterialInfo(String code); } diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java index 1013db7..62f826f 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java @@ -2,8 +2,9 @@ package org.dromara.api.service.impl; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.api.domain.QcTaskInfo; +import org.dromara.api.mapper.PdaApiMapper; import org.dromara.api.service.IPdaApiService; -import org.dromara.common.core.domain.R; import org.dromara.pda.api.RemotePdaMesApiService; import org.dromara.pda.api.RemotePdaQmsApiService; import org.dromara.pda.api.model.BaseMaterial; @@ -29,4 +30,11 @@ public class IPdaApiServiceImpl implements IPdaApiService { public List getDefectDetail(String defectType) { return remotePdaQmsApiService.remoteQueryDefectList(defectType,"000000"); } + + private final PdaApiMapper pdaApiMapper; + + @Override + public QcTaskInfo getCheckMaterialInfo(String code) { + return pdaApiMapper.getCheckMaterialInfo(code); + } } diff --git a/ruoyi-modules/hwmom-api/src/main/resources/mapper/api/PdaApiMapper.xml b/ruoyi-modules/hwmom-api/src/main/resources/mapper/api/PdaApiMapper.xml new file mode 100644 index 0000000..b45c616 --- /dev/null +++ b/ruoyi-modules/hwmom-api/src/main/resources/mapper/api/PdaApiMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java index 4f4f129..6abe1a3 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java @@ -1,30 +1,20 @@ package org.dromara.qms.dubbo; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; -import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.pda.api.RemotePdaMesApiService; import org.dromara.pda.api.RemotePdaQmsApiService; -import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.vo.RemoteDefectVo; -import org.dromara.qms.domain.QcDefectDetail; import org.dromara.qms.domain.bo.QcDefectDetailBo; import org.dromara.qms.domain.vo.QcDefectDetailVo; import org.dromara.qms.mapper.QcDefectDetailMapper; import org.dromara.qms.mapper.QcDefectInfoMapper; import org.dromara.qms.service.IQcDefectDetailService; -import org.dromara.system.api.domain.vo.RemoteUserVo; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Map; @RequiredArgsConstructor @Service @@ -34,23 +24,25 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService { private final QcDefectInfoMapper qcDefectInfoMapper; private final QcDefectDetailMapper qcDefectDetailMapper; private final IQcDefectDetailService iQcDefectDetailService; + /** * 获取缺陷数据接口 + * * @param defectType 缺陷类型 * @param tenantId 租户编号 - * @return * @throws UserException */ @Override public List remoteQueryDefectList(String defectType, String tenantId) throws UserException { return TenantHelper.dynamic(tenantId, () -> { - QcDefectDetailBo bo=new QcDefectDetailBo(); + QcDefectDetailBo bo = new QcDefectDetailBo(); bo.setDefectType(defectType); bo.setTenantId("000000"); - List DefectDetailVos = iQcDefectDetailService.queryList(bo); - RemoteDefectVo rem=new RemoteDefectVo(); - List remoteDefectVoList=new ArrayList<>(); - for(QcDefectDetailVo qcDefectDetailVo:DefectDetailVos){ + List DefectDetailVos = iQcDefectDetailService.queryList(bo); + + List remoteDefectVoList = new ArrayList<>(); + for (QcDefectDetailVo qcDefectDetailVo : DefectDetailVos) { + RemoteDefectVo rem = new RemoteDefectVo(); rem.setDefectCode(qcDefectDetailVo.getDefectCode()); rem.setDefectDesc(qcDefectDetailVo.getDefectDesc()); remoteDefectVoList.add(rem); 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 74fdda6..62061c4 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 @@ -21,7 +21,8 @@ public class WmsPdaApiController extends BaseController { private final IWmsReturnOrderService wmsReturnOrderService; private final IWmsPsmStorePlaceService wmsPsmStorePlaceService; - + private final IWmsBaseLocationService baseLocationService; + private final IWmsHppStorePlaceService wmsHppStorePlaceService; /** * 原材料退库-现场扫描 @@ -48,8 +49,6 @@ public class WmsPdaApiController extends BaseController { return toAjax(result); } - private final IWmsBaseLocationService baseLocationService; - @PostMapping("/raw/inSelectCode") public R inSelectCode(String code) { @@ -89,7 +88,6 @@ public class WmsPdaApiController extends BaseController { /** * 原材料出库提交 - * */ @PostMapping("/raw/selectInVentoryByBatchCode") public R rawSelectInVentoryByBatchCode(WmsOutstockRecord outstockRecord) { @@ -171,8 +169,6 @@ public class WmsPdaApiController extends BaseController { return R.ok(wmsHppInStockDetailVo); } - private final IWmsHppStorePlaceService wmsHppStorePlaceService; - /** * 半成品入库提交 * @@ -217,14 +213,16 @@ public class WmsPdaApiController extends BaseController { */ @PostMapping("/seimMove/selectStore") public R> seimMoveSelectStore() { - List list=apiService.seimMoveSelectStoreLocation(); - return R.ok(list) ; + List list = apiService.seimMoveSelectStoreLocation(); + return R.ok(list); } + @PostMapping("/seimMove/submit") - public R seimMoveSubmit(Long id,String placeId) { - Boolean result = apiService.seimMoveSubmit(id,placeId); + public R seimMoveSubmit(Long id, String placeId) { + Boolean result = apiService.seimMoveSubmit(id, placeId); return result ? R.ok() : R.fail(); } + /** * 查询班组和班次列表 * @@ -254,7 +252,7 @@ public class WmsPdaApiController extends BaseController { /** * 盘点——查询库存存储库位 * - * @param type 原材料、半成品盘点 + * @param type 原材料、半成品盘点 * @param storeId 仓库id */ @PostMapping("/storeCheck/selectInventorLocationList") @@ -267,15 +265,16 @@ public class WmsPdaApiController extends BaseController { } @PostMapping("/storeCheck/submitOrder") - public R storeCheckSubmitOrder(@RequestParam("storeId") Long storeId,@RequestParam("type") String type,@RequestParam("location") List list) { - WmsInventoryCheck wmsInventoryCheck= apiService.storeCheckSubmitOrder(type,storeId,list); + public R storeCheckSubmitOrder(@RequestParam("storeId") Long storeId, @RequestParam("type") String type, @RequestParam("location") List list) { + WmsInventoryCheck wmsInventoryCheck = apiService.storeCheckSubmitOrder(type, storeId, list); return R.ok(wmsInventoryCheck); } + // 根据库位查询库存 @PostMapping("/storeCheck/selectInventory") - public R< List> storeCheckSelectInventory(String locationCode,String type) { - List list=apiService.storeCheckSelectInventory(locationCode,type); + public R> storeCheckSelectInventory(String locationCode, String type) { + List list = apiService.storeCheckSelectInventory(locationCode, type); if (list == null || list.isEmpty()) { return R.fail(); } @@ -283,20 +282,26 @@ public class WmsPdaApiController extends BaseController { } @PostMapping("/storeCheck/submitCheckRecord") - public R< Void> storeCheckSubmitCheckRecord(@RequestBody WmsInventoryCheckRecord wmsInventoryCheckRecord) { - Boolean result=apiService.storeCheckSubmitCheckRecord(wmsInventoryCheckRecord); + public R storeCheckSubmitCheckRecord(@RequestBody WmsInventoryCheckRecord wmsInventoryCheckRecord) { + Boolean result = apiService.storeCheckSubmitCheckRecord(wmsInventoryCheckRecord); return result ? R.ok() : R.fail(); } /** * 完成盘点 + * * @param checkCode 盘点单号 */ @PostMapping("/storeCheck/storeCheckWorkOver") public R storeCheckStoreCheckWorkOver(String checkCode) { - Boolean result=apiService.storeCheckStoreCheckWorkOver(checkCode); + Boolean result = apiService.storeCheckStoreCheckWorkOver(checkCode); return result ? R.ok() : R.fail(); } + @PostMapping("/selectMachineInfo") + public R> slectMachineInfo() { + List list = apiService.slectMachineInfo(); + return R.ok(list); + } } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java new file mode 100644 index 0000000..839ff7d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java @@ -0,0 +1,10 @@ +package org.dromara.wms.domain; + +import lombok.Data; + +@Data +public class BaseMachineInfo { + private String machineCode, + machineName, + machineIp; +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java index 5b7a779..1be69f1 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java @@ -97,4 +97,5 @@ public class WmsHppStorageDetail implements Serializable { private Date minTime; @TableField(exist = false) private Date maxTime; + private String unitName; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStorePlace.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStorePlace.java index 1d56067..38ff2de 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStorePlace.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStorePlace.java @@ -1,9 +1,7 @@ package org.dromara.wms.domain; -import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serial; import java.util.Date; @@ -18,8 +16,8 @@ import java.util.Date; @TableName("wms_psm_store_place") public class WmsPsmStorePlace { - @Serial - private static final long serialVersionUID = 1L; + // @Serial + // private static final long serialVersionUID = 1L; /** * 表主键 @@ -45,7 +43,7 @@ public class WmsPsmStorePlace { /** * sap库区代码 */ - private String sapCode; + private Long storeArea; /** * 租户id */ @@ -72,7 +70,9 @@ public class WmsPsmStorePlace { private Date updateTime; @TableField(exist = false) private String storeCode; - - + @TableField(exist = false) + private String storeName; + @TableField(exist = false) + private String storeTypeName; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStorePlaceBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStorePlaceBo.java index 1489d8b..e153e4d 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStorePlaceBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStorePlaceBo.java @@ -48,10 +48,9 @@ public class WmsPsmStorePlaceBo extends BaseEntity { /** * sap库区代码 */ - @NotBlank(message = "sap库区代码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String sapCode; - - private String tenantId; - + // @NotBlank(message = "sap库区代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storeArea; + private String storeName; + private String storeTypeName; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStorePlaceVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStorePlaceVo.java index 90e878b..989ae2f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStorePlaceVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStorePlaceVo.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.wms.domain.WmsPsmStorePlace; @@ -58,7 +56,7 @@ public class WmsPsmStorePlaceVo implements Serializable { * sap库区代码 */ @ExcelProperty(value = "sap库区代码") - private String sapCode; + private Long storeArea; /** * 租户id diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java index f2be138..7f56567 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java @@ -3,10 +3,7 @@ package org.dromara.wms.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.dromara.wms.domain.ShiftChange; -import org.dromara.wms.domain.WmsPsmInLoad; -import org.dromara.wms.domain.WmsPsmInLoadDetail; -import org.dromara.wms.domain.WmsPsmInStock; +import org.dromara.wms.domain.*; import org.dromara.wms.domain.vo.StoreInfoVo; import org.dromara.wms.domain.vo.TeamInfoVo; import org.dromara.wms.domain.vo.WmsBaseLocationVo; @@ -51,4 +48,5 @@ public interface WmsPdaApiMapper { List selectSemiCheckLocationList(Long storeId); + List slectMachineInfo(); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorePlaceMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorePlaceMapper.java index 382abea..99b1c2a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorePlaceMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorePlaceMapper.java @@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Select; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsPsmStorePlace; import org.dromara.wms.domain.vo.WmsPsmStorePlaceVo; +import org.springframework.stereotype.Repository; /** * 成品库位管理Mapper接口 @@ -11,6 +12,7 @@ import org.dromara.wms.domain.vo.WmsPsmStorePlaceVo; * @author LionLi * @date 2025-01-15 */ +@Repository public interface WmsPsmStorePlaceMapper extends BaseMapperPlus { @Select("select top 1 store_place_id,store_place_code, store_place_name, place.store_id," + "sap_code, store_code, store_name,store_type_id from wms_psm_store_place place " + diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java index 0990c7d..34341d4 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java @@ -56,4 +56,6 @@ public interface IWmsPdaApiService { List seimMoveSelectStoreLocation(); Boolean seimMoveSubmit(Long id, String placeId); + + List slectMachineInfo(); } 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 4eb913d..9cf43c2 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 @@ -120,6 +120,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { // System.out.println("更新成功"); WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail(); BeanUtils.copyProperties(vo, hppStorageDetail); + hppStorageDetail.setObjId(null); hppStorageDetail.setStorageNum(vo.getInstockNum()); BaseMaterialInfoVo baseMaterialInfoVo = baseMaterialInfoMapper.selectVoById(vo.getMaterialId()); @@ -367,4 +368,9 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { hppStorageDetail.setStorePlaceCode(placeId); return hppStorageDetailMapper.updateById(hppStorageDetail) > 0; } + + @Override + public List slectMachineInfo() { + return apiMapper.slectMachineInfo(); + } } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorePlaceServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorePlaceServiceImpl.java index 5e2bd71..2f58e9d 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorePlaceServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorePlaceServiceImpl.java @@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsPsmStore; import org.dromara.wms.domain.WmsPsmStorePlace; +import org.dromara.wms.domain.WmsPsmStoreType; import org.dromara.wms.domain.bo.WmsPsmStorePlaceBo; import org.dromara.wms.domain.vo.WmsPsmStorePlaceVo; import org.dromara.wms.mapper.WmsPsmStorePlaceMapper; @@ -41,7 +42,7 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { * @return 成品库位管理 */ @Override - public WmsPsmStorePlaceVo queryById(Long storePlaceId){ + public WmsPsmStorePlaceVo queryById(Long storePlaceId) { return baseMapper.selectVoById(storePlaceId); } @@ -74,14 +75,17 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { private MPJLambdaWrapper buildQueryWrapper(WmsPsmStorePlaceBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsPsmStorePlace.class) - .selectAll(WmsPsmStorePlace.class).select(WmsPsmStore::getStoreCode) - .leftJoin(WmsPsmStore.class,WmsPsmStore::getStoreId,WmsPsmStorePlace::getStoreId) - .eq(bo.getStorePlaceId() != null, WmsPsmStorePlace::getStorePlaceId, bo.getStorePlaceId()) - .eq(StringUtils.isNotBlank(bo.getStorePlaceCode()), WmsPsmStorePlace::getStorePlaceCode, bo.getStorePlaceCode()) - .like(StringUtils.isNotBlank(bo.getStorePlaceName()), WmsPsmStorePlace::getStorePlaceName, bo.getStorePlaceName()) - .eq(bo.getStoreId() != null, WmsPsmStorePlace::getStoreId, bo.getStoreId()) - .eq(StringUtils.isNotBlank(bo.getSapCode()), WmsPsmStorePlace::getSapCode, bo.getSapCode()) - .orderByDesc(WmsPsmStorePlace::getCreateTime); + .selectAll(WmsPsmStorePlace.class) + // 仓库 + .leftJoin(WmsPsmStore.class, WmsPsmStore::getStoreId, WmsPsmStorePlace::getStoreId).select(WmsPsmStore::getStoreName) + // 区域 + .leftJoin(WmsPsmStoreType.class,WmsPsmStoreType::getStoreTypeId,WmsPsmStorePlace::getStorePlaceId).select(WmsPsmStoreType::getStoreTypeName) + .eq(bo.getStorePlaceId() != null, WmsPsmStorePlace::getStorePlaceId, bo.getStorePlaceId()) + .eq(StringUtils.isNotBlank(bo.getStorePlaceCode()), WmsPsmStorePlace::getStorePlaceCode, bo.getStorePlaceCode()) + .like(StringUtils.isNotBlank(bo.getStorePlaceName()), WmsPsmStorePlace::getStorePlaceName, bo.getStorePlaceName()) + .eq(bo.getStoreId() != null, WmsPsmStorePlace::getStoreId, bo.getStoreId()) + // .eq(StringUtils.isNotBlank(bo.getSapCode()), WmsPsmStorePlace::getSapCode, bo.getSapCode()) + .orderByDesc(WmsPsmStorePlace::getCreateTime); return lqw; } @@ -122,7 +126,7 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(WmsPsmStorePlace entity){ + private void validEntityBeforeSave(WmsPsmStorePlace entity) { //TODO 做一些数据校验,如唯一约束 } @@ -135,7 +139,7 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml index 2913fca..0a787d2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml @@ -99,7 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join wms_hpp_store_place wsp on wsp.store_place_code = whsd.store_place_code where wsp.store_id=#{storeId} group by whsd.store_place_code + - + +