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 67053528..9e5f9379 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 @@ -1,9 +1,7 @@ package org.dromara.wms.controller; import lombok.RequiredArgsConstructor; -import org.apache.ibatis.annotations.Param; import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.DateUtils; import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.*; import org.dromara.wms.domain.bo.WmsReturnOrderBo; @@ -11,9 +9,7 @@ import org.dromara.wms.domain.vo.*; import org.dromara.wms.service.*; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RequiredArgsConstructor @RestController @@ -94,7 +90,6 @@ public class WmsPdaApiController extends BaseController { /** * 原材料出库提交 * - * @return */ @PostMapping("/raw/selectInVentoryByBatchCode") public R rawSelectInVentoryByBatchCode(WmsOutstockRecord outstockRecord) { @@ -216,6 +211,19 @@ public class WmsPdaApiController extends BaseController { return result ? R.ok() : R.fail(); } + /** + * 半制品移库 + */ + @PostMapping("/seimMove/selectStore") + public R> seimMoveSelectStore() { + List list=apiService.seimMoveSelectStoreLocation(); + return R.ok(list) ; + } + @PostMapping("/seimMove/submit") + public R seimMoveSubmit(Long id,Long placeId) { + Boolean result = apiService.seimMoveSubmit(id,placeId); + return result ? R.ok() : R.fail(); + } /** * 查询班组和班次列表 * @@ -245,9 +253,8 @@ public class WmsPdaApiController extends BaseController { /** * 查询库存存储库位 * - * @param type - * @param storeId - * @return + * @param type 原材料、半成品? + * @param storeId 仓库id */ @PostMapping("/storeCheck/selectInventorLocationList") public R> storeCheckSelectLocation(String type, Long storeId) { @@ -265,7 +272,6 @@ public class WmsPdaApiController extends BaseController { return R.ok(wmsInventoryCheck); } // 根据库位查询库存 - @PostMapping("/storeCheck/selectInventory") public R< List> storeCheckSelectInventory(String locationCode) { List list=apiService.storeCheckSelectInventory(locationCode); @@ -280,9 +286,16 @@ public class WmsPdaApiController extends BaseController { 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); return result ? R.ok() : R.fail(); } + + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java index 5fc91f5c..f124525c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java @@ -1,11 +1,10 @@ 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.io.Serializable; import java.util.Date; /** @@ -16,7 +15,7 @@ import java.util.Date; */ @Data @TableName("wms_hpp_store_place") -public class WmsHppStorePlace{ +public class WmsHppStorePlace implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -80,6 +79,10 @@ public class WmsHppStorePlace{ */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - + /** + * 仓库名 + */ + @TableField(exist = false) + private String storeName; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java index 4ef2efa3..a10a2ff2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java @@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -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.WmsHppStorePlace; @@ -95,6 +93,9 @@ public class WmsHppStorePlaceVo implements Serializable { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - + /** + * 仓库名 + */ + private String storeName; } 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 584e84fe..cdeccf96 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 @@ -52,4 +52,8 @@ public interface IWmsPdaApiService { Boolean storeCheckSubmitCheckRecord(WmsInventoryCheckRecord wmsInventoryCheckRecord); Boolean storeCheckStoreCheckWorkOver(String checkCode); + + List seimMoveSelectStoreLocation(); + + Boolean seimMoveSubmit(Long id, Long placeId); } 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 7dfb6594..5e9fb93b 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 @@ -3,11 +3,9 @@ package org.dromara.wms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.github.yulichang.wrapper.UpdateJoinWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.satoken.utils.LoginHelper; @@ -31,6 +29,17 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { private final WmsHppInStockDetailMapper baseMapper; private final WmsPsmInStockMapper wmsPsmInStockMapper; private final WmsPsmInLoadDetailMapper wmsPsmInLoadDetailMapper; + private final WmsInventoryCheckRecordMapper wmsInventoryCheckRecordMapper; + private final WmsInventoryCheckMapper wmsInventoryCheckMapper; + private final WmsHppInStockDetailMapper hppInStockDetailMapper;//入库记录 + private final WmsHppStorageDetailMapper hppStorageDetailMapper;//库存表 + private final WmsHppOutStockDetailMapper hppOutStockDetailMapper;//半成品出库记录 + private final WmsHppStorePlaceMapper wmsHppStorePlaceMapper;//半成品库位 + private final WmsInstockPrintMapper wmsInstockPrintMapper; + private final WmsInstockRecordMapper wmsInstockRecordMapper; + private final WmsInventoryMapper wmsInventoryMapper; + private final WmsOutstockDetailMapper wmsOutstockDetailMapper; + private final BaseMaterialInfoMapper baseMaterialInfoMapper;//物料基础信息 @Override @@ -96,15 +105,11 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return false; } - @Override public WmsHppInStockDetailVo semiSelectVehicleInfo(String code) { return baseMapper.semiSelectVehicleInfo(code); } - private final WmsHppInStockDetailMapper hppInStockDetailMapper;//入库记录 - private final WmsHppStorageDetailMapper hppStorageDetailMapper;//库存表 - private final BaseMaterialInfoMapper baseMaterialInfoMapper;//物料基础信息 @Override public Boolean updataInStoreRecord(WmsHppInStockDetailVo vo) { @@ -138,7 +143,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return hppStorageDetailMapper.selectHppStorageDetailInfobyCode(code); } - private final WmsHppOutStockDetailMapper hppOutStockDetailMapper;//半成品出库记录 @Override public Boolean semiSubmitOutInfo(WmsHppStorageDetailVo vo) { @@ -157,15 +161,12 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return true; } - private final WmsInstockPrintMapper wmsInstockPrintMapper; @Override public WmsInstockPrintVo inSelectCode(String code) { return wmsInstockPrintMapper.inSelectCode(code); } - private final WmsInstockRecordMapper wmsInstockRecordMapper; - private final WmsInventoryMapper wmsInventoryMapper; @Override public Boolean inSubmit(WmsInstockPrintVo vo) { @@ -191,7 +192,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return true; } - private final WmsOutstockDetailMapper wmsOutstockDetailMapper; @Override public List outSelectByOrderCode(String orderCode) { @@ -248,8 +248,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { /** * 出库连子表查物料库存 * - * @param outstockRecord - * @return */ @Override public WmsInventory outSelectInVentoryByBatch(WmsOutstockRecord outstockRecord) { @@ -259,23 +257,17 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { @Override public List selectStoreInfo(String type) { - - List list = apiMapper.selectRawStore(); - - return list; + return apiMapper.selectRawStore(); } @Override public List storeCheckSelectLocation(String type, Long storeId) { - List list = apiMapper.selectRawCheckLocationList(storeId); - return list; + return apiMapper.selectRawCheckLocationList(storeId); + } - private final WmsInventoryCheckMapper wmsInventoryCheckMapper; // 查询盘点工单 - - @Override public WmsInventoryCheck storeCheckSubmitOrder(Long storeId, List list) { String tag = DateUtils.dateTime(); @@ -303,7 +295,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return wmsInventoryMapper.selectVoList(lqw); } - private final WmsInventoryCheckRecordMapper wmsInventoryCheckRecordMapper; @Override public Boolean storeCheckSubmitCheckRecord(WmsInventoryCheckRecord wmsInventoryCheckRecord) { @@ -321,6 +312,24 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { // updateWrapper.eq(WmsInventoryCheck::getCheckCode,checkCode ) // .set(WmsInventoryCheck::getCheckStatus, "3") // .set(WmsInventoryCheck::getEndTime, DateUtils.getNowDate()); - return apiMapper.updateWmsInventoryCheck(checkCode,3) > 0; + return apiMapper.updateWmsInventoryCheck(checkCode, 3) > 0; + } + + @Override + public List seimMoveSelectStoreLocation() { + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppStorePlace.class) + .select(WmsHppStorePlace::getStorePlaceCode, WmsHppStorePlace::getObjId) + .select(WmsHppStore::getStoreName) + .leftJoin(WmsHppStore.class, WmsHppStore::getObjId, WmsHppStorePlace::getStoreId); + return wmsHppStorePlaceMapper.selectVoList(lqw); + + } + + @Override + public Boolean seimMoveSubmit(Long id, Long placeId) { + WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail(); + hppStorageDetail.setObjId(id); + hppStorageDetail.setStorePlaceId(placeId); + return hppStorageDetailMapper.updateById(hppStorageDetail) > 0; } }