diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java index e273d94e..b0976fd3 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java @@ -76,7 +76,7 @@ public class WmsConfigurationController extends BaseController { @Log(title = "仓库模块配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsConfigurationBo bo) { + public R add(@RequestBody WmsConfigurationBo bo) { return toAjax(wmsConfigurationService.insertByBo(bo)); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java index af36f1a6..ba501380 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; import org.dromara.wms.domain.BaseMaterialInfo; import org.dromara.wms.domain.WmsBaseWarehouse; @@ -123,9 +124,8 @@ public class WmsConfigurationServiceImpl implements IWmsConfigurationService { @Override public Boolean insertByBo(WmsConfigurationBo bo) { WmsConfiguration add = MapstructUtils.convert(bo, WmsConfiguration.class); -// LoginUser currentUser = DataPermissionHelper.getVariable("user"); -// String tenantId = currentUser.getTenantId(); -// add.setTenantId(Integer.valueOf(tenantId)); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setConfigurationId(add.getConfigurationId()); @@ -143,6 +143,8 @@ public class WmsConfigurationServiceImpl implements IWmsConfigurationService { public Boolean updateByBo(WmsConfigurationBo bo) { WmsConfiguration update = MapstructUtils.convert(bo, WmsConfiguration.class); validEntityBeforeSave(update); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); return baseMapper.updateByconfigurationId(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java index a80ff42b..386cb388 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsHppInStockDetail; import org.dromara.wms.domain.WmsHppStorePlace; import org.dromara.wms.domain.bo.WmsHppInStockDetailBo; @@ -97,6 +98,8 @@ public class WmsHppInStockDetailServiceImpl implements IWmsHppInStockDetailServi @Override public Boolean insertByBo(WmsHppInStockDetailBo bo) { WmsHppInStockDetail add = MapstructUtils.convert(bo, WmsHppInStockDetail.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -114,6 +117,8 @@ public class WmsHppInStockDetailServiceImpl implements IWmsHppInStockDetailServi @Override public Boolean updateByBo(WmsHppInStockDetailBo bo) { WmsHppInStockDetail update = MapstructUtils.convert(bo, WmsHppInStockDetail.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java index b690e95c..f9aca614 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsHppOutStockDetail; import org.dromara.wms.domain.WmsHppStorePlace; @@ -99,6 +100,8 @@ public class WmsHppOutStockDetailServiceImpl implements IWmsHppOutStockDetailSer @Override public Boolean insertByBo(WmsHppOutStockDetailBo bo) { WmsHppOutStockDetail add = MapstructUtils.convert(bo, WmsHppOutStockDetail.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -116,6 +119,8 @@ public class WmsHppOutStockDetailServiceImpl implements IWmsHppOutStockDetailSer @Override public Boolean updateByBo(WmsHppOutStockDetailBo bo) { WmsHppOutStockDetail update = MapstructUtils.convert(bo, WmsHppOutStockDetail.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java index 68785f42..10cb91de 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsHppInStockDetail; import org.dromara.wms.domain.WmsHppStorageDetail; import org.dromara.wms.domain.WmsHppStorePlace; @@ -97,6 +98,8 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi @Override public Boolean insertByBo(WmsHppStorageDetailBo bo) { WmsHppStorageDetail add = MapstructUtils.convert(bo, WmsHppStorageDetail.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -114,6 +117,8 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi @Override public Boolean updateByBo(WmsHppStorageDetailBo bo) { WmsHppStorageDetail update = MapstructUtils.convert(bo, WmsHppStorageDetail.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java index 0ccbb1db..1d7342ff 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsHppStorePlace; import org.dromara.wms.domain.bo.WmsHppStorePlaceBo; import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; @@ -93,6 +94,8 @@ public class WmsHppStorePlaceServiceImpl implements IWmsHppStorePlaceService { @Override public Boolean insertByBo(WmsHppStorePlaceBo bo) { WmsHppStorePlace add = MapstructUtils.convert(bo, WmsHppStorePlace.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -110,6 +113,8 @@ public class WmsHppStorePlaceServiceImpl implements IWmsHppStorePlaceService { @Override public Boolean updateByBo(WmsHppStorePlaceBo bo) { WmsHppStorePlace update = MapstructUtils.convert(bo, WmsHppStorePlace.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java index a663331b..9e20d344 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsHppStore; import org.dromara.wms.domain.bo.WmsHppStoreBo; import org.dromara.wms.domain.vo.WmsHppStoreVo; @@ -94,6 +95,8 @@ public class WmsHppStoreServiceImpl implements IWmsHppStoreService { @Override public Boolean insertByBo(WmsHppStoreBo bo) { WmsHppStore add = MapstructUtils.convert(bo, WmsHppStore.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -111,6 +114,8 @@ public class WmsHppStoreServiceImpl implements IWmsHppStoreService { @Override public Boolean updateByBo(WmsHppStoreBo bo) { WmsHppStore update = MapstructUtils.convert(bo, WmsHppStore.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java index 0e1f3a7d..7570ce2f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsHsmTooling; import org.dromara.wms.domain.bo.WmsHsmToolingBo; import org.dromara.wms.domain.vo.WmsHsmToolingVo; @@ -97,6 +98,8 @@ public class WmsHsmToolingServiceImpl implements IWmsHsmToolingService { @Override public Boolean insertByBo(WmsHsmToolingBo bo) { WmsHsmTooling add = MapstructUtils.convert(bo, WmsHsmTooling.class); + String username = LoginHelper.getUsername(); + add.setCreatedBy(username); add.setCreatedTime(new Date()); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; @@ -115,6 +118,8 @@ public class WmsHsmToolingServiceImpl implements IWmsHsmToolingService { @Override public Boolean updateByBo(WmsHsmToolingBo bo) { WmsHsmTooling update = MapstructUtils.convert(bo, WmsHsmTooling.class); + String username = LoginHelper.getUsername(); + update.setUpdatedBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java index 107ac34b..6f61ff21 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.*; import org.dromara.wms.domain.bo.BaseMaterialInfoBo; import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo; @@ -113,6 +114,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { public Boolean insertByBo(List bo) { ArrayList list = new ArrayList<>(); int a = 0; + String username = LoginHelper.getUsername(); for (WmsInstockDetailBo detailBo : bo) { BaseMaterialInfoBo baseMaterialInfo = new BaseMaterialInfoBo(); baseMaterialInfo.setMaterialId(detailBo.getMaterialId()); @@ -122,6 +124,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { add.setMaterialName(baseMaterialInfoVos.get(0).getMaterialName()); add.setMaterialSpe(baseMaterialInfoVos.get(0).getMaterialSpec()); add.setUnitName(baseMaterialInfoVos.get(0).getMaterialUnit()); + add.setCreateBy(username); a += baseMapper.insert(add); } return a>0; @@ -135,8 +138,10 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { */ @Override public Boolean updateByBo(WmsInstockDetailBo bo) { + String username = LoginHelper.getUsername(); if (bo.getPrintNum()==null){ WmsInstockDetail update = MapstructUtils.convert(bo, WmsInstockDetail.class); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateDetail(update)>0; } @@ -154,11 +159,13 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { wmsInstockPrint.setBatchCode(batchCode); wmsInstockPrint.setApportionQty(bo.getPrintNum().longValue()); wmsInstockPrint.setMaterialQty(bo.getBarcodeNum()); + wmsInstockPrint.setCreateBy(username); int rows = wmsInstockPrintService.insertWmsInstockPrint(wmsInstockPrint); WmsInstockDetail wmsInstockDetail = new WmsInstockDetail(); wmsInstockDetail.setPrintedNum(bo.getPrintedNum()+bo.getPrintNum()); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(WmsInstockDetail::getInstockDetailId,bo.getInstockDetailId()); + wmsInstockDetail.setUpdateBy(username); int update = baseMapper.update(wmsInstockDetail, updateWrapper); return update>0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java index e37b31c3..8b79e7a0 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsConfiguration; import org.dromara.wms.domain.WmsInstockOrder; @@ -131,6 +132,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { */ @Override public WmsInstockOrderVo insertByBo(WmsInstockOrderBo bo) { + String username = LoginHelper.getUsername(); Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm"); String orderDate = format.format(date); @@ -147,6 +149,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { WmsInstockOrder add = MapstructUtils.convert(bo, WmsInstockOrder.class); validEntityBeforeSave(add); add.setInstockCode(inStockOrder); + add.setCreateBy(username); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setInstockId(add.getInstockId()); @@ -174,10 +177,12 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { */ @Override public Boolean updateByBo(WmsInstockOrderBo bo) { + String username = LoginHelper.getUsername(); WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class); validEntityBeforeSave(update); // LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); // wrapper.eq(WmsInstockOrder::getInstockId,bo.getInstockId()); + update.setUpdateBy(username); int rows = baseMapper.updateInstock(update); return rows > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckRecordServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckRecordServiceImpl.java index dd3632c7..8e884c7f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckRecordServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckRecordServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsInventoryCheckRecord; import org.dromara.wms.domain.bo.WmsInventoryCheckRecordBo; import org.dromara.wms.domain.vo.WmsInventoryCheckRecordVo; @@ -106,6 +107,8 @@ public class WmsInventoryCheckRecordServiceImpl implements IWmsInventoryCheckRec @Override public Boolean insertByBo(WmsInventoryCheckRecordBo bo) { WmsInventoryCheckRecord add = MapstructUtils.convert(bo, WmsInventoryCheckRecord.class); + String username = LoginHelper.getUsername(); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -123,6 +126,8 @@ public class WmsInventoryCheckRecordServiceImpl implements IWmsInventoryCheckRec @Override public Boolean updateByBo(WmsInventoryCheckRecordBo bo) { WmsInventoryCheckRecord update = MapstructUtils.convert(bo, WmsInventoryCheckRecord.class); + String username = LoginHelper.getUsername(); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckServiceImpl.java index 9e80db67..c16ad8bf 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsInstockOrder; import org.dromara.wms.domain.WmsInventoryCheck; @@ -129,6 +130,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService { */ @Override public Boolean insertByBo(WmsInventoryCheckBo bo) { + String username = LoginHelper.getUsername(); Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm"); String orderDate = format.format(date).substring(2); @@ -144,6 +146,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService { String stockingOrder = order + orderDate + orderLast; WmsInventoryCheck add = MapstructUtils.convert(bo, WmsInventoryCheck.class); add.setCheckCode(stockingOrder); + 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/WmsMoveOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java index 73488fd4..1d30c9dc 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 @@ -11,6 +11,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.BaseMaterialInfo; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsInventory; @@ -112,6 +113,7 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService { */ @Override public Boolean insertByBo(WmsMoveOrderBo bo) { + String username = LoginHelper.getUsername(); //查询仓库现有的物料数量 HashMap> list = wmsInventoryService.selectInventorys(bo); List planList = list.get("planList");//计划库位数据 @@ -140,6 +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); 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/WmsOutstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java index 1850ef49..10bee34c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.BaseMaterialInfo; import org.dromara.wms.domain.WmsInstockDetail; import org.dromara.wms.domain.WmsInventory; @@ -118,6 +119,7 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService { */ @Override public Boolean insertByBo(List bo) { + String username = LoginHelper.getUsername(); ArrayList list = new ArrayList<>(); int rows = 0; for (WmsOutstockDetailBo detailBo : bo) { @@ -127,6 +129,7 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService { WmsOutstockDetail add = MapstructUtils.convert(detailBo, WmsOutstockDetail.class); add.setMaterialCode(baseMaterialInfoVos.get(0).getMaterialCode()); add.setMaterialName(baseMaterialInfoVos.get(0).getMaterialName()); + add.setCreateBy(username); rows += baseMapper.insert(add); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java index 6768e3fd..4c2ddc51 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.BaseMaterialInfo; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsOutstockDetail; @@ -126,6 +127,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { */ @Override public WmsOutstockOrderVo insertByBo(WmsOutstockOrderBo bo) { + String username = LoginHelper.getUsername(); Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm"); String orderDate = format.format(date); @@ -142,6 +144,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { WmsOutstockOrder add = MapstructUtils.convert(bo, WmsOutstockOrder.class); validEntityBeforeSave(add); add.setOutstockCode(outStockOrder); + add.setCreateBy(username); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setOutstockId(add.getOutstockId()); 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 35e6e503..424e3101 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 @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.bo.WmsPsmStorePlaceBo; @@ -92,7 +93,9 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { */ @Override public Boolean insertByBo(WmsPsmStorePlaceBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStorePlace add = MapstructUtils.convert(bo, WmsPsmStorePlace.class); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -109,7 +112,9 @@ public class WmsPsmStorePlaceServiceImpl implements IWmsPsmStorePlaceService { */ @Override public Boolean updateByBo(WmsPsmStorePlaceBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStorePlace update = MapstructUtils.convert(bo, WmsPsmStorePlace.class); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java index 30256b1a..e4381432 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsPsmStore; import org.dromara.wms.domain.WmsPsmStoreType; import org.dromara.wms.domain.bo.WmsPsmStoreBo; @@ -91,7 +92,9 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService { */ @Override public Boolean insertByBo(WmsPsmStoreBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStore add = MapstructUtils.convert(bo, WmsPsmStore.class); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -108,7 +111,9 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService { */ @Override public Boolean updateByBo(WmsPsmStoreBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStore update = MapstructUtils.convert(bo, WmsPsmStore.class); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreTypeServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreTypeServiceImpl.java index bddf5c99..ce2ea37f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreTypeServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsPsmStoreType; import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo; import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo; @@ -90,7 +91,9 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService { */ @Override public Boolean insertByBo(WmsPsmStoreTypeBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStoreType add = MapstructUtils.convert(bo, WmsPsmStoreType.class); + add.setCreateBy(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -107,7 +110,9 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService { */ @Override public Boolean updateByBo(WmsPsmStoreTypeBo bo) { + String username = LoginHelper.getUsername(); WmsPsmStoreType update = MapstructUtils.convert(bo, WmsPsmStoreType.class); + update.setUpdateBy(username); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; }