集成wms服务模块

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/commonSettings/CommonSettingsAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.commonSettings;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.commonSettings.repository.todo.CommonSettingsDO;
+import com.mhd.wms.interfaces.dto.commonSettings.CommonSettingsDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 常用设置Assembler
+ *
+ * @author gen
+ * @date 2024-07-29
+ */
+@Component
+public class CommonSettingsAssembler {
+
+    /**
+     * 转换实体
+     */
+    public CommonSettingsDO toDO(CommonSettingsDTO commonSettingsDTO) {
+        CommonSettingsDO commonSettingsDO = new CommonSettingsDO();
+        // 拷贝
+        BeanUtils.copyProperties(commonSettingsDTO, commonSettingsDO, IgnoreNullUtil.getNullPropertyNames(commonSettingsDTO));
+        return commonSettingsDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/containerUsageRecord/ContainerUsageRecordAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.containerUsageRecord;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.containerUsageRecord.repository.todo.ContainerUsageRecordDO;
+import com.mhd.wms.interfaces.dto.containerUsageRecord.ContainerUsageRecordDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 容器使用记录Assembler
+ *
+ * @author gen
+ * @date 2024-08-22
+ */
+@Component
+public class ContainerUsageRecordAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ContainerUsageRecordDO toDO(ContainerUsageRecordDTO containerUsageRecordDTO) {
+        ContainerUsageRecordDO containerUsageRecordDO = new ContainerUsageRecordDO();
+        // 拷贝
+        BeanUtils.copyProperties(containerUsageRecordDTO, containerUsageRecordDO, IgnoreNullUtil.getNullPropertyNames(containerUsageRecordDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(containerUsageRecordDTO.getId() != null){
+            if(userId != null){
+                containerUsageRecordDO.setUpdateBy(userId);
+            }else {
+                containerUsageRecordDO.setUpdateBy(new Long("0"));
+            }
+            containerUsageRecordDO.setUpdateByName(userName);
+            containerUsageRecordDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                containerUsageRecordDO.setCreateBy(userId);
+                containerUsageRecordDO.setUpdateBy(userId);
+            }else {
+                containerUsageRecordDO.setCreateBy(new Long("0"));
+                containerUsageRecordDO.setUpdateBy(new Long("0"));
+            }
+            containerUsageRecordDO.setCreateByName(userName);
+            containerUsageRecordDO.setUpdateByName(userName);
+            containerUsageRecordDO.setCreateTime(new Date());
+            containerUsageRecordDO.setUpdateTime(new Date());
+            containerUsageRecordDO.setDelFlag(1);
+        }
+        return containerUsageRecordDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/deliveTask/DeliveTaskAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.deliveTask;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
+import com.mhd.wms.interfaces.dto.deliveTask.DeliveTaskDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 下发任务Assembler
+ *
+ * @author gen
+ * @date 2024-07-26
+ */
+@Component
+public class DeliveTaskAssembler {
+
+    /**
+     * 转换实体
+     */
+    public DeliveTaskDO toDO(DeliveTaskDTO deliveTaskDTO) {
+        DeliveTaskDO deliveTaskDO = new DeliveTaskDO();
+        // 拷贝
+        BeanUtils.copyProperties(deliveTaskDTO, deliveTaskDO, IgnoreNullUtil.getNullPropertyNames(deliveTaskDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(deliveTaskDTO.getDeliverTaskId() != null){
+            if(userId != null){
+                deliveTaskDO.setUpdateBy(userId);
+            }else {
+                deliveTaskDO.setUpdateBy(new Long("0"));
+            }
+            deliveTaskDO.setUpdateByName(userName);
+            deliveTaskDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                deliveTaskDO.setCreateBy(userId);
+                deliveTaskDO.setUpdateBy(userId);
+            }else {
+                deliveTaskDO.setCreateBy(new Long("0"));
+                deliveTaskDO.setUpdateBy(new Long("0"));
+            }
+            deliveTaskDO.setCreateByName(userName);
+            deliveTaskDO.setUpdateByName(userName);
+            deliveTaskDO.setCreateTime(new Date());
+            deliveTaskDO.setUpdateTime(new Date());
+            deliveTaskDO.setDelFlag(1);
+        }
+        return deliveTaskDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/differentManage/DifferentManageAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.differentManage;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.differentManage.repository.todo.DifferentManageDO;
+import com.mhd.wms.interfaces.dto.differentManage.DifferentManageDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 差异单Assembler
+ *
+ * @author gen
+ * @date 2024-07-20
+ */
+@Component
+public class DifferentManageAssembler {
+
+    /**
+     * 转换实体
+     */
+    public DifferentManageDO toDO(DifferentManageDTO differentManageDTO) {
+        //DifferentManageDO differentManageDO = new DifferentManageDO();
+        // 拷贝
+        //BeanUtils.copyProperties(differentManageDTO, differentManageDO, IgnoreNullUtil.getNullPropertyNames(differentManageDTO));
+        DifferentManageDO differentManageDO = JSONUtil.toBean(JSONUtil.toJsonStr(differentManageDTO), DifferentManageDO.class);
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(differentManageDTO.getDifferentManageId() != null){
+            if(userId != null){
+                differentManageDO.setUpdateBy(userId);
+            }else {
+                differentManageDO.setUpdateBy(new Long("0"));
+            }
+            differentManageDO.setUpdateByName(userName);
+            differentManageDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                differentManageDO.setCreateBy(userId);
+                differentManageDO.setUpdateBy(userId);
+            }else {
+                differentManageDO.setCreateBy(new Long("0"));
+                differentManageDO.setUpdateBy(new Long("0"));
+            }
+            differentManageDO.setCreateByName(userName);
+            differentManageDO.setUpdateByName(userName);
+            differentManageDO.setCreateTime(new Date());
+            differentManageDO.setUpdateTime(new Date());
+            differentManageDO.setDelFlag(1);
+        }
+        return differentManageDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/handoverTaskOrder/HandoverTaskOrderAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.handoverTaskOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO;
+import com.mhd.wms.interfaces.dto.handoverTaskOrder.HandoverTaskOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 交接作业单Assembler
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+@Component
+public class HandoverTaskOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public HandoverTaskOrderDO toDO(HandoverTaskOrderDTO handoverTaskOrderDTO) {
+        HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(handoverTaskOrderDTO, handoverTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(handoverTaskOrderDTO));
+        return handoverTaskOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public HandoverTaskOrderDO toDOByEdit(HandoverTaskOrderDTO handoverTaskOrderDTO) {
+            HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(handoverTaskOrderDTO, handoverTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(handoverTaskOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(handoverTaskOrderDTO.getHandoverTaskOrderId() != null){
+            handoverTaskOrderDO.setUpdateBy(userId);
+            handoverTaskOrderDO.setUpdateByName(userName);
+            handoverTaskOrderDO.setUpdateTime(new Date());
+        }else {
+            handoverTaskOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            handoverTaskOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            handoverTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            handoverTaskOrderDO.setCreateBy(userId);
+            handoverTaskOrderDO.setCreateByName(userName);
+            handoverTaskOrderDO.setCreateTime(new Date());
+            handoverTaskOrderDO.setDelFlag(1);
+        }
+        return handoverTaskOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inMaterialDetail/InMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.inMaterialDetail.InMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class InMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InMaterialDetailDO toDO(InMaterialDetailDTO inMaterialDetailDTO) {
+        InMaterialDetailDO inMaterialDetailDO = new InMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(inMaterialDetailDTO, inMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(inMaterialDetailDTO));
+        return inMaterialDetailDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public InMaterialDetailDO toDOByEdit(InMaterialDetailDTO inMaterialDetailDTO) {
+            InMaterialDetailDO inMaterialDetailDO = new InMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(inMaterialDetailDTO, inMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(inMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inMaterialDetailDTO.getMaterialDetailId() != null){
+            inMaterialDetailDO.setUpdateBy(userId);
+            inMaterialDetailDO.setUpdateByName(userName);
+            inMaterialDetailDO.setUpdateTime(new Date());
+        }else {
+            inMaterialDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            inMaterialDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            inMaterialDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            inMaterialDetailDO.setCreateBy(userId);
+            inMaterialDetailDO.setCreateByName(userName);
+            inMaterialDetailDO.setCreateTime(new Date());
+            inMaterialDetailDO.setDelFlag(1);
+        }
+        return inMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inMaterialDetailSerialNumber/InMaterialDetailSerialNumberAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inMaterialDetailSerialNumber;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.todo.InMaterialDetailSerialNumberDO;
+import com.mhd.wms.interfaces.dto.inMaterialDetailSerialNumber.InMaterialDetailSerialNumberDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料明细序列号Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class InMaterialDetailSerialNumberAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InMaterialDetailSerialNumberDO toDO(InMaterialDetailSerialNumberDTO inMaterialDetailSerialNumberDTO) {
+        InMaterialDetailSerialNumberDO InMaterialDetailSerialNumberDO = new InMaterialDetailSerialNumberDO();
+        // 拷贝
+        BeanUtils.copyProperties(inMaterialDetailSerialNumberDTO, InMaterialDetailSerialNumberDO, IgnoreNullUtil.getNullPropertyNames(inMaterialDetailSerialNumberDTO));
+        return InMaterialDetailSerialNumberDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public InMaterialDetailSerialNumberDO toDOByEdit(InMaterialDetailSerialNumberDTO inMaterialDetailSerialNumberDTO) {
+            InMaterialDetailSerialNumberDO InMaterialDetailSerialNumberDO = new InMaterialDetailSerialNumberDO();
+        // 拷贝
+        BeanUtils.copyProperties(inMaterialDetailSerialNumberDTO, InMaterialDetailSerialNumberDO, IgnoreNullUtil.getNullPropertyNames(inMaterialDetailSerialNumberDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inMaterialDetailSerialNumberDTO.getMaterialDetailSerialNumberId() != null){
+            InMaterialDetailSerialNumberDO.setUpdateBy(userId);
+            InMaterialDetailSerialNumberDO.setUpdateByName(userName);
+            InMaterialDetailSerialNumberDO.setUpdateTime(new Date());
+        }else {
+            InMaterialDetailSerialNumberDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            InMaterialDetailSerialNumberDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            InMaterialDetailSerialNumberDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            InMaterialDetailSerialNumberDO.setCreateBy(userId);
+            InMaterialDetailSerialNumberDO.setCreateByName(userName);
+            InMaterialDetailSerialNumberDO.setCreateTime(new Date());
+            InMaterialDetailSerialNumberDO.setDelFlag(1);
+        }
+        return InMaterialDetailSerialNumberDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inOrderAbnormal/InOrderAbnormalAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inOrderAbnormal;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inOrderAbnormal.repository.todo.InOrderAbnormalDO;
+import com.mhd.wms.interfaces.dto.inOrderAbnormal.InOrderAbnormalDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 入库异常单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class InOrderAbnormalAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InOrderAbnormalDO toDO(InOrderAbnormalDTO inOrderAbnormalDTO) {
+        InOrderAbnormalDO inOrderAbnormalDO = new InOrderAbnormalDO();
+        // 拷贝
+        BeanUtils.copyProperties(inOrderAbnormalDTO, inOrderAbnormalDO, IgnoreNullUtil.getNullPropertyNames(inOrderAbnormalDTO));
+        return inOrderAbnormalDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public InOrderAbnormalDO toDOByEdit(InOrderAbnormalDTO inOrderAbnormalDTO) {
+            InOrderAbnormalDO inOrderAbnormalDO = new InOrderAbnormalDO();
+        // 拷贝
+        BeanUtils.copyProperties(inOrderAbnormalDTO, inOrderAbnormalDO, IgnoreNullUtil.getNullPropertyNames(inOrderAbnormalDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inOrderAbnormalDTO.getInOrderAbnormalId() != null){
+            inOrderAbnormalDO.setUpdateBy(userId);
+            inOrderAbnormalDO.setUpdateByName(userName);
+            inOrderAbnormalDO.setUpdateTime(new Date());
+        }else {
+            inOrderAbnormalDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            inOrderAbnormalDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            inOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            inOrderAbnormalDO.setCreateBy(userId);
+            inOrderAbnormalDO.setCreateByName(userName);
+            inOrderAbnormalDO.setCreateTime(new Date());
+            inOrderAbnormalDO.setDelFlag(1);
+        }
+        return inOrderAbnormalDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryAdjustmentRecord/InventoryAdjustmentRecordAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.inventoryAdjustmentRecord;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.todo.InventoryAdjustmentRecordDO;
+import com.mhd.wms.interfaces.dto.inventoryAdjustmentRecord.InventoryAdjustmentRecordDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 库存调整记录Assembler
+ *
+ * @author gen
+ * @date 2024-07-17
+ */
+@Component
+public class InventoryAdjustmentRecordAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryAdjustmentRecordDO toDO(InventoryAdjustmentRecordDTO inventoryAdjustmentRecordDTO) {
+        InventoryAdjustmentRecordDO inventoryAdjustmentRecordDO = new InventoryAdjustmentRecordDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryAdjustmentRecordDTO, inventoryAdjustmentRecordDO, IgnoreNullUtil.getNullPropertyNames(inventoryAdjustmentRecordDTO));
+        return inventoryAdjustmentRecordDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryAllocationRule/InventoryAllocationRuleAssembler.java

@@ -0,0 +1,90 @@
+package com.mhd.wms.interfaces.assember.inventoryAllocationRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryAllocationRule.repository.todo.InventoryAllocationRuleDO;
+import com.mhd.wms.domain.inventoryAllocationRuleDetail.repository.todo.InventoryAllocationRuleDetailDO;
+import com.mhd.wms.interfaces.dto.inventoryAllocationRule.InventoryAllocationRuleDTO;
+import com.mhd.wms.interfaces.dto.inventoryAllocationRuleDetail.InventoryAllocationRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 库存分配规则Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class InventoryAllocationRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryAllocationRuleDO toDO(InventoryAllocationRuleDTO inventoryAllocationRuleDTO) {
+        InventoryAllocationRuleDO inventoryAllocationRuleDO = new InventoryAllocationRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryAllocationRuleDTO, inventoryAllocationRuleDO, IgnoreNullUtil.getNullPropertyNames(inventoryAllocationRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryAllocationRuleDTO.getId() != null){
+            if(userId != null){
+                inventoryAllocationRuleDO.setUpdateBy(userId);
+            }else {
+                inventoryAllocationRuleDO.setUpdateBy(new Long("0"));
+            }
+            inventoryAllocationRuleDO.setUpdateByName(userName);
+            inventoryAllocationRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryAllocationRuleDO.setCreateBy(userId);
+                inventoryAllocationRuleDO.setUpdateBy(userId);
+            }else {
+                inventoryAllocationRuleDO.setCreateBy(new Long("0"));
+                inventoryAllocationRuleDO.setUpdateBy(new Long("0"));
+            }
+            inventoryAllocationRuleDO.setCreateByName(userName);
+            inventoryAllocationRuleDO.setUpdateByName(userName);
+            inventoryAllocationRuleDO.setCreateTime(new Date());
+            inventoryAllocationRuleDO.setUpdateTime(new Date());
+            inventoryAllocationRuleDO.setDelFlag(1);
+        }
+        List<InventoryAllocationRuleDetailDTO> inventoryAllocationRuleDetailDTOS = inventoryAllocationRuleDTO.getInventoryAllocationRuleDetailList();
+        List<InventoryAllocationRuleDetailDO> inventoryAllocationRuleDetailDOS = inventoryAllocationRuleDetailDTOS.stream().map(inventoryAllocationRuleDetailDTO -> {
+            InventoryAllocationRuleDetailDO inventoryAllocationRuleDetailDO = new InventoryAllocationRuleDetailDO();
+            BeanUtils.copyProperties(inventoryAllocationRuleDetailDTO, inventoryAllocationRuleDetailDO);
+            if(userId != null){
+                inventoryAllocationRuleDetailDO.setCreateBy(userId);
+                inventoryAllocationRuleDetailDO.setUpdateBy(userId);
+            }else {
+                inventoryAllocationRuleDetailDO.setCreateBy(new Long("0"));
+                inventoryAllocationRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryAllocationRuleDetailDO.setCreateByName(userName);
+            inventoryAllocationRuleDetailDO.setUpdateByName(userName);
+            inventoryAllocationRuleDetailDO.setCreateTime(new Date());
+            inventoryAllocationRuleDetailDO.setUpdateTime(new Date());
+            inventoryAllocationRuleDetailDO.setDelFlag(1);
+            return inventoryAllocationRuleDetailDO;
+        }).collect(Collectors.toList());
+
+        inventoryAllocationRuleDO.setInventoryAllocationRuleDetailDOS(inventoryAllocationRuleDetailDOS);
+
+        return inventoryAllocationRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryAllocationRuleDetail/InventoryAllocationRuleDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inventoryAllocationRuleDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryAllocationRuleDetail.repository.todo.InventoryAllocationRuleDetailDO;
+import com.mhd.wms.interfaces.dto.inventoryAllocationRuleDetail.InventoryAllocationRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 库存规则分配明细Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class InventoryAllocationRuleDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryAllocationRuleDetailDO toDO(InventoryAllocationRuleDetailDTO inventoryAllocationRuleDetailDTO) {
+        InventoryAllocationRuleDetailDO inventoryAllocationRuleDetailDO = new InventoryAllocationRuleDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryAllocationRuleDetailDTO, inventoryAllocationRuleDetailDO, IgnoreNullUtil.getNullPropertyNames(inventoryAllocationRuleDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryAllocationRuleDetailDTO.getId() != null){
+            if(userId != null){
+                inventoryAllocationRuleDetailDO.setUpdateBy(userId);
+            }else {
+                inventoryAllocationRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryAllocationRuleDetailDO.setUpdateByName(userName);
+            inventoryAllocationRuleDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryAllocationRuleDetailDO.setCreateBy(userId);
+                inventoryAllocationRuleDetailDO.setUpdateBy(userId);
+            }else {
+                inventoryAllocationRuleDetailDO.setCreateBy(new Long("0"));
+                inventoryAllocationRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryAllocationRuleDetailDO.setCreateByName(userName);
+            inventoryAllocationRuleDetailDO.setUpdateByName(userName);
+            inventoryAllocationRuleDetailDO.setCreateTime(new Date());
+            inventoryAllocationRuleDetailDO.setUpdateTime(new Date());
+            inventoryAllocationRuleDetailDO.setDelFlag(1);
+        }
+        return inventoryAllocationRuleDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryStandingDetail/InventoryStandingDetailAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.inventoryStandingDetail;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.inventoryStandingDetail.repository.todo.InventoryStandingDetailDO;
+import com.mhd.wms.interfaces.dto.inventoryStandingDetail.InventoryStandingDetailDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 库存台账追溯详情Assembler
+ *
+ * @author gen
+ * @date 2024-07-13
+ */
+@Component
+public class InventoryStandingDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryStandingDetailDO toDO(InventoryStandingDetailDTO inventoryStandingDetailDTO) {
+        InventoryStandingDetailDO inventoryStandingDetailDO = new InventoryStandingDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryStandingDetailDTO, inventoryStandingDetailDO, IgnoreNullUtil.getNullPropertyNames(inventoryStandingDetailDTO));
+        return inventoryStandingDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryStandingReport/InventoryStandingReportAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inventoryStandingReport;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryStandingReport.repository.todo.InventoryStandingReportDO;
+import com.mhd.wms.interfaces.dto.inventoryStandingReport.InventoryStandingReportDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 库存台账报Assembler
+ *
+ * @author gen
+ * @date 2024-07-12
+ */
+@Component
+public class InventoryStandingReportAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryStandingReportDO toDO(InventoryStandingReportDTO inventoryStandingReportDTO) {
+        InventoryStandingReportDO inventoryStandingReportDO = new InventoryStandingReportDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryStandingReportDTO, inventoryStandingReportDO, IgnoreNullUtil.getNullPropertyNames(inventoryStandingReportDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryStandingReportDTO.getInventoryStandingId() != null){
+            if(userId != null){
+                inventoryStandingReportDO.setUpdateBy(userId);
+            }else {
+                inventoryStandingReportDO.setUpdateBy(new Long("0"));
+            }
+            inventoryStandingReportDO.setUpdateByName(userName);
+            inventoryStandingReportDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryStandingReportDO.setCreateBy(userId);
+                inventoryStandingReportDO.setUpdateBy(userId);
+            }else {
+                inventoryStandingReportDO.setCreateBy(new Long("0"));
+                inventoryStandingReportDO.setUpdateBy(new Long("0"));
+            }
+            inventoryStandingReportDO.setCreateByName(userName);
+            inventoryStandingReportDO.setUpdateByName(userName);
+            inventoryStandingReportDO.setCreateTime(new Date());
+            inventoryStandingReportDO.setUpdateTime(new Date());
+            inventoryStandingReportDO.setDelFlag(1);
+        }
+        return inventoryStandingReportDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryTurnoverRule/InventoryTurnoverRuleAssembler.java

@@ -0,0 +1,91 @@
+package com.mhd.wms.interfaces.assember.inventoryTurnoverRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryTurnoverRule.repository.todo.InventoryTurnoverRuleDO;
+import com.mhd.wms.domain.inventoryTurnoverRuleDetail.repository.todo.InventoryTurnoverRuleDetailDO;
+import com.mhd.wms.interfaces.dto.inventoryTurnoverRule.InventoryTurnoverRuleDTO;
+import com.mhd.wms.interfaces.dto.inventoryTurnoverRuleDetail.InventoryTurnoverRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 库存周转规则Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class InventoryTurnoverRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryTurnoverRuleDO toDO(InventoryTurnoverRuleDTO inventoryTurnoverRuleDTO) {
+        InventoryTurnoverRuleDO inventoryTurnoverRuleDO = new InventoryTurnoverRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryTurnoverRuleDTO, inventoryTurnoverRuleDO, IgnoreNullUtil.getNullPropertyNames(inventoryTurnoverRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryTurnoverRuleDTO.getId() != null){
+            if(userId != null){
+                inventoryTurnoverRuleDO.setUpdateBy(userId);
+            }else {
+                inventoryTurnoverRuleDO.setUpdateBy(new Long("0"));
+            }
+            inventoryTurnoverRuleDO.setUpdateByName(userName);
+            inventoryTurnoverRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryTurnoverRuleDO.setCreateBy(userId);
+                inventoryTurnoverRuleDO.setUpdateBy(userId);
+            }else {
+                inventoryTurnoverRuleDO.setCreateBy(new Long("0"));
+                inventoryTurnoverRuleDO.setUpdateBy(new Long("0"));
+            }
+            inventoryTurnoverRuleDO.setCreateByName(userName);
+            inventoryTurnoverRuleDO.setUpdateByName(userName);
+            inventoryTurnoverRuleDO.setCreateTime(new Date());
+            inventoryTurnoverRuleDO.setUpdateTime(new Date());
+            inventoryTurnoverRuleDO.setDelFlag(1);
+        }
+        List<InventoryTurnoverRuleDetailDTO> inventoryTurnoverRuleDetailDTOS = inventoryTurnoverRuleDTO.getInventoryTurnoverRuleDetailList();
+        List<InventoryTurnoverRuleDetailDO> inventoryTurnoverRuleDetailDOS = inventoryTurnoverRuleDetailDTOS.stream().map(inventoryTurnoverRuleDetailDTO -> {
+            InventoryTurnoverRuleDetailDO inventoryTurnoverRuleDetailDO = new InventoryTurnoverRuleDetailDO();
+            BeanUtils.copyProperties(inventoryTurnoverRuleDetailDTO, inventoryTurnoverRuleDetailDO);
+            if (userId != null) {
+                inventoryTurnoverRuleDetailDO.setCreateBy(userId);
+                inventoryTurnoverRuleDetailDO.setUpdateBy(userId);
+            } else {
+                inventoryTurnoverRuleDetailDO.setCreateBy(new Long("0"));
+                inventoryTurnoverRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryTurnoverRuleDetailDO.setCreateByName(userName);
+            inventoryTurnoverRuleDetailDO.setUpdateByName(userName);
+            inventoryTurnoverRuleDetailDO.setCreateTime(new Date());
+            inventoryTurnoverRuleDetailDO.setUpdateTime(new Date());
+            inventoryTurnoverRuleDetailDO.setDelFlag(1);
+
+            return inventoryTurnoverRuleDetailDO;
+        }).collect(Collectors.toList());
+
+        inventoryTurnoverRuleDO.setInventoryTurnoverRuleDetailDOS(inventoryTurnoverRuleDetailDOS);
+
+        return inventoryTurnoverRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryTurnoverRuleDetail/InventoryTurnoverRuleDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inventoryTurnoverRuleDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryTurnoverRuleDetail.repository.todo.InventoryTurnoverRuleDetailDO;
+import com.mhd.wms.interfaces.dto.inventoryTurnoverRuleDetail.InventoryTurnoverRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 库存周转规则明细Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class InventoryTurnoverRuleDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryTurnoverRuleDetailDO toDO(InventoryTurnoverRuleDetailDTO inventoryTurnoverRuleDetailDTO) {
+        InventoryTurnoverRuleDetailDO inventoryTurnoverRuleDetailDO = new InventoryTurnoverRuleDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryTurnoverRuleDetailDTO, inventoryTurnoverRuleDetailDO, IgnoreNullUtil.getNullPropertyNames(inventoryTurnoverRuleDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryTurnoverRuleDetailDTO.getId() != null){
+            if(userId != null){
+                inventoryTurnoverRuleDetailDO.setUpdateBy(userId);
+            }else {
+                inventoryTurnoverRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryTurnoverRuleDetailDO.setUpdateByName(userName);
+            inventoryTurnoverRuleDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryTurnoverRuleDetailDO.setCreateBy(userId);
+                inventoryTurnoverRuleDetailDO.setUpdateBy(userId);
+            }else {
+                inventoryTurnoverRuleDetailDO.setCreateBy(new Long("0"));
+                inventoryTurnoverRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            inventoryTurnoverRuleDetailDO.setCreateByName(userName);
+            inventoryTurnoverRuleDetailDO.setUpdateByName(userName);
+            inventoryTurnoverRuleDetailDO.setCreateTime(new Date());
+            inventoryTurnoverRuleDetailDO.setUpdateTime(new Date());
+            inventoryTurnoverRuleDetailDO.setDelFlag(1);
+        }
+        return inventoryTurnoverRuleDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inventoryWarningAnalyze/InventoryWarningAnalyzeAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.inventoryWarningAnalyze;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inventoryWarningAnalyze.repository.todo.InventoryWarningAnalyzeDO;
+import com.mhd.wms.interfaces.dto.inventoryWarningAnalyze.InventoryWarningAnalyzeDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 库存预警分析Assembler
+ *
+ * @author gen
+ * @date 2024-07-24
+ */
+@Component
+public class InventoryWarningAnalyzeAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InventoryWarningAnalyzeDO toDO(InventoryWarningAnalyzeDTO inventoryWarningAnalyzeDTO) {
+        InventoryWarningAnalyzeDO inventoryWarningAnalyzeDO = new InventoryWarningAnalyzeDO();
+        // 拷贝
+        BeanUtils.copyProperties(inventoryWarningAnalyzeDTO, inventoryWarningAnalyzeDO, IgnoreNullUtil.getNullPropertyNames(inventoryWarningAnalyzeDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(inventoryWarningAnalyzeDTO.getInventoryWarningAnalyzeId() != null){
+            if(userId != null){
+                inventoryWarningAnalyzeDO.setUpdateBy(userId);
+            }else {
+                inventoryWarningAnalyzeDO.setUpdateBy(new Long("0"));
+            }
+            inventoryWarningAnalyzeDO.setUpdateByName(userName);
+            inventoryWarningAnalyzeDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                inventoryWarningAnalyzeDO.setCreateBy(userId);
+                inventoryWarningAnalyzeDO.setUpdateBy(userId);
+            }else {
+                inventoryWarningAnalyzeDO.setCreateBy(new Long("0"));
+                inventoryWarningAnalyzeDO.setUpdateBy(new Long("0"));
+            }
+            inventoryWarningAnalyzeDO.setCreateByName(userName);
+            inventoryWarningAnalyzeDO.setUpdateByName(userName);
+            inventoryWarningAnalyzeDO.setCreateTime(new Date());
+            inventoryWarningAnalyzeDO.setUpdateTime(new Date());
+            inventoryWarningAnalyzeDO.setDelFlag(1);
+        }
+        return inventoryWarningAnalyzeDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigationManage/InvestigationManageAssembler.java

@@ -0,0 +1,124 @@
+package com.mhd.wms.interfaces.assember.investigationManage;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.investigationManage.repository.todo.InvestigationManageDO;
+import com.mhd.wms.domain.investigetionManageDetail.repository.todo.InvestigetionManageDetailDO;
+import com.mhd.wms.interfaces.dto.investigationManage.InvestigationManageDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 盘点管理Assembler
+ *
+ * @author gen
+ * @date 2024-07-10
+ */
+@Component
+public class InvestigationManageAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InvestigationManageDO toDO(InvestigationManageDTO investigationManageDTO) {
+        //InvestigationManageDO investigationManageDO = new InvestigationManageDO();
+        // 拷贝
+        //BeanUtils.copyProperties(investigationManageDTO, investigationManageDO, IgnoreNullUtil.getNullPropertyNames(investigationManageDTO));
+        InvestigationManageDO investigationManageDO = JSONUtil.toBean(JSONUtil.toJsonStr(investigationManageDTO), InvestigationManageDO.class);
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        UserPo userPo = loginUser.getUserPo();
+        if(investigationManageDTO.getInvestigationManageId() != null){
+            if(userId != null){
+                investigationManageDO.setUpdateBy(userId);
+            }else {
+                investigationManageDO.setUpdateBy(new Long("0"));
+            }
+            investigationManageDO.setUpdateByName(userName);
+            investigationManageDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                investigationManageDO.setCreateBy(userId);
+                investigationManageDO.setUpdateBy(userId);
+            }else {
+                investigationManageDO.setCreateBy(new Long("0"));
+                investigationManageDO.setUpdateBy(new Long("0"));
+            }
+            investigationManageDO.setOrganizationId(userPo.getOrganizationId());
+            investigationManageDO.setTopOrganizationId(userPo.getTopOrganizationId());
+            investigationManageDO.setOrganizationName(userPo.getOrganizationName());
+            investigationManageDO.setCreateByName(userName);
+            investigationManageDO.setUpdateByName(userName);
+            investigationManageDO.setCreateTime(new Date());
+            investigationManageDO.setUpdateTime(new Date());
+            investigationManageDO.setDelFlag(1);
+        }
+        return investigationManageDO;
+    }
+
+    /**
+     * 转换实体
+     */
+    public InvestigationManageDO toDOByList(InvestigationManageDTO investigationManageDTO) {
+        InvestigationManageDO investigationManageDO = new InvestigationManageDO();
+        // 拷贝
+        BeanUtils.copyProperties(investigationManageDTO, investigationManageDO, IgnoreNullUtil.getNullPropertyNames(investigationManageDTO));
+        return investigationManageDO;
+    }
+
+
+    /**
+     * 按库位盘点 转换实体
+     */
+    public InvestigationManageDO toDOInvestigationByStorageLocation(InvestigationManageDTO investigationManageDTO) {
+        InvestigationManageDO investigationManageDO = new InvestigationManageDO();
+        // 拷贝
+        BeanUtils.copyProperties(investigationManageDTO, investigationManageDO, IgnoreNullUtil.getNullPropertyNames(investigationManageDTO));
+        List<InvestigetionManageDetailDO> investigetionManageDetailDOList = new ArrayList<>();
+        investigationManageDTO.getInvestigetionStorageList().forEach(investigetionStorageDTO -> {
+            investigetionStorageDTO.getInvestigetionManageDetailList().forEach(investigetionManageDetailDTO -> {
+                InvestigetionManageDetailDO investigetionManageDetailDO = new InvestigetionManageDetailDO();
+                BeanUtils.copyProperties(investigetionManageDetailDTO, investigetionManageDetailDO, IgnoreNullUtil.getNullPropertyNames(investigetionManageDetailDTO));
+                investigetionManageDetailDOList.add(investigetionManageDetailDO);
+            });
+        });
+        investigationManageDO.setInvestigetionManageDetailList(investigetionManageDetailDOList);
+        return investigationManageDO;
+    }
+
+    /**
+     * 按物料盘点 转换实体
+     */
+    public InvestigationManageDO toDOInvestigationPickingByMaterial(InvestigationManageDTO investigationManageDTO) {
+        InvestigationManageDO investigationManageDO = new InvestigationManageDO();
+        // 拷贝
+        BeanUtils.copyProperties(investigationManageDTO, investigationManageDO, IgnoreNullUtil.getNullPropertyNames(investigationManageDTO));
+        List<InvestigetionManageDetailDO> investigetionManageDetailList = new ArrayList<>();
+        investigationManageDTO.getInvestigetionMaterialList().forEach(investigetionMaterialDTO -> {
+            investigetionMaterialDTO.getInvestigetionManageDetailList().forEach(taskPickingMaterialDetailDTO -> {
+                InvestigetionManageDetailDO investigetionManageDetailDO = new InvestigetionManageDetailDO();
+                BeanUtils.copyProperties(taskPickingMaterialDetailDTO, investigetionManageDetailDO, IgnoreNullUtil.getNullPropertyNames(taskPickingMaterialDetailDTO));
+                investigetionManageDetailList.add(investigetionManageDetailDO);
+            });
+        });
+        investigationManageDO.setInvestigetionManageDetailList(investigetionManageDetailList);
+        return investigationManageDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/investigetionManageDetail/InvestigetionManageDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.investigetionManageDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.investigetionManageDetail.repository.todo.InvestigetionManageDetailDO;
+import com.mhd.wms.interfaces.dto.investigetionManageDetail.InvestigetionManageDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 盘点详情管理Assembler
+ *
+ * @author gen
+ * @date 2024-07-10
+ */
+@Component
+public class InvestigetionManageDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public InvestigetionManageDetailDO toDO(InvestigetionManageDetailDTO investigetionManageDetailDTO) {
+        InvestigetionManageDetailDO investigetionManageDetailDO = new InvestigetionManageDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(investigetionManageDetailDTO, investigetionManageDetailDO, IgnoreNullUtil.getNullPropertyNames(investigetionManageDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(investigetionManageDetailDTO.getInvestigationManageDetailId() != null){
+            if(userId != null){
+                investigetionManageDetailDO.setUpdateBy(userId);
+            }else {
+                investigetionManageDetailDO.setUpdateBy(new Long("0"));
+            }
+            investigetionManageDetailDO.setUpdateByName(userName);
+            investigetionManageDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                investigetionManageDetailDO.setCreateBy(userId);
+                investigetionManageDetailDO.setUpdateBy(userId);
+            }else {
+                investigetionManageDetailDO.setCreateBy(new Long("0"));
+                investigetionManageDetailDO.setUpdateBy(new Long("0"));
+            }
+            investigetionManageDetailDO.setCreateByName(userName);
+            investigetionManageDetailDO.setUpdateByName(userName);
+            investigetionManageDetailDO.setCreateTime(new Date());
+            investigetionManageDetailDO.setUpdateTime(new Date());
+            investigetionManageDetailDO.setDelFlag(1);
+        }
+        return investigetionManageDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialBarCode/MaterialBarCodeAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.materialBarCode;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialBarCode.repository.todo.MaterialBarCodeDO;
+import com.mhd.wms.interfaces.dto.materialBarCode.MaterialBarCodeDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料条码信息Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialBarCodeAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialBarCodeDO toDO(MaterialBarCodeDTO materialBarCodeDTO) {
+        MaterialBarCodeDO materialBarCodeDO = new MaterialBarCodeDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialBarCodeDTO, materialBarCodeDO, IgnoreNullUtil.getNullPropertyNames(materialBarCodeDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialBarCodeDTO.getMaterialBarCodeId() != null){
+            if(userId != null){
+                materialBarCodeDO.setUpdateBy(userId);
+            }else {
+                materialBarCodeDO.setUpdateBy(new Long("0"));
+            }
+            materialBarCodeDO.setUpdateByName(userName);
+            materialBarCodeDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                materialBarCodeDO.setCreateBy(userId);
+                materialBarCodeDO.setUpdateBy(userId);
+            }else {
+                materialBarCodeDO.setCreateBy(new Long("0"));
+                materialBarCodeDO.setUpdateBy(new Long("0"));
+            }
+            materialBarCodeDO.setCreateByName(userName);
+            materialBarCodeDO.setUpdateByName(userName);
+            materialBarCodeDO.setCreateTime(new Date());
+            materialBarCodeDO.setUpdateTime(new Date());
+            materialBarCodeDO.setDelFlag(1);
+        }
+        return materialBarCodeDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialBaseInfo/MaterialBaseInfoAssembler.java

@@ -0,0 +1,24 @@
+package com.mhd.wms.interfaces.assember.materialBaseInfo;
+
+import cn.hutool.json.JSONUtil;
+import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO;
+import com.mhd.wms.interfaces.dto.materialBaseInfo.MaterialBaseInfoDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 物料基础信息Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialBaseInfoAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialBaseInfoDO toDO(MaterialBaseInfoDTO materialBaseInfoDTO) {
+        return JSONUtil.toBean(JSONUtil.toJsonStr(materialBaseInfoDTO), MaterialBaseInfoDO.class);
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialCommon/MaterialCommonAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.materialCommon;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialCommon.repository.todo.MaterialCommonDO;
+import com.mhd.wms.interfaces.dto.materialCommon.MaterialCommonDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料公共信息Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialCommonAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialCommonDO toDO(MaterialCommonDTO materialCommonDTO) {
+        MaterialCommonDO materialCommonDO = new MaterialCommonDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialCommonDTO, materialCommonDO, IgnoreNullUtil.getNullPropertyNames(materialCommonDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialCommonDTO.getMaterialCommonId() != null){
+            if(userId != null){
+                materialCommonDO.setUpdateBy(userId);
+            }else {
+                materialCommonDO.setUpdateBy(new Long("0"));
+            }
+            materialCommonDO.setUpdateByName(userName);
+            materialCommonDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                materialCommonDO.setCreateBy(userId);
+                materialCommonDO.setUpdateBy(userId);
+            }else {
+                materialCommonDO.setCreateBy(new Long("0"));
+                materialCommonDO.setUpdateBy(new Long("0"));
+            }
+            materialCommonDO.setCreateByName(userName);
+            materialCommonDO.setUpdateByName(userName);
+            materialCommonDO.setCreateTime(new Date());
+            materialCommonDO.setUpdateTime(new Date());
+            materialCommonDO.setDelFlag(1);
+        }
+        return materialCommonDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialGoodsRule/MaterialGoodsRuleAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.materialGoodsRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialGoodsRule.repository.todo.MaterialGoodsRuleDO;
+import com.mhd.wms.interfaces.dto.materialGoodsRule.MaterialGoodsRuleDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料商品规则Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialGoodsRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialGoodsRuleDO toDO(MaterialGoodsRuleDTO materialGoodsRuleDTO) {
+        MaterialGoodsRuleDO materialGoodsRuleDO = new MaterialGoodsRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialGoodsRuleDTO, materialGoodsRuleDO, IgnoreNullUtil.getNullPropertyNames(materialGoodsRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialGoodsRuleDTO.getMaterialGoodsRuleId() != null){
+            if(userId != null){
+                materialGoodsRuleDO.setUpdateBy(userId);
+            }else {
+                materialGoodsRuleDO.setUpdateBy(new Long("0"));
+            }
+            materialGoodsRuleDO.setUpdateByName(userName);
+            materialGoodsRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                materialGoodsRuleDO.setCreateBy(userId);
+                materialGoodsRuleDO.setUpdateBy(userId);
+            }else {
+                materialGoodsRuleDO.setCreateBy(new Long("0"));
+                materialGoodsRuleDO.setUpdateBy(new Long("0"));
+            }
+            materialGoodsRuleDO.setCreateByName(userName);
+            materialGoodsRuleDO.setUpdateByName(userName);
+            materialGoodsRuleDO.setCreateTime(new Date());
+            materialGoodsRuleDO.setUpdateTime(new Date());
+            materialGoodsRuleDO.setDelFlag(1);
+        }
+        return materialGoodsRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialInventory/MaterialInventoryAssembler.java

@@ -0,0 +1,73 @@
+package com.mhd.wms.interfaces.assember.materialInventory;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO;
+import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryQueryListDO;
+import com.mhd.wms.interfaces.dto.materialInventory.MaterialInventoryDTO;
+import com.mhd.wms.interfaces.dto.materialInventory.MaterialInventoryQueryListDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料库存Assembler
+ *
+ * @author gen
+ * @date 2024-05-29
+ */
+@Component
+public class MaterialInventoryAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialInventoryDO toDO(MaterialInventoryDTO materialInventoryDTO) {
+        MaterialInventoryDO materialInventoryDO = new MaterialInventoryDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialInventoryDTO, materialInventoryDO, IgnoreNullUtil.getNullPropertyNames(materialInventoryDTO));
+        return materialInventoryDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public MaterialInventoryDO toDOByEdit(MaterialInventoryDTO materialInventoryDTO) {
+            MaterialInventoryDO materialInventoryDO = new MaterialInventoryDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialInventoryDTO, materialInventoryDO, IgnoreNullUtil.getNullPropertyNames(materialInventoryDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialInventoryDTO.getMaterialInventoryId() != null){
+            materialInventoryDO.setUpdateBy(userId);
+            materialInventoryDO.setUpdateByName(userName);
+            materialInventoryDO.setUpdateTime(new Date());
+        }else {
+            materialInventoryDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            materialInventoryDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            materialInventoryDO.setCreateBy(userId);
+            materialInventoryDO.setCreateByName(userName);
+            materialInventoryDO.setCreateTime(new Date());
+            materialInventoryDO.setDelFlag(1);
+        }
+        return materialInventoryDO;
+    }
+
+    public MaterialInventoryQueryListDO toDOByQueryList(MaterialInventoryQueryListDTO materialInventoryQueryListDTO) {
+        MaterialInventoryQueryListDO materialInventoryQueryListDO = new MaterialInventoryQueryListDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialInventoryQueryListDTO, materialInventoryQueryListDO, IgnoreNullUtil.getNullPropertyNames(materialInventoryQueryListDTO));
+        return materialInventoryQueryListDO;
+    }
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialInventoryWarning/MaterialInventoryWarningAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.materialInventoryWarning;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.materialInventoryWarning.repository.todo.MaterialInventoryWarningDO;
+import com.mhd.wms.interfaces.dto.materialInventoryWarning.MaterialInventoryWarningDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 物料库存预警Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialInventoryWarningAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialInventoryWarningDO toDO(MaterialInventoryWarningDTO materialInventoryWarningDTO) {
+        MaterialInventoryWarningDO materialInventoryWarningDO = new MaterialInventoryWarningDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialInventoryWarningDTO, materialInventoryWarningDO, IgnoreNullUtil.getNullPropertyNames(materialInventoryWarningDTO));
+        return materialInventoryWarningDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialMoreDetail/MaterialMoreDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.materialMoreDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialMoreDetail.repository.todo.MaterialMoreDetailDO;
+import com.mhd.wms.interfaces.dto.materialMoreDetail.MaterialMoreDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料更多属性明细Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class MaterialMoreDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialMoreDetailDO toDO(MaterialMoreDetailDTO materialMoreDetailDTO) {
+        MaterialMoreDetailDO materialMoreDetailDO = new MaterialMoreDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialMoreDetailDTO, materialMoreDetailDO, IgnoreNullUtil.getNullPropertyNames(materialMoreDetailDTO));
+        return materialMoreDetailDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public MaterialMoreDetailDO toDOByEdit(MaterialMoreDetailDTO materialMoreDetailDTO) {
+            MaterialMoreDetailDO materialMoreDetailDO = new MaterialMoreDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialMoreDetailDTO, materialMoreDetailDO, IgnoreNullUtil.getNullPropertyNames(materialMoreDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialMoreDetailDTO.getMaterialMoreDetailId() != null){
+            materialMoreDetailDO.setUpdateBy(userId);
+            materialMoreDetailDO.setUpdateByName(userName);
+            materialMoreDetailDO.setUpdateTime(new Date());
+        }else {
+            materialMoreDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            materialMoreDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            materialMoreDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            materialMoreDetailDO.setCreateBy(userId);
+            materialMoreDetailDO.setCreateByName(userName);
+            materialMoreDetailDO.setCreateTime(new Date());
+            materialMoreDetailDO.setDelFlag(1);
+        }
+        return materialMoreDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/materialWarehouseControl/MaterialWarehouseControlAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.materialWarehouseControl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialWarehouseControl.repository.todo.MaterialWarehouseControlDO;
+import com.mhd.wms.interfaces.dto.materialWarehouseControl.MaterialWarehouseControlDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 仓库控制信息Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class MaterialWarehouseControlAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MaterialWarehouseControlDO toDO(MaterialWarehouseControlDTO materialWarehouseControlDTO) {
+        MaterialWarehouseControlDO materialWarehouseControlDO = new MaterialWarehouseControlDO();
+        // 拷贝
+        BeanUtils.copyProperties(materialWarehouseControlDTO, materialWarehouseControlDO, IgnoreNullUtil.getNullPropertyNames(materialWarehouseControlDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(materialWarehouseControlDTO.getMaterialWarehouseControlId() != null){
+            if(userId != null){
+                materialWarehouseControlDO.setUpdateBy(userId);
+            }else {
+                materialWarehouseControlDO.setUpdateBy(new Long("0"));
+            }
+            materialWarehouseControlDO.setUpdateByName(userName);
+            materialWarehouseControlDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                materialWarehouseControlDO.setCreateBy(userId);
+                materialWarehouseControlDO.setUpdateBy(userId);
+            }else {
+                materialWarehouseControlDO.setCreateBy(new Long("0"));
+                materialWarehouseControlDO.setUpdateBy(new Long("0"));
+            }
+            materialWarehouseControlDO.setCreateByName(userName);
+            materialWarehouseControlDO.setUpdateByName(userName);
+            materialWarehouseControlDO.setCreateTime(new Date());
+            materialWarehouseControlDO.setUpdateTime(new Date());
+            materialWarehouseControlDO.setDelFlag(1);
+        }
+        return materialWarehouseControlDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/mobilizeManage/MobilizeManageAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.mobilizeManage;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.mobilizeManage.repository.todo.MobilizeManageDO;
+import com.mhd.wms.interfaces.dto.mobilizeManage.MobilizeManageDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 调拨管理Assembler
+ *
+ * @author gen
+ * @date 2024-07-08
+ */
+@Component
+public class MobilizeManageAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MobilizeManageDO toDO(MobilizeManageDTO mobilizeManageDTO) {
+        MobilizeManageDO mobilizeManageDO = new MobilizeManageDO();
+        // 拷贝
+        BeanUtils.copyProperties(mobilizeManageDTO, mobilizeManageDO, IgnoreNullUtil.getNullPropertyNames(mobilizeManageDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(mobilizeManageDTO.getMobilizeManageId() != null){
+            if(userId != null){
+                mobilizeManageDO.setUpdateBy(userId);
+            }else {
+                mobilizeManageDO.setUpdateBy(new Long("0"));
+            }
+            mobilizeManageDO.setUpdateByName(userName);
+            mobilizeManageDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                mobilizeManageDO.setCreateBy(userId);
+                mobilizeManageDO.setUpdateBy(userId);
+            }else {
+                mobilizeManageDO.setCreateBy(new Long("0"));
+                mobilizeManageDO.setUpdateBy(new Long("0"));
+            }
+            mobilizeManageDO.setCreateByName(userName);
+            mobilizeManageDO.setUpdateByName(userName);
+            mobilizeManageDO.setCreateTime(new Date());
+            mobilizeManageDO.setUpdateTime(new Date());
+            mobilizeManageDO.setDelFlag(1);
+        }
+        return mobilizeManageDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/mobilizeManageDetail/MobilizeManageDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.mobilizeManageDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.mobilizeManageDetail.repository.todo.MobilizeManageDetailDO;
+import com.mhd.wms.interfaces.dto.mobilizeManageDetail.MobilizeManageDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 调拨管理详情Assembler
+ *
+ * @author gen
+ * @date 2024-07-08
+ */
+@Component
+public class MobilizeManageDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public MobilizeManageDetailDO toDO(MobilizeManageDetailDTO mobilizeManageDetailDTO) {
+        MobilizeManageDetailDO mobilizeManageDetailDO = new MobilizeManageDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(mobilizeManageDetailDTO, mobilizeManageDetailDO, IgnoreNullUtil.getNullPropertyNames(mobilizeManageDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(mobilizeManageDetailDTO.getMobilizeMaterialDetailId() != null){
+            if(userId != null){
+                mobilizeManageDetailDO.setUpdateBy(userId);
+            }else {
+                mobilizeManageDetailDO.setUpdateBy(new Long("0"));
+            }
+            mobilizeManageDetailDO.setUpdateByName(userName);
+            mobilizeManageDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                mobilizeManageDetailDO.setCreateBy(userId);
+                mobilizeManageDetailDO.setUpdateBy(userId);
+            }else {
+                mobilizeManageDetailDO.setCreateBy(new Long("0"));
+                mobilizeManageDetailDO.setUpdateBy(new Long("0"));
+            }
+            mobilizeManageDetailDO.setCreateByName(userName);
+            mobilizeManageDetailDO.setUpdateByName(userName);
+            mobilizeManageDetailDO.setCreateTime(new Date());
+            mobilizeManageDetailDO.setUpdateTime(new Date());
+            mobilizeManageDetailDO.setDelFlag(1);
+        }
+        return mobilizeManageDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/noticeMaterialDetail/NoticeMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.noticeMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.noticeMaterialDetail.repository.todo.NoticeMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.noticeMaterialDetail.NoticeMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-06-17
+ */
+@Component
+public class NoticeMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public NoticeMaterialDetailDO toDO(NoticeMaterialDetailDTO noticeMaterialDetailDTO) {
+        NoticeMaterialDetailDO noticeMaterialDetailDO = new NoticeMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(noticeMaterialDetailDTO, noticeMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(noticeMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(noticeMaterialDetailDTO.getNoticeMaterialDetailId() != null){
+            if(userId != null){
+                noticeMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                noticeMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            noticeMaterialDetailDO.setUpdateByName(userName);
+            noticeMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                noticeMaterialDetailDO.setCreateBy(userId);
+                noticeMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                noticeMaterialDetailDO.setCreateBy(new Long("0"));
+                noticeMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            noticeMaterialDetailDO.setCreateByName(userName);
+            noticeMaterialDetailDO.setUpdateByName(userName);
+            noticeMaterialDetailDO.setCreateTime(new Date());
+            noticeMaterialDetailDO.setUpdateTime(new Date());
+            noticeMaterialDetailDO.setDelFlag(1);
+        }
+        return noticeMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/noticeOrder/NoticeOrderAssembler.java

@@ -0,0 +1,78 @@
+package com.mhd.wms.interfaces.assember.noticeOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.noticeMaterialDetail.repository.todo.NoticeMaterialDetailDO;
+import com.mhd.wms.domain.noticeOrder.repository.todo.NoticeOrderDO;
+import com.mhd.wms.interfaces.dto.noticeMaterialDetail.NoticeMaterialDetailDTO;
+import com.mhd.wms.interfaces.dto.noticeOrder.NoticeOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 入库通知单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class NoticeOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public NoticeOrderDO toDO(NoticeOrderDTO noticeOrderDTO) {
+        NoticeOrderDO noticeOrderDO = new NoticeOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(noticeOrderDTO, noticeOrderDO, IgnoreNullUtil.getNullPropertyNames(noticeOrderDTO));
+        return noticeOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public NoticeOrderDO toDOByEdit(NoticeOrderDTO noticeOrderDTO) {
+            NoticeOrderDO noticeOrderDO = new NoticeOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(noticeOrderDTO, noticeOrderDO, IgnoreNullUtil.getNullPropertyNames(noticeOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(noticeOrderDTO.getNoticeId() != null){
+            noticeOrderDO.setUpdateBy(userId);
+            noticeOrderDO.setUpdateByName(userName);
+            noticeOrderDO.setUpdateTime(new Date());
+        }else {
+            noticeOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            noticeOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            noticeOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            noticeOrderDO.setCreateBy(userId);
+            noticeOrderDO.setCreateByName(userName);
+            noticeOrderDO.setCreateTime(new Date());
+            noticeOrderDO.setDelFlag(1);
+        }
+        List<NoticeMaterialDetailDO> materialDetailList = new ArrayList<>();
+        if (noticeOrderDTO.getMaterialDetailList() != null && !noticeOrderDTO.getMaterialDetailList().isEmpty()) {
+            for (NoticeMaterialDetailDTO noticeMaterialDetailDTO :noticeOrderDTO.getMaterialDetailList()) {
+                NoticeMaterialDetailDO noticeMaterialDetailDO = new NoticeMaterialDetailDO();
+                BeanUtils.copyProperties(noticeMaterialDetailDTO, noticeMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(noticeOrderDTO));
+                materialDetailList.add(noticeMaterialDetailDO);
+            }
+        }
+        noticeOrderDO.setMaterialDetailList(materialDetailList);
+        return noticeOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/outMaterialDetailSerialNumber/OutMaterialDetailSerialNumberAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.outMaterialDetailSerialNumber;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO;
+import com.mhd.wms.interfaces.dto.outMaterialDetailSerialNumber.OutMaterialDetailSerialNumberDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 出库单物料明细序列号Assembler
+ *
+ * @author gen
+ * @date 2024-06-03
+ */
+@Component
+public class OutMaterialDetailSerialNumberAssembler {
+
+    /**
+     * 转换实体
+     */
+    public OutMaterialDetailSerialNumberDO toDO(OutMaterialDetailSerialNumberDTO outMaterialDetailSerialNumberDTO) {
+        OutMaterialDetailSerialNumberDO outMaterialDetailSerialNumberDO = new OutMaterialDetailSerialNumberDO();
+        // 拷贝
+        BeanUtils.copyProperties(outMaterialDetailSerialNumberDTO, outMaterialDetailSerialNumberDO, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailSerialNumberDTO));
+        return outMaterialDetailSerialNumberDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public OutMaterialDetailSerialNumberDO toDOByEdit(OutMaterialDetailSerialNumberDTO outMaterialDetailSerialNumberDTO) {
+            OutMaterialDetailSerialNumberDO outMaterialDetailSerialNumberDO = new OutMaterialDetailSerialNumberDO();
+        // 拷贝
+        BeanUtils.copyProperties(outMaterialDetailSerialNumberDTO, outMaterialDetailSerialNumberDO, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailSerialNumberDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(outMaterialDetailSerialNumberDTO.getOutMaterialDetailSerialNumberId() != null){
+            outMaterialDetailSerialNumberDO.setUpdateBy(userId);
+            outMaterialDetailSerialNumberDO.setUpdateByName(userName);
+            outMaterialDetailSerialNumberDO.setUpdateTime(new Date());
+        }else {
+            outMaterialDetailSerialNumberDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            outMaterialDetailSerialNumberDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            outMaterialDetailSerialNumberDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            outMaterialDetailSerialNumberDO.setCreateBy(userId);
+            outMaterialDetailSerialNumberDO.setCreateByName(userName);
+            outMaterialDetailSerialNumberDO.setCreateTime(new Date());
+            outMaterialDetailSerialNumberDO.setDelFlag(1);
+        }
+        return outMaterialDetailSerialNumberDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/outOrderAbnormal/OutOrderAbnormalAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.outOrderAbnormal;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.outOrderAbnormal.repository.todo.OutOrderAbnormalDO;
+import com.mhd.wms.interfaces.dto.outOrderAbnormal.OutOrderAbnormalDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 出库异常单Assembler
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+@Component
+public class OutOrderAbnormalAssembler {
+
+    /**
+     * 转换实体
+     */
+    public OutOrderAbnormalDO toDO(OutOrderAbnormalDTO outOrderAbnormalDTO) {
+        OutOrderAbnormalDO outOrderAbnormalDO = new OutOrderAbnormalDO();
+        // 拷贝
+        BeanUtils.copyProperties(outOrderAbnormalDTO, outOrderAbnormalDO, IgnoreNullUtil.getNullPropertyNames(outOrderAbnormalDTO));
+        return outOrderAbnormalDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public OutOrderAbnormalDO toDOByEdit(OutOrderAbnormalDTO outOrderAbnormalDTO) {
+            OutOrderAbnormalDO outOrderAbnormalDO = new OutOrderAbnormalDO();
+        // 拷贝
+        BeanUtils.copyProperties(outOrderAbnormalDTO, outOrderAbnormalDO, IgnoreNullUtil.getNullPropertyNames(outOrderAbnormalDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(outOrderAbnormalDTO.getOutOrderAbnormalId() != null){
+            outOrderAbnormalDO.setUpdateBy(userId);
+            outOrderAbnormalDO.setUpdateByName(userName);
+            outOrderAbnormalDO.setUpdateTime(new Date());
+        }else {
+            outOrderAbnormalDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            outOrderAbnormalDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            outOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            outOrderAbnormalDO.setCreateBy(userId);
+            outOrderAbnormalDO.setCreateByName(userName);
+            outOrderAbnormalDO.setCreateTime(new Date());
+            outOrderAbnormalDO.setDelFlag(1);
+        }
+        return outOrderAbnormalDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/overStock/OverStockAssembler.java

@@ -0,0 +1,46 @@
+package com.mhd.wms.interfaces.assember.overStock;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.overStock.repository.todo.ExecuteOverStockDO;
+import com.mhd.wms.domain.overStock.repository.todo.OverStockDO;
+import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
+import com.mhd.wms.interfaces.dto.overStock.ExecuteOverStockDTO;
+import com.mhd.wms.interfaces.dto.overStock.OverStockDTO;
+import com.mhd.wms.interfaces.dto.overStock.QueryOrderOverStockDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 越库管理Assembler
+ *
+ * @author gen
+ * @date 2024-07-23
+ */
+@Component
+public class OverStockAssembler {
+
+    /**
+     * 转换实体
+     */
+    public OverStockDO toDO(OverStockDTO overStockDTO) {
+        OverStockDO overStockDO = new OverStockDO();
+        // 拷贝
+        BeanUtils.copyProperties(overStockDTO, overStockDO, IgnoreNullUtil.getNullPropertyNames(overStockDTO));
+        return overStockDO;
+    }
+
+
+    public QueryOrderOverStockDO toDOByQueryOrder(QueryOrderOverStockDTO queryOrderOverStockDTO) {
+        QueryOrderOverStockDO queryOrderOverStockDO = new QueryOrderOverStockDO();
+        // 拷贝
+        BeanUtils.copyProperties(queryOrderOverStockDTO, queryOrderOverStockDO, IgnoreNullUtil.getNullPropertyNames(queryOrderOverStockDTO));
+        return queryOrderOverStockDO;
+    }
+
+    public ExecuteOverStockDO toDOByExecuteOverStock(ExecuteOverStockDTO executeOverStockDTO) {
+        ExecuteOverStockDO executeOverStockDO = new ExecuteOverStockDO();
+        //拷贝
+        BeanUtils.copyProperties(executeOverStockDTO,executeOverStockDO, IgnoreNullUtil.getNullPropertyNames(executeOverStockDTO));
+        return executeOverStockDO;
+    }
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/pickingOrder/PickingOrderAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.pickingOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO;
+import com.mhd.wms.interfaces.dto.pickingOrder.PickingOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 拣货单Assembler
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+@Component
+public class PickingOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public PickingOrderDO toDO(PickingOrderDTO pickingOrderDTO) {
+        PickingOrderDO pickingOrderDO = new PickingOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(pickingOrderDTO, pickingOrderDO, IgnoreNullUtil.getNullPropertyNames(pickingOrderDTO));
+        return pickingOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public PickingOrderDO toDOByEdit(PickingOrderDTO pickingOrderDTO) {
+            PickingOrderDO pickingOrderDO = new PickingOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(pickingOrderDTO, pickingOrderDO, IgnoreNullUtil.getNullPropertyNames(pickingOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(pickingOrderDTO.getPickingOrderId() != null){
+            pickingOrderDO.setUpdateBy(userId);
+            pickingOrderDO.setUpdateByName(userName);
+            pickingOrderDO.setUpdateTime(new Date());
+        }else {
+            pickingOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            pickingOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            pickingOrderDO.setCreateBy(userId);
+            pickingOrderDO.setCreateByName(userName);
+            pickingOrderDO.setCreateTime(new Date());
+            pickingOrderDO.setDelFlag(1);
+        }
+        return pickingOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/putawayRule/PutawayRuleAssembler.java

@@ -0,0 +1,89 @@
+package com.mhd.wms.interfaces.assember.putawayRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.putawayRule.repository.todo.PutawayRuleDO;
+import com.mhd.wms.domain.putawayRuleDetail.repository.todo.PutawayRuleDetailDO;
+import com.mhd.wms.interfaces.dto.putawayRule.PutawayRuleDTO;
+import com.mhd.wms.interfaces.dto.putawayRuleDetail.PutawayRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 上架规则Assembler
+ *
+ * @author gen
+ * @date 2024-07-19
+ */
+@Component
+public class PutawayRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public PutawayRuleDO toDO(PutawayRuleDTO putawayRuleDTO) {
+        PutawayRuleDO putawayRuleDO = new PutawayRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(putawayRuleDTO, putawayRuleDO, IgnoreNullUtil.getNullPropertyNames(putawayRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        List<PutawayRuleDetailDTO> putawayRuleDetailDTOS = putawayRuleDTO.getPutawayRuleDetailList();
+        if(putawayRuleDTO.getId() != null){
+            if(userId != null){
+                putawayRuleDO.setUpdateBy(userId);
+            }else {
+                putawayRuleDO.setUpdateBy(new Long("0"));
+            }
+            putawayRuleDO.setUpdateByName(userName);
+            putawayRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                putawayRuleDO.setCreateBy(userId);
+                putawayRuleDO.setUpdateBy(userId);
+            }else {
+                putawayRuleDO.setCreateBy(new Long("0"));
+                putawayRuleDO.setUpdateBy(new Long("0"));
+            }
+            putawayRuleDO.setCreateByName(userName);
+            putawayRuleDO.setUpdateByName(userName);
+            putawayRuleDO.setCreateTime(new Date());
+            putawayRuleDO.setUpdateTime(new Date());
+            putawayRuleDO.setDelFlag(1);
+        }
+        List<PutawayRuleDetailDO> putawayRuleDetailDOS = putawayRuleDetailDTOS.stream().map(putawayRuleDetailDTO -> {
+            PutawayRuleDetailDO putawayRuleDetailDO = new PutawayRuleDetailDO();
+            BeanUtils.copyProperties(putawayRuleDetailDTO, putawayRuleDetailDO);
+            if(userId != null){
+                putawayRuleDetailDO.setCreateBy(userId);
+                putawayRuleDetailDO.setUpdateBy(userId);
+            }else {
+                putawayRuleDetailDO.setCreateBy(new Long("0"));
+                putawayRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            putawayRuleDetailDO.setCreateByName(userName);
+            putawayRuleDetailDO.setUpdateByName(userName);
+            putawayRuleDetailDO.setCreateTime(new Date());
+            putawayRuleDetailDO.setUpdateTime(new Date());
+            putawayRuleDetailDO.setDelFlag(1);
+            return putawayRuleDetailDO;
+        }).collect(Collectors.toList());
+        putawayRuleDO.setPutawayRuleDetailDOS(putawayRuleDetailDOS);
+
+        return putawayRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/putawayRuleDetail/PutawayRuleDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.putawayRuleDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.putawayRuleDetail.repository.todo.PutawayRuleDetailDO;
+import com.mhd.wms.interfaces.dto.putawayRuleDetail.PutawayRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 上架规则明细Assembler
+ *
+ * @author gen
+ * @date 2024-07-20
+ */
+@Component
+public class PutawayRuleDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public PutawayRuleDetailDO toDO(PutawayRuleDetailDTO putawayRuleDetailDTO) {
+        PutawayRuleDetailDO putawayRuleDetailDO = new PutawayRuleDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(putawayRuleDetailDTO, putawayRuleDetailDO, IgnoreNullUtil.getNullPropertyNames(putawayRuleDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(putawayRuleDetailDTO.getId() != null){
+            if(userId != null){
+                putawayRuleDetailDO.setUpdateBy(userId);
+            }else {
+                putawayRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            putawayRuleDetailDO.setUpdateByName(userName);
+            putawayRuleDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                putawayRuleDetailDO.setCreateBy(userId);
+                putawayRuleDetailDO.setUpdateBy(userId);
+            }else {
+                putawayRuleDetailDO.setCreateBy(new Long("0"));
+                putawayRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            putawayRuleDetailDO.setCreateByName(userName);
+            putawayRuleDetailDO.setUpdateByName(userName);
+            putawayRuleDetailDO.setCreateTime(new Date());
+            putawayRuleDetailDO.setUpdateTime(new Date());
+            putawayRuleDetailDO.setDelFlag(1);
+        }
+        return putawayRuleDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/qcRule/QcRuleAssembler.java

@@ -0,0 +1,90 @@
+package com.mhd.wms.interfaces.assember.qcRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.qcRule.repository.todo.QcRuleDO;
+import com.mhd.wms.domain.qcRuleDetail.repository.todo.QcRuleDetailDO;
+import com.mhd.wms.interfaces.dto.qcRule.QcRuleDTO;
+import com.mhd.wms.interfaces.dto.qcRuleDetail.QcRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 质检规则Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class QcRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public QcRuleDO toDO(QcRuleDTO qcRuleDTO) {
+        QcRuleDO qcRuleDO = new QcRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(qcRuleDTO, qcRuleDO, IgnoreNullUtil.getNullPropertyNames(qcRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(qcRuleDTO.getId() != null){
+            if(userId != null){
+                qcRuleDO.setUpdateBy(userId);
+            }else {
+                qcRuleDO.setUpdateBy(new Long("0"));
+            }
+            qcRuleDO.setUpdateByName(userName);
+            qcRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                qcRuleDO.setCreateBy(userId);
+                qcRuleDO.setUpdateBy(userId);
+            }else {
+                qcRuleDO.setCreateBy(new Long("0"));
+                qcRuleDO.setUpdateBy(new Long("0"));
+            }
+            qcRuleDO.setCreateByName(userName);
+            qcRuleDO.setUpdateByName(userName);
+            qcRuleDO.setCreateTime(new Date());
+            qcRuleDO.setUpdateTime(new Date());
+            qcRuleDO.setDelFlag(1);
+        }
+
+        List<QcRuleDetailDTO> qcRuleDetailDTOS = qcRuleDTO.getQcRuleDetailList();
+        List<QcRuleDetailDO> qcRuleDetailDOS = qcRuleDetailDTOS.stream().map(qcRuleDetailDTO -> {
+            QcRuleDetailDO qcRuleDetailDO = new QcRuleDetailDO();
+            BeanUtils.copyProperties(qcRuleDetailDTO, qcRuleDetailDO);
+            if (userId != null) {
+                qcRuleDetailDO.setCreateBy(userId);
+                qcRuleDetailDO.setUpdateBy(userId);
+            } else {
+                qcRuleDetailDO.setCreateBy(new Long("0"));
+                qcRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            qcRuleDetailDO.setCreateByName(userName);
+            qcRuleDetailDO.setUpdateByName(userName);
+            qcRuleDetailDO.setCreateTime(new Date());
+            qcRuleDetailDO.setUpdateTime(new Date());
+            qcRuleDetailDO.setDelFlag(1);
+            return qcRuleDetailDO;
+        }).collect(Collectors.toList());
+        qcRuleDO.setQcRuleDetailDOS(qcRuleDetailDOS);
+
+        return qcRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/qcRuleDetail/QcRuleDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.qcRuleDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.qcRuleDetail.repository.todo.QcRuleDetailDO;
+import com.mhd.wms.interfaces.dto.qcRuleDetail.QcRuleDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 质检规则明细Assembler
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+@Component
+public class QcRuleDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public QcRuleDetailDO toDO(QcRuleDetailDTO qcRuleDetailDTO) {
+        QcRuleDetailDO qcRuleDetailDO = new QcRuleDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(qcRuleDetailDTO, qcRuleDetailDO, IgnoreNullUtil.getNullPropertyNames(qcRuleDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(qcRuleDetailDTO.getId() != null){
+            if(userId != null){
+                qcRuleDetailDO.setUpdateBy(userId);
+            }else {
+                qcRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            qcRuleDetailDO.setUpdateByName(userName);
+            qcRuleDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                qcRuleDetailDO.setCreateBy(userId);
+                qcRuleDetailDO.setUpdateBy(userId);
+            }else {
+                qcRuleDetailDO.setCreateBy(new Long("0"));
+                qcRuleDetailDO.setUpdateBy(new Long("0"));
+            }
+            qcRuleDetailDO.setCreateByName(userName);
+            qcRuleDetailDO.setUpdateByName(userName);
+            qcRuleDetailDO.setCreateTime(new Date());
+            qcRuleDetailDO.setUpdateTime(new Date());
+            qcRuleDetailDO.setDelFlag(1);
+        }
+        return qcRuleDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/qualityInspection/QualityInspectionAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.qualityInspection;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.qualityInspection.repository.todo.QualityInspectionDO;
+import com.mhd.wms.interfaces.dto.qualityInspection.QualityInspectionDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 质检管理Assembler
+ *
+ * @author gen
+ * @date 2024-05-25
+ */
+@Component
+public class QualityInspectionAssembler {
+
+    /**
+     * 转换实体
+     */
+    public QualityInspectionDO toDO(QualityInspectionDTO qualityInspectionDTO) {
+        QualityInspectionDO qualityInspectionDO = new QualityInspectionDO();
+        // 拷贝
+        BeanUtils.copyProperties(qualityInspectionDTO, qualityInspectionDO, IgnoreNullUtil.getNullPropertyNames(qualityInspectionDTO));
+        return qualityInspectionDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public QualityInspectionDO toDOByEdit(QualityInspectionDTO qualityInspectionDTO) {
+            QualityInspectionDO qualityInspectionDO = new QualityInspectionDO();
+        // 拷贝
+        BeanUtils.copyProperties(qualityInspectionDTO, qualityInspectionDO, IgnoreNullUtil.getNullPropertyNames(qualityInspectionDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(qualityInspectionDTO.getQualityInspectionId() != null){
+            qualityInspectionDO.setUpdateBy(userId);
+            qualityInspectionDO.setUpdateByName(userName);
+            qualityInspectionDO.setUpdateTime(new Date());
+        }else {
+            qualityInspectionDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            qualityInspectionDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            qualityInspectionDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            qualityInspectionDO.setCreateBy(userId);
+            qualityInspectionDO.setCreateByName(userName);
+            qualityInspectionDO.setCreateTime(new Date());
+            qualityInspectionDO.setDelFlag(1);
+        }
+        return qualityInspectionDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/receiptMaterialDetail/ReceiptMaterialDetailAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.receiptMaterialDetail;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.receiptMaterialDetail.ReceiptMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-06-17
+ */
+@Component
+public class ReceiptMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ReceiptMaterialDetailDO toDO(ReceiptMaterialDetailDTO receiptMaterialDetailDTO) {
+        ReceiptMaterialDetailDO receiptMaterialDetailDO = new ReceiptMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(receiptMaterialDetailDTO, receiptMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(receiptMaterialDetailDTO));
+        return receiptMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/replenishmentNotice/ReplenishmentNoticeAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.replenishmentNotice;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO;
+import com.mhd.wms.interfaces.dto.replenishmentNotice.ReplenishmentNoticeDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 补货通知单Assembler
+ *
+ * @author gen
+ * @date 2024-06-11
+ */
+@Component
+public class ReplenishmentNoticeAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ReplenishmentNoticeDO toDO(ReplenishmentNoticeDTO replenishmentNoticeDTO) {
+        ReplenishmentNoticeDO replenishmentNoticeDO = new ReplenishmentNoticeDO();
+        // 拷贝
+        BeanUtils.copyProperties(replenishmentNoticeDTO, replenishmentNoticeDO, IgnoreNullUtil.getNullPropertyNames(replenishmentNoticeDTO));
+        return replenishmentNoticeDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public ReplenishmentNoticeDO toDOByEdit(ReplenishmentNoticeDTO replenishmentNoticeDTO) {
+            ReplenishmentNoticeDO replenishmentNoticeDO = new ReplenishmentNoticeDO();
+        // 拷贝
+        BeanUtils.copyProperties(replenishmentNoticeDTO, replenishmentNoticeDO, IgnoreNullUtil.getNullPropertyNames(replenishmentNoticeDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(replenishmentNoticeDTO.getReplenishmentNoticeId() != null){
+            replenishmentNoticeDO.setUpdateBy(userId);
+            replenishmentNoticeDO.setUpdateByName(userName);
+            replenishmentNoticeDO.setUpdateTime(new Date());
+        }else {
+            replenishmentNoticeDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            replenishmentNoticeDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            replenishmentNoticeDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            replenishmentNoticeDO.setCreateBy(userId);
+            replenishmentNoticeDO.setCreateByName(userName);
+            replenishmentNoticeDO.setCreateTime(new Date());
+            replenishmentNoticeDO.setDelFlag(1);
+        }
+        return replenishmentNoticeDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/serialNumber/SerialNumberAssembler.java

@@ -0,0 +1,28 @@
+package com.mhd.wms.interfaces.assember.serialNumber;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.serialNumber.repository.todo.SerialNumberDO;
+import com.mhd.wms.interfaces.dto.serialNumber.SerialNumberDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 序列号Assembler
+ *
+ * @author gen
+ * @date 2024-07-19
+ */
+@Component
+public class SerialNumberAssembler {
+
+    /**
+     * 转换实体
+     */
+    public SerialNumberDO toDO(SerialNumberDTO serialNumberDTO) {
+        SerialNumberDO serialNumberDO = new SerialNumberDO();
+        // 拷贝
+        BeanUtils.copyProperties(serialNumberDTO, serialNumberDO, IgnoreNullUtil.getNullPropertyNames(serialNumberDTO));
+        return serialNumberDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/shelfMaterialDetail/ShelfMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.shelfMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.shelfMaterialDetail.ShelfMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-06-17
+ */
+@Component
+public class ShelfMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ShelfMaterialDetailDO toDO(ShelfMaterialDetailDTO shelfMaterialDetailDTO) {
+        ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(shelfMaterialDetailDTO, shelfMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(shelfMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(shelfMaterialDetailDTO.getMaterialDetailId() != null){
+            if(userId != null){
+                shelfMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                shelfMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            shelfMaterialDetailDO.setUpdateByName(userName);
+            shelfMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                shelfMaterialDetailDO.setCreateBy(userId);
+                shelfMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                shelfMaterialDetailDO.setCreateBy(new Long("0"));
+                shelfMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            shelfMaterialDetailDO.setCreateByName(userName);
+            shelfMaterialDetailDO.setUpdateByName(userName);
+            shelfMaterialDetailDO.setCreateTime(new Date());
+            shelfMaterialDetailDO.setUpdateTime(new Date());
+            shelfMaterialDetailDO.setDelFlag(1);
+        }
+        return shelfMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/shiftManage/ShiftManageAssembler.java

@@ -0,0 +1,24 @@
+package com.mhd.wms.interfaces.assember.shiftManage;
+
+import cn.hutool.json.JSONUtil;
+import com.mhd.wms.domain.shiftManage.repository.todo.ShiftManageDO;
+import com.mhd.wms.interfaces.dto.shiftManage.ShiftManageDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 移位管理Assembler
+ *
+ * @author gen
+ * @date 2024-07-02
+ */
+@Component
+public class ShiftManageAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ShiftManageDO toDO(ShiftManageDTO shiftManageDTO) {
+        return JSONUtil.toBean(JSONUtil.toJsonStr(shiftManageDTO), ShiftManageDO.class);
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/shiftMaterialDetail/ShiftMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.shiftMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.shiftMaterialDetail.repository.todo.ShiftMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.shiftMaterialDetail.ShiftMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 移位物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-07-02
+ */
+@Component
+public class ShiftMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ShiftMaterialDetailDO toDO(ShiftMaterialDetailDTO shiftMaterialDetailDTO) {
+        ShiftMaterialDetailDO shiftMaterialDetailDO = new ShiftMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(shiftMaterialDetailDTO, shiftMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(shiftMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        UserPo userPo = loginUser.getUserPo();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(shiftMaterialDetailDTO.getShiftIoDetailId() != null){
+            if(userId != null){
+                shiftMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                shiftMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            shiftMaterialDetailDO.setUpdateByName(userName);
+            shiftMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                shiftMaterialDetailDO.setCreateBy(userId);
+                shiftMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                shiftMaterialDetailDO.setCreateBy(new Long("0"));
+                shiftMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            shiftMaterialDetailDO.setCreateTime(new Date());
+            shiftMaterialDetailDO.setUpdateTime(new Date());
+            shiftMaterialDetailDO.setDelFlag(1);
+        }
+        return shiftMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/sowingDistributionDetails/SowingDistributionDetailsAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.sowingDistributionDetails;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.sowingDistributionDetails.repository.todo.SowingDistributionDetailsDO;
+import com.mhd.wms.interfaces.dto.sowingDistributionDetails.SowingDistributionDetailsDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 播种分货明细表Assembler
+ *
+ * @author gen
+ * @date 2024-06-05
+ */
+@Component
+public class SowingDistributionDetailsAssembler {
+
+    /**
+     * 转换实体
+     */
+    public SowingDistributionDetailsDO toDO(SowingDistributionDetailsDTO sowingDistributionDetailsDTO) {
+        SowingDistributionDetailsDO sowingDistributionDetailsDO = new SowingDistributionDetailsDO();
+        // 拷贝
+        BeanUtils.copyProperties(sowingDistributionDetailsDTO, sowingDistributionDetailsDO, IgnoreNullUtil.getNullPropertyNames(sowingDistributionDetailsDTO));
+        return sowingDistributionDetailsDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public SowingDistributionDetailsDO toDOByEdit(SowingDistributionDetailsDTO sowingDistributionDetailsDTO) {
+            SowingDistributionDetailsDO sowingDistributionDetailsDO = new SowingDistributionDetailsDO();
+        // 拷贝
+        BeanUtils.copyProperties(sowingDistributionDetailsDTO, sowingDistributionDetailsDO, IgnoreNullUtil.getNullPropertyNames(sowingDistributionDetailsDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(sowingDistributionDetailsDTO.getSowingDistributionDetailsId() != null){
+            sowingDistributionDetailsDO.setUpdateBy(userId);
+            sowingDistributionDetailsDO.setUpdateByName(userName);
+            sowingDistributionDetailsDO.setUpdateTime(new Date());
+        }else {
+            sowingDistributionDetailsDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            sowingDistributionDetailsDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            sowingDistributionDetailsDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            sowingDistributionDetailsDO.setCreateBy(userId);
+            sowingDistributionDetailsDO.setCreateByName(userName);
+            sowingDistributionDetailsDO.setCreateTime(new Date());
+            sowingDistributionDetailsDO.setDelFlag(1);
+        }
+        return sowingDistributionDetailsDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/sowingWall/SowingWallAssembler.java

@@ -0,0 +1,66 @@
+package com.mhd.wms.interfaces.assember.sowingWall;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.sowingWall.repository.todo.SowingWallDO;
+import com.mhd.wms.interfaces.dto.sowingWall.SowingWallDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 播种墙管理Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class SowingWallAssembler {
+
+    /**
+     * 转换实体
+     */
+    public SowingWallDO toDO(SowingWallDTO sowingWallDTO) {
+        SowingWallDO sowingWallDO = new SowingWallDO();
+        // 拷贝
+        BeanUtils.copyProperties(sowingWallDTO, sowingWallDO, IgnoreNullUtil.getNullPropertyNames(sowingWallDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        return sowingWallDO;
+    }
+
+    /**
+     * 转换实体
+     */
+    public SowingWallDO toDOByEdit(SowingWallDTO sowingWallDTO) {
+        SowingWallDO sowingWallDO = new SowingWallDO();
+        // 拷贝
+        BeanUtils.copyProperties(sowingWallDTO, sowingWallDO, IgnoreNullUtil.getNullPropertyNames(sowingWallDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        if(sowingWallDTO.getSowingWallId() != null){
+            sowingWallDO.setUpdateBy(loginUser.getUserid());
+            sowingWallDO.setUpdateByName(loginUser.getUsername());
+            sowingWallDO.setUpdateTime(new Date());
+
+        }else {
+            sowingWallDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            sowingWallDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            sowingWallDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            sowingWallDO.setCreateBy(loginUser.getUserid());
+            sowingWallDO.setCreateByName(loginUser.getUsername());
+            sowingWallDO.setCreateTime(new Date());
+        }
+        return sowingWallDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/statementStatistics/ImmediateInventoryAssembler.java

@@ -0,0 +1,51 @@
+package com.mhd.wms.interfaces.assember.statementStatistics;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.statementStatistics.todo.ImmediateInventoryDO;
+import com.mhd.wms.interfaces.dto.statementStatistics.ImmediateInventoryDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 即时库存Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class ImmediateInventoryAssembler {
+
+    /**
+     * 转换实体
+     */
+    public ImmediateInventoryDO toDO(ImmediateInventoryDTO immediateInventoryDTO) {
+        ImmediateInventoryDO immediateInventoryDO = new ImmediateInventoryDO();
+        // 拷贝
+        BeanUtils.copyProperties(immediateInventoryDTO, immediateInventoryDO, IgnoreNullUtil.getNullPropertyNames(immediateInventoryDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        return immediateInventoryDO;
+    }
+
+    /**
+     * 转换实体
+     */
+    public ImmediateInventoryDO toDOByEdit(ImmediateInventoryDTO immediateInventoryDTO) {
+        ImmediateInventoryDO immediateInventoryDO = new ImmediateInventoryDO();
+        // 拷贝
+        BeanUtils.copyProperties(immediateInventoryDTO, immediateInventoryDO, IgnoreNullUtil.getNullPropertyNames(immediateInventoryDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        return immediateInventoryDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/statementStatistics/WarehousingReportAssembler.java

@@ -0,0 +1,49 @@
+package com.mhd.wms.interfaces.assember.statementStatistics;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.statementStatistics.todo.WarehousingReportDO;
+import com.mhd.wms.interfaces.dto.statementStatistics.WarehousingReportDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 入库日报表Assembler
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+@Component
+public class WarehousingReportAssembler {
+    /**
+     * 转换实体
+     */
+    public WarehousingReportDO toDO(WarehousingReportDTO warehousingReportDTO) {
+        WarehousingReportDO WarehousingReportDO = new WarehousingReportDO();
+        // 拷贝
+        BeanUtils.copyProperties(warehousingReportDTO, WarehousingReportDO, IgnoreNullUtil.getNullPropertyNames(warehousingReportDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        return WarehousingReportDO;
+    }
+
+    /**
+     * 转换实体
+     */
+    public WarehousingReportDO toDOByEdit(WarehousingReportDTO warehousingReportDTO) {
+        WarehousingReportDO WarehousingReportDO = new WarehousingReportDO();
+        // 拷贝
+        BeanUtils.copyProperties(warehousingReportDTO, WarehousingReportDO, IgnoreNullUtil.getNullPropertyNames(warehousingReportDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        return WarehousingReportDO;
+    }
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java

@@ -0,0 +1,64 @@
+package com.mhd.wms.interfaces.assember.stockInOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 入库单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class StockInOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockInOrderDO toDO(StockInOrderDTO stockInOrderDTO) {
+        StockInOrderDO stockInOrderDO = new StockInOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockInOrderDTO, stockInOrderDO, IgnoreNullUtil.getNullPropertyNames(stockInOrderDTO));
+        return stockInOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockInOrderDO toDOByEdit(StockInOrderDTO stockInOrderDTO) {
+        StockInOrderDO stockInOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockInOrderDTO), StockInOrderDO.class);
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(stockInOrderDTO.getInOrderId() != null){
+            stockInOrderDO.setUpdateBy(userId);
+            stockInOrderDO.setUpdateByName(userName);
+            stockInOrderDO.setUpdateTime(new Date());
+        }else {
+            stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            stockInOrderDO.setCreateBy(userId);
+            stockInOrderDO.setCreateByName(userName);
+            stockInOrderDO.setCreateTime(new Date());
+            stockInOrderDO.setDelFlag(1);
+        }
+        return stockInOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInTaskOrder/StockInTaskOrderAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.stockInTaskOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.stockInTaskOrder.repository.todo.StockInTaskOrderDO;
+import com.mhd.wms.interfaces.dto.stockInTaskOrder.StockInTaskOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 入库作业单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class StockInTaskOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockInTaskOrderDO toDO(StockInTaskOrderDTO stockInTaskOrderDTO) {
+        StockInTaskOrderDO stockInTaskOrderDO = new StockInTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockInTaskOrderDTO, stockInTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockInTaskOrderDTO));
+        return stockInTaskOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockInTaskOrderDO toDOByEdit(StockInTaskOrderDTO stockInTaskOrderDTO) {
+            StockInTaskOrderDO stockInTaskOrderDO = new StockInTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockInTaskOrderDTO, stockInTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockInTaskOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(stockInTaskOrderDTO.getInTaskOrderId() != null){
+            stockInTaskOrderDO.setUpdateBy(userId);
+            stockInTaskOrderDO.setUpdateByName(userName);
+            stockInTaskOrderDO.setUpdateTime(new Date());
+        }else {
+            stockInTaskOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockInTaskOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            stockInTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            stockInTaskOrderDO.setCreateBy(userId);
+            stockInTaskOrderDO.setCreateByName(userName);
+            stockInTaskOrderDO.setCreateTime(new Date());
+            stockInTaskOrderDO.setDelFlag(1);
+        }
+        return stockInTaskOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutOrder/StockOutOrderAssembler.java

@@ -0,0 +1,68 @@
+package com.mhd.wms.interfaces.assember.stockOutOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 出库单Assembler
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+@Component
+public class StockOutOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockOutOrderDO toDO(StockOutOrderDTO stockOutOrderDTO) {
+        StockOutOrderDO stockOutOrderDO = new StockOutOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockOutOrderDTO, stockOutOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutOrderDTO));
+        return stockOutOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockOutOrderDO toDOByEdit(StockOutOrderDTO stockOutOrderDTO) {
+        StockOutOrderDO stockOutOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockOutOrderDTO), StockOutOrderDO.class);
+        // 拷贝
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(stockOutOrderDTO.getOutOrderId() != null){
+            stockOutOrderDO.setUpdateBy(userId);
+            stockOutOrderDO.setUpdateByName(userName);
+            stockOutOrderDO.setUpdateTime(new Date());
+        }else {
+            stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            stockOutOrderDO.setCreateBy(userId);
+            stockOutOrderDO.setCreateByName(userName);
+            stockOutOrderDO.setCreateTime(new Date());
+            stockOutOrderDO.setUpdateBy(userId);
+            stockOutOrderDO.setUpdateByName(userName);
+            stockOutOrderDO.setUpdateTime(new Date());
+            stockOutOrderDO.setDelFlag(1);
+        }
+        return stockOutOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutTaskOrder/StockOutTaskOrderAssembler.java

@@ -0,0 +1,106 @@
+package com.mhd.wms.interfaces.assember.stockOutTaskOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.stockOutTaskOrder.repository.todo.StockOutTaskOrderDO;
+import com.mhd.wms.domain.taskPickingMaterialDetail.repository.todo.TaskPickingMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.stockOutTaskOrder.StockOutTaskOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 拣货作业单Assembler
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+@Component
+public class StockOutTaskOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockOutTaskOrderDO toDO(StockOutTaskOrderDTO stockOutTaskOrderDTO) {
+        StockOutTaskOrderDO stockOutTaskOrderDO = new StockOutTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockOutTaskOrderDTO, stockOutTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutTaskOrderDTO));
+        return stockOutTaskOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockOutTaskOrderDO toDOByEdit(StockOutTaskOrderDTO stockOutTaskOrderDTO) {
+            StockOutTaskOrderDO stockOutTaskOrderDO = new StockOutTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockOutTaskOrderDTO, stockOutTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutTaskOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(stockOutTaskOrderDTO.getOutTaskOrderId() != null){
+            stockOutTaskOrderDO.setUpdateBy(userId);
+            stockOutTaskOrderDO.setUpdateByName(userName);
+            stockOutTaskOrderDO.setUpdateTime(new Date());
+        }else {
+            stockOutTaskOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockOutTaskOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            stockOutTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            stockOutTaskOrderDO.setCreateBy(userId);
+            stockOutTaskOrderDO.setCreateByName(userName);
+            stockOutTaskOrderDO.setCreateTime(new Date());
+            stockOutTaskOrderDO.setDelFlag(1);
+        }
+        return stockOutTaskOrderDO;
+    }
+
+    /**
+     * 按库位拣货 转换实体
+     */
+    public StockOutTaskOrderDO toDOPickingByStorageLocation(StockOutTaskOrderDTO stockOutTaskOrderDTO) {
+        StockOutTaskOrderDO stockOutTaskOrderDO = new StockOutTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockOutTaskOrderDTO, stockOutTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutTaskOrderDTO));
+        List<TaskPickingMaterialDetailDO> taskPickingMaterialDetailList = new ArrayList<>();
+        stockOutTaskOrderDTO.getTaskStorageList().forEach(taskStorageDTO -> {
+            taskStorageDTO.getTaskPickingMaterialDetailList().forEach(taskPickingMaterialDetailDTO -> {
+                TaskPickingMaterialDetailDO taskPickingMaterialDetailDO = new TaskPickingMaterialDetailDO();
+                BeanUtils.copyProperties(taskPickingMaterialDetailDTO, taskPickingMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(taskPickingMaterialDetailDTO));
+                taskPickingMaterialDetailList.add(taskPickingMaterialDetailDO);
+            });
+        });
+        stockOutTaskOrderDO.setTaskPickingMaterialDetailList(taskPickingMaterialDetailList);
+        return stockOutTaskOrderDO;
+    }
+
+    /**
+     * 按物料拣货 转换实体
+     */
+    public StockOutTaskOrderDO toDOPickingByMaterial(StockOutTaskOrderDTO stockOutTaskOrderDTO) {
+        StockOutTaskOrderDO stockOutTaskOrderDO = new StockOutTaskOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockOutTaskOrderDTO, stockOutTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutTaskOrderDTO));
+        List<TaskPickingMaterialDetailDO> taskPickingMaterialDetailList = new ArrayList<>();
+        stockOutTaskOrderDTO.getTaskMaterialList().forEach(taskMaterialDTO -> {
+            taskMaterialDTO.getTaskPickingMaterialDetailList().forEach(taskPickingMaterialDetailDTO -> {
+                TaskPickingMaterialDetailDO taskPickingMaterialDetailDO = new TaskPickingMaterialDetailDO();
+                BeanUtils.copyProperties(taskPickingMaterialDetailDTO, taskPickingMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(taskPickingMaterialDetailDTO));
+                taskPickingMaterialDetailList.add(taskPickingMaterialDetailDO);
+            });
+        });
+        stockOutTaskOrderDO.setTaskPickingMaterialDetailList(taskPickingMaterialDetailList);
+        return stockOutTaskOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockReceiptOrder/StockReceiptOrderAssembler.java

@@ -0,0 +1,37 @@
+package com.mhd.wms.interfaces.assember.stockReceiptOrder;
+
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 收货单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class StockReceiptOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockReceiptOrderDO toDO(StockReceiptOrderDTO stockReceiptOrderDTO) {
+        StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(stockReceiptOrderDTO, stockReceiptOrderDO, IgnoreNullUtil.getNullPropertyNames(stockReceiptOrderDTO));
+        return stockReceiptOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockReceiptOrderDO toDOByEdit(StockReceiptOrderDTO stockReceiptOrderDTO) {
+        // 拷贝
+        return JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDTO), StockReceiptOrderDO.class);
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockShelfOrder/StockShelfOrderAssembler.java

@@ -0,0 +1,36 @@
+package com.mhd.wms.interfaces.assember.stockShelfOrder;
+
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO;
+import com.mhd.wms.interfaces.dto.stockShelfOrder.StockShelfOrderDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 上架单Assembler
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+@Component
+public class StockShelfOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public StockShelfOrderDO toDO(StockShelfOrderDTO stockShelfOrderDTO) {
+        StockShelfOrderDO stockShelfOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockShelfOrderDTO), StockShelfOrderDO.class);
+        // 拷贝
+        BeanUtils.copyProperties(stockShelfOrderDTO, stockShelfOrderDO, IgnoreNullUtil.getNullPropertyNames(stockShelfOrderDTO));
+        return stockShelfOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public StockShelfOrderDO toDOByEdit(StockShelfOrderDTO stockShelfOrderDTO) {
+        return JSONUtil.toBean(JSONUtil.toJsonStr(stockShelfOrderDTO), StockShelfOrderDO.class);
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/taskReceiptMaterialDetail/TaskReceiptMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.taskReceiptMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.taskReceiptMaterialDetail.repository.todo.TaskReceiptMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.taskReceiptMaterialDetail.TaskReceiptMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 收货作业单物料详情Assembler
+ *
+ * @author gen
+ * @date 2024-06-19
+ */
+@Component
+public class TaskReceiptMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public TaskReceiptMaterialDetailDO toDO(TaskReceiptMaterialDetailDTO taskReceiptMaterialDetailDTO) {
+        TaskReceiptMaterialDetailDO taskReceiptMaterialDetailDO = new TaskReceiptMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(taskReceiptMaterialDetailDTO, taskReceiptMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(taskReceiptMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(taskReceiptMaterialDetailDTO.getMaterialDetailId() != null){
+            if(userId != null){
+                taskReceiptMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                taskReceiptMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            taskReceiptMaterialDetailDO.setUpdateByName(userName);
+            taskReceiptMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                taskReceiptMaterialDetailDO.setCreateBy(userId);
+                taskReceiptMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                taskReceiptMaterialDetailDO.setCreateBy(new Long("0"));
+                taskReceiptMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            taskReceiptMaterialDetailDO.setCreateByName(userName);
+            taskReceiptMaterialDetailDO.setUpdateByName(userName);
+            taskReceiptMaterialDetailDO.setCreateTime(new Date());
+            taskReceiptMaterialDetailDO.setUpdateTime(new Date());
+            taskReceiptMaterialDetailDO.setDelFlag(1);
+        }
+        return taskReceiptMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/taskShelfMaterialDetail/TaskShelfMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.taskShelfMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.taskShelfMaterialDetail.repository.todo.TaskShelfMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.taskShelfMaterialDetail.TaskShelfMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 上架作业物料详情Assembler
+ *
+ * @author gen
+ * @date 2024-06-19
+ */
+@Component
+public class TaskShelfMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public TaskShelfMaterialDetailDO toDO(TaskShelfMaterialDetailDTO taskShelfMaterialDetailDTO) {
+        TaskShelfMaterialDetailDO taskShelfMaterialDetailDO = new TaskShelfMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(taskShelfMaterialDetailDTO, taskShelfMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(taskShelfMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(taskShelfMaterialDetailDTO.getMaterialDetailId() != null){
+            if(userId != null){
+                taskShelfMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                taskShelfMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            taskShelfMaterialDetailDO.setUpdateByName(userName);
+            taskShelfMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                taskShelfMaterialDetailDO.setCreateBy(userId);
+                taskShelfMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                taskShelfMaterialDetailDO.setCreateBy(new Long("0"));
+                taskShelfMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            taskShelfMaterialDetailDO.setCreateByName(userName);
+            taskShelfMaterialDetailDO.setUpdateByName(userName);
+            taskShelfMaterialDetailDO.setCreateTime(new Date());
+            taskShelfMaterialDetailDO.setUpdateTime(new Date());
+            taskShelfMaterialDetailDO.setDelFlag(1);
+        }
+        return taskShelfMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/userCommonSettings/UserCommonSettingsAssembler.java

@@ -0,0 +1,75 @@
+package com.mhd.wms.interfaces.assember.userCommonSettings;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.userCommonSettings.repository.todo.UserCommonSettingsDO;
+import com.mhd.wms.interfaces.dto.userCommonSettings.UserCommonSettingsDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 用户常用设置关联Assembler
+ *
+ * @author gen
+ * @date 2024-07-29
+ */
+@Component
+public class UserCommonSettingsAssembler {
+
+    /**
+     * 转换实体
+     */
+    public UserCommonSettingsDO toDO(UserCommonSettingsDTO userCommonSettingsDTO) {
+        UserCommonSettingsDO userCommonSettingsDO = new UserCommonSettingsDO();
+        // 拷贝
+        BeanUtils.copyProperties(userCommonSettingsDTO, userCommonSettingsDO, IgnoreNullUtil.getNullPropertyNames(userCommonSettingsDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(userCommonSettingsDTO.getUserCommonSettingsId() != null){
+            if(userId != null){
+                userCommonSettingsDO.setUpdateBy(userId);
+            }else {
+                userCommonSettingsDO.setUpdateBy(new Long("0"));
+            }
+            userCommonSettingsDO.setUpdateByName(userName);
+            userCommonSettingsDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                userCommonSettingsDO.setCreateBy(userId);
+                userCommonSettingsDO.setUpdateBy(userId);
+            }else {
+                userCommonSettingsDO.setCreateBy(new Long("0"));
+                userCommonSettingsDO.setUpdateBy(new Long("0"));
+            }
+            userCommonSettingsDO.setCreateByName(userName);
+            userCommonSettingsDO.setUpdateByName(userName);
+            userCommonSettingsDO.setCreateTime(new Date());
+            userCommonSettingsDO.setUpdateTime(new Date());
+            userCommonSettingsDO.setDelFlag(1);
+        }
+        return userCommonSettingsDO;
+    }
+
+    /**
+     * 转换实体
+     */
+    public UserCommonSettingsDO toDOByQuery(UserCommonSettingsDTO userCommonSettingsDTO) {
+        UserCommonSettingsDO userCommonSettingsDO = new UserCommonSettingsDO();
+        // 拷贝
+        BeanUtils.copyProperties(userCommonSettingsDTO, userCommonSettingsDO, IgnoreNullUtil.getNullPropertyNames(userCommonSettingsDTO));
+        return userCommonSettingsDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/waveMaterialDetail/WaveMaterialDetailAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.waveMaterialDetail;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.waveMaterialDetail.repository.todo.WaveMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.waveMaterialDetail.WaveMaterialDetailDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 出库单物料明细Assembler
+ *
+ * @author gen
+ * @date 2024-06-27
+ */
+@Component
+public class WaveMaterialDetailAssembler {
+
+    /**
+     * 转换实体
+     */
+    public WaveMaterialDetailDO toDO(WaveMaterialDetailDTO waveMaterialDetailDTO) {
+        WaveMaterialDetailDO waveMaterialDetailDO = new WaveMaterialDetailDO();
+        // 拷贝
+        BeanUtils.copyProperties(waveMaterialDetailDTO, waveMaterialDetailDO, IgnoreNullUtil.getNullPropertyNames(waveMaterialDetailDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(waveMaterialDetailDTO.getMaterialDetailId() != null){
+            if(userId != null){
+                waveMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                waveMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            waveMaterialDetailDO.setUpdateByName(userName);
+            waveMaterialDetailDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                waveMaterialDetailDO.setCreateBy(userId);
+                waveMaterialDetailDO.setUpdateBy(userId);
+            }else {
+                waveMaterialDetailDO.setCreateBy(new Long("0"));
+                waveMaterialDetailDO.setUpdateBy(new Long("0"));
+            }
+            waveMaterialDetailDO.setCreateByName(userName);
+            waveMaterialDetailDO.setUpdateByName(userName);
+            waveMaterialDetailDO.setCreateTime(new Date());
+            waveMaterialDetailDO.setUpdateTime(new Date());
+            waveMaterialDetailDO.setDelFlag(1);
+        }
+        return waveMaterialDetailDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/waveOrder/WaveOrderAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.waveOrder;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.waveOrder.repository.todo.WaveOrderDO;
+import com.mhd.wms.interfaces.dto.waveOrder.WaveOrderDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 波次单Assembler
+ *
+ * @author gen
+ * @date 2024-06-04
+ */
+@Component
+public class WaveOrderAssembler {
+
+    /**
+     * 转换实体
+     */
+    public WaveOrderDO toDO(WaveOrderDTO waveOrderDTO) {
+        WaveOrderDO waveOrderDO = new WaveOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(waveOrderDTO, waveOrderDO, IgnoreNullUtil.getNullPropertyNames(waveOrderDTO));
+        return waveOrderDO;
+    }
+
+    /**
+    * 转换实体
+    */
+    public WaveOrderDO toDOByEdit(WaveOrderDTO waveOrderDTO) {
+            WaveOrderDO waveOrderDO = new WaveOrderDO();
+        // 拷贝
+        BeanUtils.copyProperties(waveOrderDTO, waveOrderDO, IgnoreNullUtil.getNullPropertyNames(waveOrderDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(waveOrderDTO.getWaveOrderId() != null){
+            waveOrderDO.setUpdateBy(userId);
+            waveOrderDO.setUpdateByName(userName);
+            waveOrderDO.setUpdateTime(new Date());
+        }else {
+            waveOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            waveOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            waveOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            waveOrderDO.setCreateBy(userId);
+            waveOrderDO.setCreateByName(userName);
+            waveOrderDO.setCreateTime(new Date());
+            waveOrderDO.setDelFlag(1);
+        }
+        return waveOrderDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/waveRule/WaveRuleAssembler.java

@@ -0,0 +1,65 @@
+package com.mhd.wms.interfaces.assember.waveRule;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.waveRule.repository.todo.WaveRuleDO;
+import com.mhd.wms.interfaces.dto.waveRule.WaveRuleDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 波次规则Assembler
+ *
+ * @author gen
+ * @date 2024-07-23
+ */
+@Component
+public class WaveRuleAssembler {
+
+    /**
+     * 转换实体
+     */
+    public WaveRuleDO toDO(WaveRuleDTO waveRuleDTO) {
+        WaveRuleDO waveRuleDO = new WaveRuleDO();
+        // 拷贝
+        BeanUtils.copyProperties(waveRuleDTO, waveRuleDO, IgnoreNullUtil.getNullPropertyNames(waveRuleDTO));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        String userName = loginUser.getUsername();
+        // 获取登录人id
+        Long userId = loginUser.getUserid();
+        if(waveRuleDTO.getId() != null){
+            if(userId != null){
+                waveRuleDO.setUpdateBy(userId);
+            }else {
+                waveRuleDO.setUpdateBy(new Long("0"));
+            }
+            waveRuleDO.setUpdateByName(userName);
+            waveRuleDO.setUpdateTime(new Date());
+
+        }else {
+            if(userId != null){
+                waveRuleDO.setCreateBy(userId);
+                waveRuleDO.setUpdateBy(userId);
+            }else {
+                waveRuleDO.setCreateBy(new Long("0"));
+                waveRuleDO.setUpdateBy(new Long("0"));
+            }
+            waveRuleDO.setCreateByName(userName);
+            waveRuleDO.setUpdateByName(userName);
+            waveRuleDO.setCreateTime(new Date());
+            waveRuleDO.setUpdateTime(new Date());
+            waveRuleDO.setDelFlag(1);
+        }
+        return waveRuleDO;
+    }
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/commonSettings/CommonSettingsDTO.java

@@ -0,0 +1,62 @@
+package com.mhd.wms.interfaces.dto.commonSettings;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 常用设置对象 common_settings
+ *
+ * @author gen
+ * @date 2024-07-29
+ */
+
+@Data
+public class CommonSettingsDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("常用设置id")
+    private Long commonSettingsId;
+
+    @ApiModelProperty("所属上级id")
+    @Excel(name = "所属上级id")
+    private Long parentId;
+
+    @ApiModelProperty("名称")
+    @Excel(name = "名称")
+    private String name;
+
+    @ApiModelProperty("route")
+    @Excel(name = "route")
+    private String route;
+
+    @ApiModelProperty("级别 1-一级 2-二级")
+    @Excel(name = "级别 1-一级 2-二级")
+    private Long level;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty("组织id")
+    @Excel(name = "组织id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/containerUsageRecord/ContainerUsageRecordDTO.java

@@ -0,0 +1,91 @@
+package com.mhd.wms.interfaces.dto.containerUsageRecord;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 容器使用记录对象 container_usage_record
+ *
+ * @author gen
+ * @date 2024-08-22
+ */
+
+@Data
+public class ContainerUsageRecordDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private String id;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("容器容积 单位：立方米")
+    @Excel(name = "容器容积 单位：立方米")
+    private BigDecimal containerVolume;
+
+    @ApiModelProperty("记录类型: 1-占用 2-释放")
+    @Excel(name = "记录类型: 1-占用 2-释放")
+    private Integer useType;
+
+    @ApiModelProperty("使用节点: 1-收货 2-上架 3-拣货 4-出库")
+    @Excel(name = "使用节点: 1-收货 2-上架 3-拣货 4-出库")
+    private Integer node;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java

@@ -0,0 +1,118 @@
+package com.mhd.wms.interfaces.dto.deliveTask;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 下发任务对象 delive_task
+ *
+ * @author gen
+ * @date 2024-07-26
+ */
+
+@Data
+public class DeliveTaskDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("任务id")
+    private Long deliverTaskId;
+
+    @ApiModelProperty("任务单号")
+    @Excel(name = "任务单号")
+    private String taskNumber;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String trackingNumber;
+
+    @ApiModelProperty("组织id")
+    @Excel(name = "组织id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("任务类型  0-无  1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点")
+    @Excel(name = "任务类型  0-无  1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点")
+    private Integer taskType;
+
+    @ApiModelProperty("任务状态  0-未接收 1-已接收 2-已拒绝  3-已完成 4-已关闭")
+    @Excel(name = "任务状态  0-未接收 1-已接收 2-已拒绝  3-已完成 4-已关闭")
+    private Integer taskStatus;
+
+    @ApiModelProperty("是否下发 0-否  1-是")
+    @Excel(name = "是否下发 0-否  1-是")
+    private Integer taskDistribution;
+
+    @ApiModelProperty("下发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date taskDistributionTime;
+
+    @ApiModelProperty("下发人id")
+    @Excel(name = "下发人id")
+    private Long taskDistributionId;
+
+    @ApiModelProperty("下发人名称")
+    @Excel(name = "下发人名称")
+    private String taskDistributionName;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long operatorsBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String operatorsName;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty("重新指派时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @Excel(name = "重新指派时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reassignTime;
+
+    @ApiModelProperty("重新指派人id")
+    @Excel(name = "重新指派人id")
+    private Long reassignById;
+
+    @ApiModelProperty("重新指派人")
+    @Excel(name = "重新指派人")
+    private String reassignByName;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("查询类型  1-指派给我的  2-任务")
+    @Excel(name = "查询类型  1-指派给我的  2-任务")
+    private Long tabType;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/differentManage/DifferentManageDTO.java

@@ -0,0 +1,120 @@
+package com.mhd.wms.interfaces.dto.differentManage;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.investigetionManageDetail.InvestigetionManageDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 差异单对象 different_manage
+ *
+ * @author gen
+ * @date 2024-07-20
+ */
+
+@Data
+public class DifferentManageDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("差异管理id")
+    private Long differentManageId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("差异单号")
+    @Excel(name = "差异单号")
+    private String differentNumber;
+
+    @ApiModelProperty("盘点单号")
+    @Excel(name = "盘点单号")
+    private String investigationNumber;
+
+    @ApiModelProperty("盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    @Excel(name = "盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    private Integer investigationStatus;
+
+    @ApiModelProperty("盘点范围")
+    @Excel(name = "盘点范围")
+    private String investigationRange;
+
+    @ApiModelProperty("盘点方式：1.明盘 2.盲盘")
+    @Excel(name = "盘点方式：1.明盘 2.盲盘")
+    private Integer investigationType;
+
+    @ApiModelProperty("盘点方法：1.静态盘点 2.动态盘点")
+    @Excel(name = "盘点方法：1.静态盘点 2.动态盘点")
+    private Integer investigationMethod;
+
+    @ApiModelProperty("盘点轮次：1.初盘 2.复盘")
+    @Excel(name = "盘点轮次：1.初盘 2.复盘")
+    private Integer investigationFrequency;
+
+    @ApiModelProperty("监盘人ID")
+    @Excel(name = "监盘人ID")
+    private Long investigationManBy;
+
+    @ApiModelProperty("监盘人姓名")
+    @Excel(name = "监盘人姓名")
+    private String investigationManName;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long operatorsBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String operatorsName;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("是否作废: 1-是 2-否")
+    @Excel(name = "是否作废: 1-是 2-否")
+    private Integer nullify;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty("是否过账: 1-是 2-否")
+    @Excel(name = "是否过账: 1-是 2-否")
+    private Integer postedFlag;
+
+    @ApiModelProperty("是否重盘: 1-是 2-否")
+    @Excel(name = "是否重盘: 1-是 2-否")
+    private Integer reCountedFlag;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("盘点详情")
+    @TableField(exist = false)
+    private List<InvestigetionManageDetailDTO> investigetionManageDetailList;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java

@@ -0,0 +1,134 @@
+package com.mhd.wms.interfaces.dto.handoverTaskOrder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 交接作业单对象 handover_task_order
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+
+@Data
+public class HandoverTaskOrderDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("交接作业单id")
+    private Long handoverTaskOrderId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("作业流水号")
+    @Excel(name = "作业流水号")
+    private String serialNumber;
+
+    @ApiModelProperty("作业单号")
+    @Excel(name = "作业单号")
+    private String taskNumber;
+
+    @ApiModelProperty("交接状态: 1-未交接 2-已交接")
+    @Excel(name = "交接状态: 1-未交接 2-已交接")
+    private Integer status;
+
+    @ApiModelProperty("月台id")
+    @Excel(name = "月台id")
+    private Long platformId;
+
+    @ApiModelProperty("月台编码")
+    @Excel(name = "月台编码")
+    private String platformCode;
+
+    @ApiModelProperty("月台名称 ")
+    @Excel(name = "月台名称 ")
+    private String platformName;
+
+    @ApiModelProperty("月台使用时间管理id")
+    @Excel(name = "月台使用时间管理id")
+    private Long platformUseTimeId;
+
+    @ApiModelProperty("月台使用开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "月台使用开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date platformUseStartTime;
+
+    @ApiModelProperty("月台使用结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "月台使用结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date platformUseEndTime;
+
+    @ApiModelProperty("月台使用状态：1-未使用 2-使用中 3-已释放")
+    @Excel(name = "月台使用状态：1-未使用 2-使用中 3-已释放")
+    private Integer platformUseStatus;
+
+    @ApiModelProperty("出库单类型编码")
+    @Excel(name = "出库单类型编码")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称")
+    @Excel(name = "出库单类型名称")
+    private String orderTypeName;
+
+    @ApiModelProperty("预计出货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expectTime;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String orderNumber;
+
+    @ApiModelProperty("拣货单号")
+    @Excel(name = "拣货单号")
+    private String pickingOrderNumber;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("交接作业单id")
+    private List<Long> handoverTaskOrderIds;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java

@@ -0,0 +1,266 @@
+package com.mhd.wms.interfaces.dto.inMaterialDetail;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.inMaterialDetailSerialNumber.InMaterialDetailSerialNumberDTO;
+import com.mhd.wms.interfaces.dto.materialMoreDetail.MaterialMoreDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料明细对象 material_detail
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class InMaterialDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("订单物料明细id")
+    private Long materialDetailId;
+
+    @ApiModelProperty("业务唯一id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long uniqueId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("物料库存id")
+    @Excel(name = "物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("收货数量")
+    @Excel(name = "收货数量")
+    private BigDecimal receiptQuantity;
+
+    @ApiModelProperty("上架数量")
+    @Excel(name = "上架数量")
+    private BigDecimal shelvesQuantity;
+
+    @ApiModelProperty("作业数量（例如：收货数量 上架数量）")
+    @Excel(name = "作业数量（例如：收货数量 上架数量）")
+    private BigDecimal actualQuantity;
+
+    @ApiModelProperty("收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
+    @Excel(name = "收货状态: 1-待收货 2-收货中 3-已收货 4-已收货（少收） 5-已收货（超收）")
+    private Integer receiptStatus;
+
+    @ApiModelProperty("上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
+    @Excel(name = "上架状态: 1-待上架 2-上架中 3-已上架 4-已上架（少上） 5-已上架（超上）")
+    private Integer shelvesStatus;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitNumber;
+
+    @ApiModelProperty("物料仓库控制信息id")
+    @Excel(name = "物料仓库控制信息id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("是否序列号管理: 1-是 2-否")
+    @Excel(name = "是否序列号管理: 1-是 2-否")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("是否质检管理: 1-是 2-否")
+    @Excel(name = "是否质检管理: 1-是 2-否")
+    private Integer qualityInspectionManage;
+
+    @ApiModelProperty("质检阶段: 1-收货前 2-收货后上架前")
+    @Excel(name = "质检阶段: 1-收货前 2-收货后上架前")
+    private Integer qualityInspectionStage;
+
+    @ApiModelProperty("质检规则: 1-全检 2-抽检 ")
+    @Excel(name = "质检规则: 1-全检 2-抽检 ")
+    private Integer qualityInspectionRule;
+
+    @ApiModelProperty("抽检比例")
+    @Excel(name = "抽检比例")
+    private BigDecimal qualityInspectionRatio;
+
+    @ApiModelProperty("质检项: 1-包装 2-纯度")
+    @Excel(name = "质检项: 1-包装 2-纯度")
+    private Integer qualityInspectionTerm;
+
+    @ApiModelProperty("质检结果: 1-正常 2-异常")
+    @Excel(name = "质检结果: 1-正常 2-异常")
+    private Integer qualityInspectionResults;
+
+    @ApiModelProperty("是否允许超收: 1-是 2-否")
+    @Excel(name = "是否允许超收: 1-是 2-否")
+    private Integer allowOvercharge;
+
+    @ApiModelProperty("超收比例")
+    @Excel(name = "超收比例")
+    private BigDecimal overchargeRatio;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料状态编码")
+    @Excel(name = "物料状态编码")
+    private String materialStatusCode;
+
+    @ApiModelProperty("物料状态名称")
+    @Excel(name = "物料状态名称")
+    private String materialStatusName;
+
+    @ApiModelProperty("分配规则id")
+    @Excel(name = "分配规则id")
+    private Long distributeRuleId;
+
+    @ApiModelProperty("分配规则编码")
+    @Excel(name = "分配规则编码")
+    private String distributeRuleCode;
+
+    @ApiModelProperty("分配规则名称")
+    @Excel(name = "分配规则名称")
+    private String distributeRuleName;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("上架仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("上架仓库编码")
+    @Excel(name = "上架仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("上架库区id")
+    @Excel(name = "上架库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("上架库区编码")
+    @Excel(name = "上架库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("上架库区名称")
+    @Excel(name = "上架库区名称")
+    private String storageName;
+
+    @ApiModelProperty("上架库位id")
+    @Excel(name = "上架库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("上架库位编码")
+    @Excel(name = "上架库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("上架库位名称")
+    @Excel(name = "上架库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("层级深度，从一级开始递增")
+    private Integer level;
+
+    @ApiModelProperty("父级唯一Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentUniqueId;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("更多属性")
+    private List<MaterialMoreDetailDTO> materialMoreDetailList;
+
+    @ApiModelProperty("序列号")
+    private List<InMaterialDetailSerialNumberDTO> materialDetailSerialNumberList;
+
+    @ApiModelProperty("入库单号集合")
+    @Excel(name = "入库单号集合")
+    private List<String> inOrderNumberList;
+
+    @ApiModelProperty("是否是差异单")
+    private Integer isDifferentType;
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetailSerialNumber/InMaterialDetailSerialNumberDTO.java

@@ -0,0 +1,61 @@
+package com.mhd.wms.interfaces.dto.inMaterialDetailSerialNumber;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 物料明细序列号对象 material_detail_serial_number
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class InMaterialDetailSerialNumberDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料更多属性明细id")
+    private Long materialDetailSerialNumberId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String orderNumber;
+
+    @ApiModelProperty("订单物料明细业务唯一id")
+    @Excel(name = "订单物料明细业务唯一id")
+    private Long materialDetailUniqueId;
+
+    @ApiModelProperty("序列号")
+    @Excel(name = "序列号")
+    private String serialNumber;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("是否是差异单")
+    private Integer isDifferentType;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inOrderAbnormal/InOrderAbnormalDTO.java

@@ -0,0 +1,91 @@
+package com.mhd.wms.interfaces.dto.inOrderAbnormal;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 入库异常单对象 in_order_abnormal
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class InOrderAbnormalDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("入库单id")
+    private Long inOrderAbnormalId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("异常单号")
+    @Excel(name = "异常单号")
+    private String abnormalNumber;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("收货单号")
+    @Excel(name = "收货单号")
+    private String receiptOrderNumber;
+
+    @ApiModelProperty("上架单号")
+    @Excel(name = "上架单号")
+    private String shelfOrderNumber;
+
+    @ApiModelProperty("类型：1-收货 2-上架")
+    @Excel(name = "类型：1-收货 2-上架")
+    private Integer type;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("作业数量")
+    @Excel(name = "作业数量")
+    private BigDecimal actualQuantity;
+
+    @ApiModelProperty("允许超出的作业数量")
+    @Excel(name = "允许超出的作业数量")
+    private BigDecimal allowActualQuantity;
+
+    @ApiModelProperty("异常数量(异常数量 = 作业数量 -  计划数量)")
+    @Excel(name = "异常数量")
+    private BigDecimal abnormalActualQuantity;
+
+    @ApiModelProperty("异常类型: 1-上架异常 2-收货异常 3-收货异常（允许超收没超出超收比例） 4-收货异常（不允许超收）5-收货异常（允许超收但超出超收比例）")
+    @Excel(name = "异常类型: 1-上架异常 2-收货异常 3-收货异常", readConverterExp = "允=许超收但不允许超出超收比例")
+    private Integer abnormalType;
+
+    @ApiModelProperty("异常原因")
+    @Excel(name = "异常原因")
+    private String abnormalReason;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java

@@ -0,0 +1,166 @@
+package com.mhd.wms.interfaces.dto.inventoryAdjustmentRecord;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 库存调整记录对象 inventory_adjustment_record
+ *
+ * @author gen
+ * @date 2024-07-17
+ */
+
+@Data
+public class InventoryAdjustmentRecordDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("库存调整记录id")
+    private Long inventoryAdjustmentId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("调整类型：0：无状态 1：数量调整 :2：状态调整 3:库存冻结")
+    @Excel(name = "调整类型：0：无状态 1：数量调整 :2：状态调整 3:库存冻结")
+    private Long adjustType;
+
+    @ApiModelProperty("调整方向：0：无状态 1：增库存 2：减库存")
+    @Excel(name = "调整方向：0：无状态 1：增库存 2：减库存")
+    private Long adjustDirection;
+
+    @ApiModelProperty("调整前状态编码")
+    @Excel(name = "调整前状态编码")
+    private String adjustBeforeStatusCode;
+
+    @ApiModelProperty("调整前状态名称")
+    @Excel(name = "调整前状态名称")
+    private String adjustBeforeStatusName;
+
+    @ApiModelProperty("调整后状态编码")
+    @Excel(name = "调整后状态编码")
+    private String adjustAfterStatusCode;
+
+    @ApiModelProperty("调整后状态名称")
+    @Excel(name = "调整后状态名称")
+    private String adjustAfterStatusName;
+
+    @ApiModelProperty("调整数量")
+    @Excel(name = "调整数量")
+    private BigDecimal adjustQuantity;
+
+    @ApiModelProperty("调整前库存数量")
+    @Excel(name = "调整前库存数量")
+    private BigDecimal inventoryBeforeQuantity;
+
+    @ApiModelProperty("调整前可用数量")
+    @Excel(name = "调整前可用数量")
+    private BigDecimal allocationBeforeQuantity;
+
+    @ApiModelProperty("调整前冻结数量")
+    @Excel(name = "调整前冻结数量")
+    private BigDecimal freezeBeforeQuantity;
+
+    @ApiModelProperty("调整后库存数量")
+    @Excel(name = "调整后库存数量")
+    private BigDecimal inventoryAfterQuantity;
+
+    @ApiModelProperty("调整后可用数量")
+    @Excel(name = "调整后可用数量")
+    private BigDecimal allocationAfterQuantity;
+
+    @ApiModelProperty("调整后冻结数量")
+    @Excel(name = "调整后冻结数量")
+    private BigDecimal freezeAfterQuantity;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAllocationRule/InventoryAllocationRuleDTO.java

@@ -0,0 +1,64 @@
+package com.mhd.wms.interfaces.dto.inventoryAllocationRule;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.inventoryAllocationRuleDetail.InventoryAllocationRuleDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 库存分配规则对象 inventory_allocation_rule
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+
+@Data
+public class InventoryAllocationRuleDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("编号")
+    private Long id;
+
+    @ApiModelProperty("最高组织id")
+    @Excel(name = "最高组织id")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("组织表id")
+    @Excel(name = "组织表id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("规则编码")
+    @Excel(name = "规则编码")
+    private String ruleNum;
+
+    @ApiModelProperty("规则名称")
+    @Excel(name = "规则名称")
+    private String ruleName;
+
+    @ApiModelProperty("启用状态;0启用1停用")
+    @Excel(name = "启用状态;0启用1停用")
+    private Integer enabled;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty(name = "库存分配规则明细")
+    private List<InventoryAllocationRuleDetailDTO> inventoryAllocationRuleDetailList = new ArrayList<>();
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAllocationRuleDetail/InventoryAllocationRuleDetailDTO.java

@@ -0,0 +1,82 @@
+package com.mhd.wms.interfaces.dto.inventoryAllocationRuleDetail;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 库存规则分配明细对象 inventory_allocation_rule_detail
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+
+@Data
+public class InventoryAllocationRuleDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("编号")
+    private Long id;
+
+    @ApiModelProperty("最高组织id")
+    @Excel(name = "最高组织id")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("组织表id")
+    @Excel(name = "组织表id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("库存分配表ID")
+    @Excel(name = "库存分配表ID")
+    private Long inventoryAllocationRuleId;
+
+    @ApiModelProperty("库位种类ID")
+    @Excel(name = "库位种类ID")
+    private String locationKindId;
+
+    @ApiModelProperty("库位种类")
+    @Excel(name = "库位种类")
+    private String locationKind;
+
+    @ApiModelProperty("库位分类ID")
+    @Excel(name = "库位分类ID")
+    private String locationTypeId;
+
+    @ApiModelProperty("库位分类")
+    @Excel(name = "库位分类")
+    private String locationType;
+
+    @ApiModelProperty("混放策略ID")
+    @Excel(name = "混放策略ID")
+    private String mixingSlgId;
+
+    @ApiModelProperty("混放策略")
+    @Excel(name = "混放策略")
+    private String mixingSlg;
+
+    @ApiModelProperty("物料状态ID")
+    @Excel(name = "物料状态ID")
+    private String materialStatusId;
+
+    @ApiModelProperty("物料状态")
+    @Excel(name = "物料状态")
+    private String materialStatus;
+
+    @ApiModelProperty("优先级")
+    @Excel(name = "优先级")
+    private Long seqNum;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryStandingDetail/InventoryStandingDetailDTO.java

@@ -0,0 +1,91 @@
+package com.mhd.wms.interfaces.dto.inventoryStandingDetail;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 库存台账追溯详情对象 inventory_standing_detail
+ *
+ * @author gen
+ * @date 2024-07-13
+ */
+
+@Data
+public class InventoryStandingDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("库存台账id")
+    private Long inventoryStandingDetailId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料条码")
+    @Excel(name = "物料条码")
+    private String materialBarCode;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主名称编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String trackingNumber;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("节点状态: 1-收货 2-上架 3-拣货 4-复核 5-移位 6-库存调整 7-盘点（盘盈） 8-盘点（盘亏）9-盘点（正常）")
+    @Excel(name = "节点状态: 1-收货 2-上架 3-拣货 4-复核 5-移位 6-库存调整 7-盘点（盘盈） 8-盘点（盘亏）9-盘点（正常）")
+    private Integer nodeStatus;
+
+    @ApiModelProperty("物料数量")
+    @Excel(name = "物料数量")
+    private BigDecimal materialQuantity;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryStandingReport/InventoryStandingReportDTO.java

@@ -0,0 +1,87 @@
+package com.mhd.wms.interfaces.dto.inventoryStandingReport;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 库存台账报对象 inventory_standing_report
+ *
+ * @author gen
+ * @date 2024-07-12
+ */
+
+@Data
+public class InventoryStandingReportDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("库存台账id")
+    private Long inventoryStandingId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料条码")
+    @Excel(name = "物料条码")
+    private String barCode;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主名称编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("节点状态: 1-收货 2-上架 3-拣货 4-复核 5-移位 6-库存调整 7-盘点（盘盈） 8-盘点（盘亏）9-盘点（正常）")
+    @Excel(name = "节点状态: 1-收货 2-上架 3-拣货 4-复核 5-移位 6-库存调整 7-盘点（盘盈） 8-盘点（盘亏）9-盘点（正常）")
+    private Integer nodeStatus;
+
+    @ApiModelProperty("物料数量")
+    @Excel(name = "物料数量")
+    private BigDecimal materialQuantity;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryTurnoverRule/InventoryTurnoverRuleDTO.java

@@ -0,0 +1,62 @@
+package com.mhd.wms.interfaces.dto.inventoryTurnoverRule;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.inventoryTurnoverRuleDetail.InventoryTurnoverRuleDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 库存周转规则对象 inventory_turnover_rule
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+
+@Data
+public class InventoryTurnoverRuleDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("编号")
+    private Long id;
+
+    @ApiModelProperty("最高组织id")
+    @Excel(name = "最高组织id")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("组织表id")
+    @Excel(name = "组织表id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("规则编码")
+    @Excel(name = "规则编码")
+    private String ruleNum;
+
+    @ApiModelProperty("规则名称")
+    @Excel(name = "规则名称")
+    private String ruleName;
+
+    @ApiModelProperty("启用状态;0启用1停用")
+    @Excel(name = "启用状态;0启用1停用")
+    private Integer enabled;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty(name = "库存周转规则明细")
+    private List<InventoryTurnoverRuleDetailDTO> inventoryTurnoverRuleDetailList = new ArrayList<>();
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryTurnoverRuleDetail/InventoryTurnoverRuleDetailDTO.java

@@ -0,0 +1,62 @@
+package com.mhd.wms.interfaces.dto.inventoryTurnoverRuleDetail;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 库存周转规则明细对象 inventory_turnover_rule_detail
+ *
+ * @author gen
+ * @date 2024-07-22
+ */
+
+@Data
+public class InventoryTurnoverRuleDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("编号")
+    private Long id;
+
+    @ApiModelProperty("最高组织id")
+    @Excel(name = "最高组织id")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("组织表id")
+    @Excel(name = "组织表id")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("库存周转规则ID")
+    @Excel(name = "库存周转规则ID")
+    private Long inventoryTurnoverRuleId;
+
+    @ApiModelProperty("批次属性ID")
+    @Excel(name = "批次属性ID")
+    private String batchAttributeId;
+
+    @ApiModelProperty("批次属性")
+    @Excel(name = "批次属性")
+    private String batchAttribute;
+
+    @ApiModelProperty("排序方式ID;0升序1降序")
+    @Excel(name = "排序方式ID;0升序1降序")
+    private Integer sortord;
+
+    @ApiModelProperty("优先级")
+    @Excel(name = "优先级")
+    private Long seqNum;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryWarningAnalyze/InventoryWarningAnalyzeDTO.java

@@ -0,0 +1,162 @@
+package com.mhd.wms.interfaces.dto.inventoryWarningAnalyze;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 库存预警分析对象 inventory_warning_analyze
+ *
+ * @author gen
+ * @date 2024-07-24
+ */
+
+@Data
+public class InventoryWarningAnalyzeDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("库存预警分析id")
+    private Long inventoryWarningAnalyzeId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitQuantity;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("预警单号")
+    @Excel(name = "预警单号")
+    private String warningAnalyzeNumber;
+
+    @ApiModelProperty("预警类型(1:库存不足 2:库存超限)")
+    @Excel(name = "预警类型(1:库存不足 2:库存超限)")
+    private Integer warningAnalyzeType;
+
+    @ApiModelProperty("库存标准预警数")
+    @Excel(name = "库存标准预警数")
+    private BigDecimal warningStandardQuantity;
+
+    @ApiModelProperty("预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warningTime;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigationManageDTO.java

@@ -0,0 +1,176 @@
+package com.mhd.wms.interfaces.dto.investigationManage;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.investigetionManageDetail.InvestigetionManageDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 盘点管理对象 investigation_manage
+ *
+ * @author gen
+ * @date 2024-07-10
+ */
+
+@Data
+public class InvestigationManageDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("盘点管理id")
+    private Long investigationManageId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("盘点单号")
+    @Excel(name = "盘点单号")
+    private String investigationNumber;
+
+    @ApiModelProperty("上次盘点单号")
+    @Excel(name = "上次盘点单号")
+    private String oldInvestigationNumber;
+
+@ApiModelProperty("盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    @Excel(name = "盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    private Integer investigationStatus;
+
+    @ApiModelProperty("盘点范围")
+    @Excel(name = "盘点范围")
+    private String investigationRange;
+
+    @ApiModelProperty("盘点方式：1.明盘 2.盲盘")
+    @Excel(name = "盘点方式：1.明盘 2.盲盘")
+    private Integer investigationType;
+
+    @ApiModelProperty("盘点方法：1.静态盘点 2.动态盘点")
+    @Excel(name = "盘点方法：1.静态盘点 2.动态盘点")
+    private Integer investigationMethod;
+
+    @ApiModelProperty("盘点轮次：1.初盘 2.复盘")
+    @Excel(name = "盘点轮次：1.初盘 2.复盘")
+    private Integer investigationFrequency;
+
+    @ApiModelProperty("差异单号")
+    @Excel(name = "差异单号")
+    private String differentNumber;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long investigationManBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String investigationManName;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer auditStatus;
+
+    @ApiModelProperty("盘点审核备注")
+    @Excel(name = "盘点审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty("盘点审核人")
+    @Excel(name = "盘点审核人")
+    private Long auditBy;
+
+    @ApiModelProperty("盘点审核人姓名")
+    @Excel(name = "盘点审核人姓名")
+    private String auditByName;
+
+    @ApiModelProperty("盘点审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "盘点审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditTime;
+
+    @ApiModelProperty("任务是否下发: 1-是 2-否")
+    @Excel(name = "任务是否下发: 1-是 2-否")
+    private Integer taskDistribution;
+
+    @ApiModelProperty("任务下发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date taskDistributionTime;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long operatorsBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String operatorsName;
+
+    @ApiModelProperty("是否作废: 1-否 2-是")
+    @Excel(name = "是否作废: 1-否 2-是")
+    private Integer nullify;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("盘点详情")
+    @TableField(exist = false)
+    private List<InvestigetionManageDetailDTO> investigetionManageDetailList;
+
+    @ApiModelProperty("盘点管理id集合")
+    private List<Long> investigationManageIds;
+
+    @ApiModelProperty("库位分组")
+    private List<InvestigetionStorageDTO> investigetionStorageList;
+
+    @ApiModelProperty("物料分组")
+    private List<InvestigetionMaterialDTO> investigetionMaterialList;
+
+    @ApiModelProperty("小于指定状态值：1-待收货 2-部分收货 3-已收货 4-已关闭")
+    private Integer ltStatus;
+
+    @ApiModelProperty("大于指定状态值：1-待收货 2-部分收货 3-已收货 4-已关闭")
+    private Integer gtStatus;
+
+    @ApiModelProperty(name = "开始时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date createStartTime;
+
+    @ApiModelProperty(name = "结束时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date createEndTime;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigetionMaterialDTO.java

@@ -0,0 +1,67 @@
+package com.mhd.wms.interfaces.dto.investigationManage;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.investigetionManageDetail.repository.po.InvestigetionManageDetailPO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 拣货单库位与物料明细中间关系对象 task_picking_storage_material
+ *
+ * @author gen
+ * @date 2024-07-13
+ */
+
+@Data
+public class InvestigetionMaterialDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("盈亏数量")
+    @Excel(name = "盈亏数量")
+    private BigDecimal profitLossQuantity;
+
+    @ApiModelProperty("盘点状态: 1-待盘点 2-盘亏 3-正常 4-盘盈")
+    @Excel(name = "盘点状态: 1-待盘点 2-盘亏 3-正常 4-盘盈")
+    private Integer investigationStatus;
+
+    @ApiModelProperty("盘点单物料详情")
+    private List<InvestigetionManageDetailPO> investigetionManageDetailList;
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigationManage/InvestigetionStorageDTO.java

@@ -0,0 +1,79 @@
+package com.mhd.wms.interfaces.dto.investigationManage;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.investigetionManageDetail.InvestigetionManageDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 拣货单库位与物料明细中间关系对象 task_picking_storage_material
+ *
+ * @author gen
+ * @date 2024-07-13
+ */
+
+@Data
+public class InvestigetionStorageDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("盘盈数量")
+    @Excel(name = "盘盈数量")
+    private BigDecimal investigationProfitQuantity;
+
+    @ApiModelProperty("盘亏数量")
+    @Excel(name = "盘亏数量")
+    private BigDecimal investigationLossQuantity;
+
+    @ApiModelProperty("盘点状态: 1-待盘点 2-已盘点")
+    @Excel(name = "盘点状态: 1-待盘点 2-已盘点")
+    private Integer investigationStatus;
+
+    @ApiModelProperty("盘点单物料详情")
+    private List<InvestigetionManageDetailDTO> investigetionManageDetailList;
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/investigetionManageDetail/InvestigetionManageDetailDTO.java

@@ -0,0 +1,215 @@
+package com.mhd.wms.interfaces.dto.investigetionManageDetail;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 盘点详情管理对象 investigetion_manage_detail
+ *
+ * @author gen
+ * @date 2024-07-10
+ */
+
+@Data
+public class InvestigetionManageDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("盘点详情id")
+    private Long investigationManageDetailId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("盘点单号")
+    @Excel(name = "盘点单号")
+    private String investigationNumber;
+
+@ApiModelProperty("盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    @Excel(name = "盘点状态: 1.已创建 2.待盘点 3.盘点中 4.盘点完成")
+    private Integer investigationStatus;
+
+    @ApiModelProperty("盘点范围")
+    @Excel(name = "盘点范围")
+    private String investigationRange;
+
+    @ApiModelProperty("盘点方式：1.明盘 2.盲盘")
+    @Excel(name = "盘点方式：1.明盘 2.盲盘")
+    private Integer investigationType;
+
+    @ApiModelProperty("盘点方法：1.静态盘点 2.动态盘点")
+    @Excel(name = "盘点方法：1.静态盘点 2.动态盘点")
+    private Integer investigationMethod;
+
+    @ApiModelProperty("盘点轮次：1.初盘 2.复盘")
+    @Excel(name = "盘点轮次：1.初盘 2.复盘")
+    private Integer investigationFrequency;
+
+    @ApiModelProperty("差异单号")
+    @Excel(name = "差异单号")
+    private String differentNumber;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long investigationManBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String investigationManName;
+
+    @ApiModelProperty("盘点数量")
+    @Excel(name = "盘点数量")
+    private BigDecimal investigationQuantity;
+
+    @ApiModelProperty("差异数量")
+    @Excel(name = "差异数量")
+    private BigDecimal differentQuantity;
+
+    @ApiModelProperty("盘点结果：1.盘盈 2.盘亏 3.正常")
+    @Excel(name = "盘点结果：1.盘盈 2.盘亏 3.正常")
+    private Integer investigationResult;
+
+    @ApiModelProperty("物料库存id")
+    @Excel(name = "物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitNumber;
+
+    @ApiModelProperty("物料仓库控制信息id")
+    @Excel(name = "物料仓库控制信息id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("是否序列号管理: 1-否 2-是")
+    @Excel(name = "是否序列号管理: 1-否 2-是")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("作业数量：盘点数量")
+    @Excel(name = "作业数量：盘点数量")
+    private BigDecimal actualQuantity;
+
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBarCode/MaterialBarCodeDTO.java

@@ -0,0 +1,78 @@
+package com.mhd.wms.interfaces.dto.materialBarCode;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 物料条码信息对象 material_bar_code
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialBarCodeDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品规则id")
+    private Long materialBarCodeId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("条码")
+    @Excel(name = "条码")
+    private String barCode;
+
+    @ApiModelProperty("包装id")
+    @Excel(name = "包装id")
+    private Long packId;
+
+    @ApiModelProperty("包装编码")
+    @Excel(name = "包装编码")
+    private String packCode;
+
+    @ApiModelProperty("包装名称")
+    @Excel(name = "包装名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("名称")
+    @Excel(name = "名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseDTO.java

@@ -0,0 +1,61 @@
+package com.mhd.wms.interfaces.dto.materialBaseInfo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.handler.ListTypeHandler;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author ZhouGY
+ * @title MaterialBaseDO
+ * @description: TODO
+ * @date 2024/7/5 10:59
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaterialBaseDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("物料分类编码")
+    @Excel(name = "物料分类编码")
+    @TableField(typeHandler = ListTypeHandler.class)
+    private List<String> materialClassifyCode;
+
+    @ApiModelProperty("物料分类名称")
+    @Excel(name = "物料分类名称")
+    @TableField(typeHandler = ListTypeHandler.class)
+    private List<String> materialClassifyName;
+
+    @ApiModelProperty("物料种类编码 数据字典")
+    @Excel(name = "物料种类编码 数据字典")
+    private String materialType;
+
+    @ApiModelProperty("物料种类名称 数据字典")
+    @Excel(name = "物料种类名称 数据字典")
+    private String materialTypeName;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -0,0 +1,193 @@
+package com.mhd.wms.interfaces.dto.materialBaseInfo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.handler.ListTypeHandler;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.materialGoodsRule.repository.todo.MaterialGoodsRuleDO;
+import com.mhd.wms.interfaces.dto.materialBarCode.MaterialBarCodeDTO;
+import com.mhd.wms.interfaces.dto.materialCommon.MaterialCommonDTO;
+import com.mhd.wms.interfaces.dto.materialInventoryWarning.MaterialInventoryWarningDTO;
+import com.mhd.wms.interfaces.dto.materialWarehouseControl.MaterialWarehouseControlDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料基础信息对象 material_base_info
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialBaseInfoDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("物料分类编码")
+    @Excel(name = "物料分类编码")
+    @TableField(typeHandler = ListTypeHandler.class)
+    private List<String> materialClassifyCode;
+
+    @ApiModelProperty("物料分类名称")
+    @Excel(name = "物料分类名称")
+    @TableField(typeHandler = ListTypeHandler.class)
+    private List<String> materialClassifyName;
+
+    @ApiModelProperty("物料种类编码 数据字典")
+    @Excel(name = "物料种类编码 数据字典")
+    private String materialType;
+
+    @ApiModelProperty("物料种类名称 数据字典")
+    @Excel(name = "物料种类名称 数据字典")
+    private String materialTypeName;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装单位编码")
+    @Excel(name = "包装单位编码")
+    private String unitCode;
+
+    @ApiModelProperty("包装单位名称")
+    @Excel(name = "包装单位名称")
+    private String unitName;
+
+    @ApiModelProperty("品牌id")
+    @Excel(name = "品牌id")
+    private Long brandId;
+
+    @ApiModelProperty("品牌编码")
+    @Excel(name = "品牌编码")
+    private String brandCode;
+
+    @ApiModelProperty("品牌名称")
+    @Excel(name = "品牌名称")
+    private String brandName;
+
+    @ApiModelProperty("保质期 单位：天")
+    @Excel(name = "保质期 单位：天")
+    private Long shelfLife;
+
+    @ApiModelProperty("净重 单位：千克")
+    @Excel(name = "净重 单位：千克")
+    private BigDecimal weightLimit;
+
+    @ApiModelProperty("体积 单位：立方米")
+    @Excel(name = "体积 单位：立方米")
+    private BigDecimal volumeLimit;
+
+    @ApiModelProperty("商品形态编码 数据字典")
+    @Excel(name = "商品形态编码 数据字典")
+    private String materialShape;
+
+    @ApiModelProperty("商品形态名称 数据字典")
+    @Excel(name = "商品形态名称 数据字典")
+    private String materialShapeName;
+
+    @ApiModelProperty("物料大小 长*宽*高 单位：米")
+    @Excel(name = "物料大小 长*宽*高 单位：米")
+    private String materialSize;
+
+    @ApiModelProperty("物料大小-长 单位：米")
+    @Excel(name = "物料大小-长 单位：米")
+    private BigDecimal materialLength;
+
+    @ApiModelProperty("物料大小-宽 单位：米")
+    @Excel(name = "物料大小-宽 单位：米")
+    private BigDecimal materialWidth;
+
+    @ApiModelProperty("物料大小-高 单位：米")
+    @Excel(name = "物料大小-高 单位：米")
+    private BigDecimal materialHeight;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty("是否作废: 1-是 2-否")
+    @Excel(name = "是否作废: 1-是 2-否")
+    private Integer nullify;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("商品规则")
+    private MaterialGoodsRuleDO materialGoodsRule;
+
+    @ApiModelProperty("公共信息")
+    private MaterialCommonDTO materialCommon;
+
+    @ApiModelProperty("仓库控制信息")
+    private MaterialWarehouseControlDTO materialWarehouseControl;
+
+    @ApiModelProperty("库存预警信息")
+    private List<MaterialInventoryWarningDTO> materialInventoryWarningList;
+
+    @ApiModelProperty("条码信息")
+    private List<MaterialBarCodeDTO> materialBarCodeList;
+
+    @ApiModelProperty("复合条件查询 物料名称 物料编码 物料条码")
+    private String compoundOrQuery;
+
+    @ApiModelProperty("feign 是否是修改: 1-是 2-否")
+    private Integer updateFeign;
+
+    @ApiModelProperty("是否公用: 1-是 2-否")
+    @Excel(name = "是否公用: 1-是 2-否")
+    private Integer common;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialCommon/MaterialCommonDTO.java

@@ -0,0 +1,103 @@
+package com.mhd.wms.interfaces.dto.materialCommon;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 物料公共信息对象 material_common
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialCommonDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品规则id")
+    private Long materialCommonId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("是否温控: 1-是 2-否")
+    @Excel(name = "是否温控: 1-是 2-否")
+    private Integer temperatureControl;
+
+    @ApiModelProperty("最低温度")
+    @Excel(name = "最低温度")
+    private BigDecimal minTemperature;
+
+    @ApiModelProperty("最高温度")
+    @Excel(name = "最高温度")
+    private BigDecimal maxTemperature;
+
+    @ApiModelProperty("商品温层编码")
+    @Excel(name = "商品温层编码")
+    private String warmLayer;
+
+    @ApiModelProperty("商品温层名称")
+    @Excel(name = "商品温层名称")
+    private String warmLayerName;
+
+    @ApiModelProperty("闪点")
+    @Excel(name = "闪点")
+    private String flashPoint;
+
+    @ApiModelProperty("燃点")
+    @Excel(name = "燃点")
+    private String ignitionPoint;
+
+    @ApiModelProperty("是否危险品: 1-是 2-否")
+    @Excel(name = "是否危险品: 1-是 2-否")
+    private Integer dangerGoods;
+
+    @ApiModelProperty("危险品等级编码")
+    @Excel(name = "危险品等级编码")
+    private String dangerLevel;
+
+    @ApiModelProperty("危险品等级名称")
+    @Excel(name = "危险品等级名称")
+    private String dangerLevelName;
+
+    @ApiModelProperty("生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date productionTime;
+
+    @ApiModelProperty("失效日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expirationTime;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialGoodsRule/MaterialGoodsRuleDTO.java

@@ -0,0 +1,134 @@
+package com.mhd.wms.interfaces.dto.materialGoodsRule;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 物料商品规则对象 material_goods_rule
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialGoodsRuleDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品规则id")
+    private Long materialGoodsRuleId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("批次id")
+    @Excel(name = "批次id")
+    private Long batchId;
+
+    @ApiModelProperty("批次编码")
+    @Excel(name = "批次编码")
+    private String batchCode;
+
+    @ApiModelProperty("批次名称")
+    @Excel(name = "批次名称")
+    private String batchName;
+
+    @ApiModelProperty("上架库区id")
+    @Excel(name = "上架库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("上架库区编码")
+    @Excel(name = "上架库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("上架库区名称")
+    @Excel(name = "上架库区名称")
+    private String storageName;
+
+    @ApiModelProperty("上架库位id")
+    @Excel(name = "上架库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("上架库位编码")
+    @Excel(name = "上架库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("上架库位名称")
+    @Excel(name = "上架库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("上架规则id")
+    @Excel(name = "上架规则id")
+    private Long ruleId;
+
+    @ApiModelProperty("上架规则编码")
+    @Excel(name = "上架规则编码")
+    private String ruleCode;
+
+    @ApiModelProperty("上架规则名称")
+    @Excel(name = "上架规则名称")
+    private String ruleName;
+
+    @ApiModelProperty("上架库位指定规则id")
+    @Excel(name = "上架库位指定规则id")
+    private Long specifyRuleId;
+
+    @ApiModelProperty("上架库位指定规则编码")
+    @Excel(name = "上架库位指定规则编码")
+    private String specifyRuleCode;
+
+    @ApiModelProperty("上架库位指定规则名称")
+    @Excel(name = "上架库位指定规则名称")
+    private String specifyRuleName;
+
+    @ApiModelProperty("周转规则id")
+    @Excel(name = "周转规则id")
+    private Long turnoverRuleId;
+
+    @ApiModelProperty("周转规则编码")
+    @Excel(name = "周转规则编码")
+    private String turnoverRuleCode;
+
+    @ApiModelProperty("周转规则名称")
+    @Excel(name = "周转规则名称")
+    private String turnoverRuleName;
+
+    @ApiModelProperty("分配规则id")
+    @Excel(name = "分配规则id")
+    private Long distributeRuleId;
+
+    @ApiModelProperty("分配规则编码")
+    @Excel(name = "分配规则编码")
+    private String distributeRuleCode;
+
+    @ApiModelProperty("分配规则名称")
+    @Excel(name = "分配规则名称")
+    private String distributeRuleName;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java

@@ -0,0 +1,147 @@
+package com.mhd.wms.interfaces.dto.materialInventory;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.wms.interfaces.dto.materialBaseInfo.MaterialBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料库存对象 material_inventory
+ *
+ * @author gen
+ * @date 2024-05-29
+ */
+
+@Data
+public class MaterialInventoryDTO extends MaterialBaseDTO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("上架单物料明细id")
+    @Excel(name = "上架单物料明细id")
+    private Long materialDetailId;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料状态编码")
+    @Excel(name = "物料状态编码")
+    private String materialStatusCode;
+
+    @ApiModelProperty("物料状态名称")
+    @Excel(name = "物料状态名称")
+    private String materialStatusName;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("可用数量")
+    @Excel(name = "可用数量")
+    private BigDecimal allocationQuantity;
+
+    @ApiModelProperty("冻结数量")
+    @Excel(name = "冻结数量")
+    private BigDecimal freezeQuantity;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("盘点是否可用：0-禁用 1-可用")
+    @Excel(name = "盘点是否可用：0-禁用 1-可用")
+    private Integer isAble;
+
+    @ApiModelProperty("货主信息")
+    @Excel(name = "货主信息")
+    private String shipperInfo;
+
+    @ApiModelProperty("物料信息")
+    @Excel(name = "物料信息")
+    private String materialInfo;
+
+    @ApiModelProperty("物料/库位信息")
+    @Excel(name = "物料/库位信息")
+    private String storageInfo;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryQueryListDTO.java

@@ -0,0 +1,171 @@
+package com.mhd.wms.interfaces.dto.materialInventory;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.wms.interfaces.dto.materialBaseInfo.MaterialBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料库存对象 material_inventory
+ *
+ * @author gen
+ * @date 2024-05-29
+ */
+
+@Data
+public class MaterialInventoryQueryListDTO extends MaterialBaseDTO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料状态编码")
+    @Excel(name = "物料状态编码")
+    private String materialStatusCode;
+
+    @ApiModelProperty("物料状态名称")
+    @Excel(name = "物料状态名称")
+    private String materialStatusName;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("可用数量")
+    @Excel(name = "可用数量")
+    private BigDecimal allocationQuantity;
+
+    @ApiModelProperty("冻结数量")
+    @Excel(name = "冻结数量")
+    private BigDecimal freezeQuantity;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("盘点是否可用：0-禁用 1-可用")
+    @Excel(name = "盘点是否可用：0-禁用 1-可用")
+    private Integer isAble;
+
+    @ApiModelProperty("查询类型 0-全部查询 1-按货主查询 2-按物料查询 3-按批次查询 4-按库位查询 5-按物料/库位查询 6-按容器查询")
+    @Excel(name = "查询类型 0-全部查询 1-按货主查询 2-按物料查询 3-按批次查询 4-按库位查询 5-按物料/库位查询 6-按容器查询")
+    private Integer queryType;
+
+    @ApiModelProperty("货主信息")
+    @Excel(name = "货主信息")
+    private String shipperInfo;
+
+    @ApiModelProperty("物料信息")
+    @Excel(name = "物料信息")
+    private String materialInfo;
+
+    @ApiModelProperty("物料/库位信息")
+    @Excel(name = "物料/库位信息")
+    private String storageInfo;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventoryWarning/MaterialInventoryWarningDTO.java

@@ -0,0 +1,119 @@
+package com.mhd.wms.interfaces.dto.materialInventoryWarning;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料库存预警对象 material_inventory_warning
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialInventoryWarningDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品规则id")
+    private Long materialInventoryWarningId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("库位下限")
+    @Excel(name = "库位下限")
+    private BigDecimal minTemperature;
+
+    @ApiModelProperty("库位上限")
+    @Excel(name = "库位上限")
+    private BigDecimal maxTemperature;
+
+    @ApiModelProperty("包装id")
+    @Excel(name = "包装id")
+    private Long packId;
+
+    @ApiModelProperty("包装编码")
+    @Excel(name = "包装编码")
+    private String packCode;
+
+    @ApiModelProperty("包装名称")
+    @Excel(name = "包装名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("名称")
+    @Excel(name = "名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialMoreDetail/MaterialMoreDetailDTO.java

@@ -0,0 +1,82 @@
+package com.mhd.wms.interfaces.dto.materialMoreDetail;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 物料更多属性明细对象 material_more_detail
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class MaterialMoreDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料更多属性明细id")
+    private Long materialMoreDetailId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String orderNumber;
+
+    @ApiModelProperty("订单物料明细业务唯一id")
+    @Excel(name = "订单物料明细业务唯一id")
+    private Long materialDetailUniqueId;
+
+    @ApiModelProperty("批次id")
+    @Excel(name = "批次id")
+    private Long batchId;
+
+    @ApiModelProperty("批次详情id")
+    @Excel(name = "批次详情id")
+    private Long batchDetailId;
+
+    @ApiModelProperty("批次标签")
+    @Excel(name = "批次标签")
+    private String batchLabels;
+
+    @ApiModelProperty("输入控制: 1-必填 2-可选")
+    @Excel(name = "输入控制: 1-必填 2-可选")
+    private String inputControl;
+
+    @ApiModelProperty("属性格式：1-下拉框 2-日期 3-日期时间 4-数字 5-文本")
+    @Excel(name = "属性格式：1-下拉框 2-日期 3-日期时间 4-数字 5-文本")
+    private String attributeFormat;
+
+    @ApiModelProperty("属性选项")
+    @Excel(name = "属性选项")
+    private String attributeOption;
+
+    @ApiModelProperty("属性值")
+    @Excel(name = "属性值")
+    private String attributeValue;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialWarehouseControl/MaterialWarehouseControlDTO.java

@@ -0,0 +1,99 @@
+package com.mhd.wms.interfaces.dto.materialWarehouseControl;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 仓库控制信息对象 material_warehouse_control
+ *
+ * @author gen
+ * @date 2024-05-07
+ */
+
+@Data
+public class MaterialWarehouseControlDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("商品规则id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("是否效期控制: 1-是 2-否")
+    @Excel(name = "是否效期控制: 1-是 2-否")
+    private Integer temperatureControl;
+
+    @ApiModelProperty("周期类型: 1-生产日期 2-失效日期")
+    @Excel(name = "周期类型: 1-生产日期 2-失效日期")
+    private Integer cycleType;
+
+    @ApiModelProperty("入库效期 单位：天")
+    @Excel(name = "入库效期 单位：天")
+    private Integer inValidityPeriod;
+
+    @ApiModelProperty("入库效期 单位：天")
+    @Excel(name = "入库效期 单位：天")
+    private Integer outValidityPeriod;
+
+    @ApiModelProperty("是否允许超收: 1-是 2-否")
+    @Excel(name = "是否允许超收: 1-是 2-否")
+    private Integer allowOvercharge;
+
+    @ApiModelProperty("超收比例")
+    @Excel(name = "超收比例")
+    private BigDecimal overchargeRatio;
+
+    @ApiModelProperty("ABC分类：A-A类 B-B类 C-C类")
+    @Excel(name = "ABC分类：A-A类 B-B类 C-C类")
+    private String classify;
+
+    @ApiModelProperty("是否序列号管理: 1-是 2-否")
+    @Excel(name = "是否序列号管理: 1-是 2-否")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("是否质检管理: 1-是 2-否")
+    @Excel(name = "是否质检管理: 1-是 2-否")
+    private Integer qualityInspectionManage;
+
+    @ApiModelProperty("质检阶段: 1-收货前 2-收货后上架前")
+    @Excel(name = "质检阶段: 1-收货前 2-收货后上架前")
+    private Integer qualityInspectionStage;
+
+    @ApiModelProperty("质检规则: 1-全检 2-抽检 ")
+    @Excel(name = "质检规则: 1-全检 2-抽检 ")
+    private Integer qualityInspectionRule;
+
+    @ApiModelProperty("质检项: 1-包装 2-纯度")
+    @Excel(name = "质检项: 1-包装 2-纯度")
+    private Integer qualityInspectionTerm;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManage/MobilizeManageDTO.java

@@ -0,0 +1,153 @@
+package com.mhd.wms.interfaces.dto.mobilizeManage;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.mobilizeManageDetail.repository.todo.MobilizeManageDetailDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 调拨管理对象 mobilize_manage
+ *
+ * @author gen
+ * @date 2024-07-19
+ */
+
+@Data
+public class MobilizeManageDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("调拨管理id")
+    private Long mobilizeManageId;
+
+    @ApiModelProperty("调拨管理id")
+    private List<Long> mobilizeManageIds;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("调拨数量")
+    @Excel(name = "调拨数量")
+    private BigDecimal mobilizeNumber;
+
+    @ApiModelProperty("调拨单号")
+    @Excel(name = "调拨单号")
+    private String mobilizeCode;
+
+    @ApiModelProperty("调拨状态:1-已创建 2-待调拨 3-已完成")
+    @Excel(name = "调拨状态:1-已创建 2-待调拨 3-已完成")
+    private Integer mobilizeStatus;
+
+    @ApiModelProperty("调拨物料种数")
+    @Excel(name = "调拨物料种数")
+    private Long mobilizeMaterialQuantity;
+
+    @ApiModelProperty("物料种数")
+    @Excel(name = "物料种数")
+    private Integer materialTypeQuantity;
+
+    @ApiModelProperty("调入仓库id")
+    @Excel(name = "调入仓库id")
+    private Long inWarehouseId;
+
+    @ApiModelProperty("调入仓库编码")
+    @Excel(name = "调入仓库编码")
+    private String inWarehouseCode;
+
+    @ApiModelProperty("调入仓库名称")
+    @Excel(name = "调入仓库名称")
+    private String inWarehouseName;
+
+    @ApiModelProperty("调拨审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "调拨审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer auditStatus;
+
+    @ApiModelProperty("调拨审核备注")
+    @Excel(name = "调拨审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty("调拨审核人")
+    @Excel(name = "调拨审核人")
+    private Long auditBy;
+
+    @ApiModelProperty("调拨审核人姓名")
+    @Excel(name = "调拨审核人姓名")
+    private String auditByName;
+
+    @ApiModelProperty("调拨审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调拨审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditTime;
+
+    @ApiModelProperty("任务是否下发: 1-是 2-否")
+    @Excel(name = "任务是否下发: 1-是 2-否")
+    private Integer taskDistribution;
+
+    @ApiModelProperty("任务下发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date taskDistributionTime;
+
+    @ApiModelProperty("作业人用户ID")
+    @Excel(name = "作业人用户ID")
+    private Long operatorsBy;
+
+    @ApiModelProperty("作业人姓名")
+    @Excel(name = "作业人姓名")
+    private String operatorsName;
+
+    @ApiModelProperty("是否作废: 1-否 2-是")
+    @Excel(name = "是否作废: 1-否 2-是")
+    private Integer nullify;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty("调出仓库id")
+    @Excel(name = "调出仓库id")
+    private Long outWarehouseId;
+
+    @ApiModelProperty("调出仓库编码")
+    @Excel(name = "调出仓库编码")
+    private String outWarehouseCode;
+
+    @ApiModelProperty("调出仓库名称")
+    @Excel(name = "调出仓库名称")
+    private String outWarehouseName;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty(name = "调拨管理详情list")
+    private List<MobilizeManageDetailDO> mobilizeManageDetailDOList;
+
+    @ApiModelProperty(name = "调拨类型")
+    private String mobilizeType;
+
+    @ApiModelProperty(name = "调拨类型编码")
+    private String mobilizeTypeCode;
+
+    @ApiModelProperty("调拨申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "调拨申请日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date mobilizeApplicationDate;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/mobilizeManageDetail/MobilizeManageDetailDTO.java

@@ -0,0 +1,178 @@
+package com.mhd.wms.interfaces.dto.mobilizeManageDetail;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 调拨管理详情对象 mobilize_manage_detail
+ *
+ * @author gen
+ * @date 2024-07-08
+ */
+
+@Data
+public class MobilizeManageDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("调拨单详情id")
+    private Long mobilizeMaterialDetailId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("业务唯一id")
+    @Excel(name = "业务唯一id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long uniqueId;
+
+    @ApiModelProperty("调拨单号")
+    @Excel(name = "调拨单号")
+    private String mobilizeCode;
+
+    @ApiModelProperty("调拨状态:1-已创建 2-待调拨 3-已完成")
+    @Excel(name = "调拨状态:1-已创建 2-待调拨 3-已完成")
+    private Integer mobilizeStatus;
+
+    @ApiModelProperty("调拨数量")
+    @Excel(name = "调拨数量")
+    private BigDecimal mobilizeNumber;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitNumber;
+
+    @ApiModelProperty("物料仓库控制信息id")
+    @Excel(name = "物料仓库控制信息id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("是否序列号管理: 1-否 2-是")
+    @Excel(name = "是否序列号管理: 1-否 2-是")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/noticeMaterialDetail/NoticeMaterialDetailDTO.java

@@ -0,0 +1,146 @@
+package com.mhd.wms.interfaces.dto.noticeMaterialDetail;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料明细对象 notice_material_detail
+ *
+ * @author gen
+ * @date 2024-06-17
+ */
+
+@Data
+public class NoticeMaterialDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("订单物料明细id")
+    private Long noticeMaterialDetailId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("业务唯一id")
+    @Excel(name = "业务唯一id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long uniqueId;
+
+    @ApiModelProperty("通知单号")
+    @Excel(name = "通知单号")
+    private String noticeNumber;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitNumber;
+
+    @ApiModelProperty("物料仓库控制信息id")
+    @Excel(name = "物料仓库控制信息id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("是否序列号管理: 1-是 2-否")
+    @Excel(name = "是否序列号管理: 1-是 2-否")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("是否质检管理: 1-是 2-否")
+    @Excel(name = "是否质检管理: 1-是 2-否")
+    private Integer qualityInspectionManage;
+
+    @ApiModelProperty("质检阶段: 1-收货前 2-收货后上架前")
+    @Excel(name = "质检阶段: 1-收货前 2-收货后上架前")
+    private Integer qualityInspectionStage;
+
+    @ApiModelProperty("质检规则: 1-目检 2-抽检")
+    @Excel(name = "质检规则: 1-目检 2-抽检")
+    private Integer qualityInspectionRule;
+
+    @ApiModelProperty("抽检比例")
+    @Excel(name = "抽检比例")
+    private BigDecimal qualityInspectionRatio;
+
+    @ApiModelProperty("质检项: 1-包装 2-纯度")
+    @Excel(name = "质检项: 1-包装 2-纯度")
+    private Integer qualityInspectionTerm;
+
+    @ApiModelProperty("质检结果: 1-正常 2-异常")
+    @Excel(name = "质检结果: 1-正常 2-异常")
+    private Integer qualityInspectionResults;
+
+    @ApiModelProperty("是否允许超收: 1-是 2-否")
+    @Excel(name = "是否允许超收: 1-是 2-否")
+    private Integer allowOvercharge;
+
+    @ApiModelProperty("超收比例")
+    @Excel(name = "超收比例")
+    private BigDecimal overchargeRatio;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/noticeOrder/NoticeOrderDTO.java

@@ -0,0 +1,143 @@
+package com.mhd.wms.interfaces.dto.noticeOrder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.noticeMaterialDetail.NoticeMaterialDetailDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 入库通知单对象 stock_receipt_notice
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class NoticeOrderDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("通知单id")
+    private Long noticeId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("客户订单号")
+    @Excel(name = "客户订单号")
+    private String customerOrderNumber;
+
+    @ApiModelProperty("类型: 1-入库通知单 2-出库通知单")
+    @Excel(name = "类型: 1-入库通知单 2-出库通知单")
+    private Integer type;
+
+    @ApiModelProperty("状态: 1-未生成 2-已生成")
+    @Excel(name = "状态: 1-未生成 2-已生成")
+    private Integer status;
+
+    @ApiModelProperty("通知单号")
+    @Excel(name = "通知单号")
+    private String noticeNumber;
+
+    @ApiModelProperty("订单号")
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("入库单类型编码")
+    @Excel(name = "入库单类型编码")
+    private String orderTypeCode;
+
+    @ApiModelProperty("入库单类型名称")
+    @Excel(name = "入库单类型名称")
+    private String orderTypeName;
+
+    @ApiModelProperty("供应商id")
+    @Excel(name = "供应商id")
+    private Long supplierId;
+
+    @ApiModelProperty("供应商编码")
+    @Excel(name = "供应商编码")
+    private String supplierCode;
+
+    @ApiModelProperty("供应商名称")
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty("预计入/出货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计入/出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expectTime;
+
+    @ApiModelProperty("供应链订单号")
+    @Excel(name = "供应链订单号")
+    private String supplyChainNumber;
+
+    @ApiModelProperty("是否作废: 1-是 2-否")
+    @Excel(name = "是否作废: 1-是 2-否")
+    private Integer nullify;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("物料明细")
+    List<NoticeMaterialDetailDTO> materialDetailList;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java

@@ -0,0 +1,239 @@
+package com.mhd.wms.interfaces.dto.outMaterialDetail;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.interfaces.dto.outMaterialDetailSerialNumber.OutMaterialDetailSerialNumberDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 物料明细对象 material_detail
+ *
+ * @author gen
+ * @date 2024-05-21
+ */
+
+@Data
+public class OutMaterialDetailDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("订单物料明细id")
+    private Long materialDetailId;
+
+    @ApiModelProperty("业务唯一id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long uniqueId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+
+    @ApiModelProperty("已分配数量")
+    @Excel(name = "已分配数量")
+    private BigDecimal alreadyAllocationQuantity;
+
+    @ApiModelProperty("分配数量")
+    @Excel(name = "分配数量")
+    private BigDecimal allocationQuantity;
+
+    @ApiModelProperty("拣货数量")
+    @Excel(name = "拣货数量")
+    private BigDecimal pickingQuantity;
+
+    @ApiModelProperty("复核数量")
+    @Excel(name = "复核数量")
+    private BigDecimal checkQuantity;
+
+    @ApiModelProperty("作业数量（例如：分配数量 拣货数量 复核数量）")
+    @Excel(name = "作业数量（例如：分配数量 拣货数量 复核数量）")
+    private BigDecimal actualQuantity;
+
+    @ApiModelProperty("净重 单位：千克")
+    @Excel(name = "净重 单位：千克")
+    private BigDecimal weightLimit;
+
+    @ApiModelProperty("体积 单位：立方米")
+    @Excel(name = "体积 单位：立方米")
+    private BigDecimal volumeLimit;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private Long packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private Long packDetailId;
+
+    @ApiModelProperty("单位代码：EA IP CS PL OT")
+    @Excel(name = "单位代码：EA IP CS PL OT")
+    private String unitCode;
+
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty("单位数量")
+    @Excel(name = "单位数量")
+    private BigDecimal unitNumber;
+
+    @ApiModelProperty("物料仓库控制信息id")
+    @Excel(name = "物料仓库控制信息id")
+    private Long materialWarehouseControlId;
+
+    @ApiModelProperty("是否序列号管理: 1-是 2-否")
+    @Excel(name = "是否序列号管理: 1-是 2-否")
+    private Integer serialNumberManage;
+
+    @ApiModelProperty("物料库存id")
+    @Excel(name = "物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料状态编码")
+    @Excel(name = "物料状态编码")
+    private String materialStatusCode;
+
+    @ApiModelProperty("物料状态名称")
+    @Excel(name = "物料状态名称")
+    private String materialStatusName;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("分配仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("分配仓库编码")
+    @Excel(name = "分配仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("分配库区id")
+    @Excel(name = "分配库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("分配库区编码")
+    @Excel(name = "分配库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("分配库区名称")
+    @Excel(name = "分配库区名称")
+    private String storageName;
+
+    @ApiModelProperty("分配库位id")
+    @Excel(name = "分配库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("分配库位编码")
+    @Excel(name = "分配库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("分配库位名称")
+    @Excel(name = "分配库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("层级深度，从一级开始递增")
+    private Integer level;
+
+    @ApiModelProperty("父级唯一Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentUniqueId;
+
+    @ApiModelProperty("是否允许修改: 1-是 2-否 分配后 不再支持修改")
+    @Excel(name = "是否允许修改: 1-是 2-否")
+    private Integer allowModify;
+
+    @ApiModelProperty("是否生成拣货单: 1-是 2-否")
+    @Excel(name = "是否生成拣货单: 1-是 2-否")
+    private Integer genPickingOrder;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("物料明细子集")
+    private List<OutMaterialDetailDTO> materialDetailList;
+
+    @ApiModelProperty("序列号")
+    private List<OutMaterialDetailSerialNumberDTO> materialDetailSerialNumberList;
+
+    @ApiModelProperty("出单号集合")
+    @Excel(name = "出单号集合")
+    private List<String> outOrderNumberList;
+
+    @ApiModelProperty("取消分配数量")
+    @Excel(name = "取消分配数量")
+    private BigDecimal cancelAllocationQuantity;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetailSerialNumber/OutMaterialDetailSerialNumberDTO.java

@@ -0,0 +1,62 @@
+package com.mhd.wms.interfaces.dto.outMaterialDetailSerialNumber;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 出库单物料明细序列号对象 out_material_detail_serial_number
+ *
+ * @author gen
+ * @date 2024-06-03
+ */
+
+@Data
+public class OutMaterialDetailSerialNumberDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("出库单物料明细序列号id")
+    private Long outMaterialDetailSerialNumberId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("来源单号")
+    @Excel(name = "来源单号")
+    private String orderNumber;
+
+    @ApiModelProperty("来源物料明细id")
+    @Excel(name = "来源物料明细id")
+    private Long materialDetailUniqueId;
+
+    @ApiModelProperty("类型：1-拣货序列号")
+    @Excel(name = "类型：1-拣货序列号")
+    private Integer type;
+
+    @ApiModelProperty("序列号")
+    @Excel(name = "序列号")
+    private String serialNumber;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outOrderAbnormal/OutOrderAbnormalDTO.java

@@ -0,0 +1,87 @@
+package com.mhd.wms.interfaces.dto.outOrderAbnormal;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 出库异常单对象 out_order_abnormal
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+
+@Data
+public class OutOrderAbnormalDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("出库异常单id")
+    private Long outOrderAbnormalId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("异常单号")
+    @Excel(name = "异常单号")
+    private String abnormalNumber;
+
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("拣货单号")
+    @Excel(name = "拣货单号")
+    private String pickingOrderNumber;
+
+    @ApiModelProperty("拣货作业单号")
+    @Excel(name = "拣货作业单号")
+    private String outTaskOrderNumber;
+
+    @ApiModelProperty("类型：1-拣货 2-复核")
+    @Excel(name = "类型：1-拣货 2-复核")
+    private Integer type;
+
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("作业数量")
+    @Excel(name = "作业数量")
+    private BigDecimal actualQuantity;
+
+    @ApiModelProperty("异常数量 = 作业数量 -  计划数量")
+    @Excel(name = "异常数量 = 作业数量 -  计划数量")
+    private BigDecimal abnormalActualQuantity;
+
+    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常")
+    @Excel(name = "异常类型: 1-拣货异常 2-复核异常")
+    private Integer abnormalType;
+
+    @ApiModelProperty("异常原因")
+    @Excel(name = "异常原因")
+    private String abnormalReason;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/overStock/ExecuteOverStockDTO.java

@@ -0,0 +1,24 @@
+package com.mhd.wms.interfaces.dto.overStock;
+
+import com.mhd.wms.domain.overStock.repository.po.OverStockInOrderOutOrderDetailPO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO 执行越库DTO
+ *
+ * @author lianzj
+ * @version 1.0
+ * @date 2024-07-24 16:49:22
+ */
+@Data
+public class ExecuteOverStockDTO {
+
+    @ApiModelProperty(value = "入库单列表")
+    private List<OverStockInOrderOutOrderDetailPO> inOrderDetailPOList;
+
+    @ApiModelProperty(value = "出库单列表")
+    private List<OverStockInOrderOutOrderDetailPO> outOrderDetailPOList;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/overStock/OverStockDTO.java

@@ -0,0 +1,91 @@
+package com.mhd.wms.interfaces.dto.overStock;
+
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 越库管理对象 over_stock
+ *
+ * @author gen
+ * @date 2024-07-23
+ */
+
+@Data
+public class OverStockDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("越库管理id")
+    private Long overStockId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("物料编码")
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty("越库类型：1-直接越库 2-分拨越库")
+    @Excel(name = "越库类型：1-直接越库 2-分拨越库")
+    private Long type;
+
+    @ApiModelProperty("越库收货状态: 1-已审核 2-部分收货 3-已收货 4-已取消 5-已关闭")
+    @Excel(name = "越库收货状态: 1-已审核 2-部分收货 3-已收货 4-已取消 5-已关闭")
+    private Integer status;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("入库行号")
+    @Excel(name = "入库行号")
+    private String inOrderLine;
+
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("出库行号")
+    @Excel(name = "出库行号")
+    private String outOrderLine;
+
+    @ApiModelProperty("越库数")
+    @Excel(name = "越库数")
+    private BigDecimal overStockNumber;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+}