From c64f215e21778a744c9ec1c32d3c89078ba5f4c3 Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 21 Jan 2025 15:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=9E=B6=E5=AD=90?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=EF=BC=8C=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/WmsPdaApiController.java | 16 ++++++++++++ .../org/dromara/wms/domain/WmsPsmInLoad.java | 1 + .../dromara/wms/domain/bo/WmsPsmInLoadBo.java | 18 ++++++------- .../wms/mapper/WmsPsmInLoadMapper.java | 2 ++ .../wms/service/IWmsPdaApiService.java | 3 +++ .../service/impl/WmsMoveOrderServiceImpl.java | 4 +-- .../service/impl/WmsPdaApiServiceImpl.java | 25 ++++++++++++------- .../resources/mapper/wms/WmsPdaApiMapper.xml | 2 ++ 8 files changed, 51 insertions(+), 20 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 30498982..374a58b4 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 @@ -5,12 +5,15 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.bo.WmsReturnOrderBo; import org.dromara.wms.domain.vo.WmsOutstockRecordVo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; import org.dromara.wms.service.IWmsPdaApiService; import org.dromara.wms.service.IWmsReturnOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/pda") public class WmsPdaApiController extends BaseController { @@ -36,4 +39,17 @@ public class WmsPdaApiController extends BaseController { } return toAjax(result); } + + @PostMapping("/product/bindVehicleSubmit") + public R bindVehicleSubmit(@RequestParam String vehicleCode,@RequestParam List productList) { + // System.out.println(vehicleCode); + // System.out.println(productList.toString()); + + return R.ok(); + } + @PostMapping("/product/selectVehicleInfo") + public R selectVehicleInfo(String code){ + WmsPsmInLoadVo wmsPsmInLoadVo=apiService.productSelectVehicleInfo(code); + return R.ok(); + } } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java index 242375ce..bce76c2d 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java @@ -24,6 +24,7 @@ public class WmsPsmInLoad { /** * 表主键 */ + @TableId(value = "in_load_id", type = IdType.AUTO) private Long inLoadId; /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java index 69283c6f..7b2f880c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java @@ -23,55 +23,55 @@ public class WmsPsmInLoadBo extends BaseEntity { /** * 表主键 */ - @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long inLoadId; /** * 装车班次 */ - @NotNull(message = "装车班次不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "装车班次不能为空", groups = { AddGroup.class, EditGroup.class }) private Long loadShift; /** * 装车班组 */ - @NotNull(message = "装车班组不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "装车班组不能为空", groups = { AddGroup.class, EditGroup.class }) private Long loadClass; /** * 工装条码 */ - @NotBlank(message = "工装条码不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "工装条码不能为空", groups = { AddGroup.class, EditGroup.class }) private String toolingBarcode; /** * 仓库名称 */ - @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String storeName; /** * 库位条码 */ - @NotBlank(message = "库位条码不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "库位条码不能为空", groups = { AddGroup.class, EditGroup.class }) private String storePlaceCode; /** * 物料ID */ - @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long materialId; /** * 轮胎规格 */ - @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class }) private String materialSpe; /** * 品级编号 */ - @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class }) private String checkGradeCode; /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java index 9cf86719..16d5fa7b 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java @@ -3,6 +3,7 @@ package org.dromara.wms.mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsPsmInLoad; import org.dromara.wms.domain.vo.WmsPsmInLoadVo; +import org.springframework.stereotype.Repository; /** * 装车架子信息Mapper接口 @@ -10,6 +11,7 @@ import org.dromara.wms.domain.vo.WmsPsmInLoadVo; * @author LionLi * @date 2025-01-15 */ +@Repository public interface WmsPsmInLoadMapper extends BaseMapperPlus { } 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 78d9dab0..2d280c8f 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 @@ -1,9 +1,12 @@ package org.dromara.wms.service; import org.dromara.wms.domain.vo.WmsOutstockRecordVo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; public interface IWmsPdaApiService { WmsOutstockRecordVo returnSelectCode(String code); void rawReturnSubmitUpdateStateById(Long warehouseId); + + WmsPsmInLoadVo productSelectVehicleInfo(String code); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java index 1d30c9dc..02cc091a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java @@ -113,7 +113,7 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService { */ @Override public Boolean insertByBo(WmsMoveOrderBo bo) { - String username = LoginHelper.getUsername(); + // String username = LoginHelper.getUsername(); //查询仓库现有的物料数量 HashMap> list = wmsInventoryService.selectInventorys(bo); List planList = list.get("planList");//计划库位数据 @@ -142,7 +142,7 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService { int removeRows = wmsInventoryService.deletePlanList(ids); int rows = wmsInventoryService.updateWmsInventorys(updateList); WmsMoveOrder add = MapstructUtils.convert(bo, WmsMoveOrder.class); - add.setCreateBy(username); + // add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { 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 4f4d2887..274851e8 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 @@ -5,13 +5,12 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import io.github.linpeilie.BaseMapper; import org.dromara.common.core.utils.StringUtils; -import org.dromara.wms.domain.BaseMaterialInfo; -import org.dromara.wms.domain.WmsBaseLocation; -import org.dromara.wms.domain.WmsBaseWarehouse; -import org.dromara.wms.domain.WmsOutstockRecord; +import org.dromara.wms.domain.*; import org.dromara.wms.domain.vo.WmsOutstockRecordVo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; import org.dromara.wms.mapper.WmsOutstockRecordMapper; import org.dromara.wms.mapper.WmsPdaApiMapper; +import org.dromara.wms.mapper.WmsPsmInLoadMapper; import org.dromara.wms.service.IWmsPdaApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,10 +18,11 @@ import org.springframework.stereotype.Service; @Service public class WmsPdaApiServiceImpl implements IWmsPdaApiService { @Autowired - private WmsOutstockRecordMapper wmsOutstockRecordMapper; -@Autowired -private WmsPdaApiMapper apiMapper; - + private WmsOutstockRecordMapper wmsOutstockRecordMapper; + @Autowired + private WmsPdaApiMapper apiMapper; + @Autowired + private WmsPsmInLoadMapper psmInLoadMapper; @Override public WmsOutstockRecordVo returnSelectCode(String code) { @@ -31,7 +31,7 @@ private WmsPdaApiMapper apiMapper; .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec) .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId) .select(WmsBaseLocation::getWarehouseId) - .leftJoin(WmsBaseLocation.class,WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode) + .leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode) .eq(WmsOutstockRecord::getBatchCode, code) .eq(WmsOutstockRecord::getReturnFlag, 0) .orderByDesc(WmsOutstockRecord::getCreateTime); @@ -43,4 +43,11 @@ private WmsPdaApiMapper apiMapper; apiMapper.rawReturnSubmitUpdateStateById(warehouseId); } + + @Override + public WmsPsmInLoadVo productSelectVehicleInfo(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("toolingBarcode", code).eq("storePlaceCode",null); + return psmInLoadMapper.selectVoOne(queryWrapper); + } } 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 f25459d5..c2928d1f 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 @@ -8,4 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update wms_outstock_record set return_flag= '1' where outstock_record_id=#{warehouseId} + +