diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SRMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SRMController.java index 5b8d9a07..87b7d9da 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SRMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SRMController.java @@ -6,10 +6,10 @@ import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nflg.wms.common.pojo.qo.SRMOrderReceiveQO; import com.nflg.wms.common.pojo.qo.SRMQualityInspectionResult; +import com.nflg.wms.repository.entity.WmsInTaskItem; import com.nflg.wms.repository.entity.WmsSrmOrder; import com.nflg.wms.repository.entity.WmsSrmOrderItem; import com.nflg.wms.repository.entity.WmsSrmQualityInspection; -import com.nflg.wms.repository.entity.WmsTaskItem; import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; @@ -43,7 +43,7 @@ public class SRMController extends BaseController { private IWmsSrmQualityInspectionService srmQualityInspectionService; @Resource - private IWmsTaskService taskService; + private IWmsInTaskService taskService; /** * 接收SRM送货单 @@ -93,7 +93,7 @@ public class SRMController extends BaseController { WmsSrmQualityInspection inspect = srmQualityInspectionService.lambdaQuery() .eq(WmsSrmQualityInspection::getInspectionNum, request.getInspectionNum()) .one(); - List tasks = new ArrayList(); + List tasks = new ArrayList(); if (Objects.nonNull(inspect)) { inspect.setFactory(request.getFactory()) .setDeliveryQty(request.getDeliveryQty()) @@ -141,7 +141,7 @@ public class SRMController extends BaseController { result = srmQualityInspectionService.save(inspect) ? 0 : 1; } tasks.add( - new WmsTaskItem().setItemCode(request.getItemCode()) + new WmsInTaskItem().setItemCode(request.getItemCode()) .setItemName(request.getItemName()) .setReceivedWarehouse(request.getReceivedWarehouse()) .setInspectionQty(request.getInspectionQty()) @@ -161,7 +161,7 @@ public class SRMController extends BaseController { ); if (result == 0 && CollectionUtil.isNotEmpty(tasks)) - if (!taskService.generateTask(tasks, "普通物料送货单")) + if (!taskService.generateTask(tasks, (short) 1)) log.error("质检单生成上架任务失败"); return result; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTask.java similarity index 71% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTask.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTask.java index 2a942aca..f5fe96a8 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTask.java @@ -22,9 +22,9 @@ import java.time.LocalDateTime; @Getter @Setter @ToString -@TableName("wms_task") @Accessors(chain = true) -public class WmsTask implements Serializable { +@TableName("wms_in_task") +public class WmsInTask implements Serializable { private static final long serialVersionUID = 1L; @@ -37,9 +37,9 @@ public class WmsTask implements Serializable { private String taskNumber; /** - * 任务来源（普通物料采购收货） + * 1、钢构包送货单 2、普通物料送货单 */ - private String taskFrom; + private Short taskFrom; /** * 任务源单号 @@ -54,5 +54,15 @@ public class WmsTask implements Serializable { /** * 最后一次添加任务单的时间 */ - private LocalDateTime modifyTime; + private LocalDateTime updateTime; + + /** + * 0 待上架 1 上架中 2 已上架 + */ + private Short taskStatus; + + /** + * SAP 同步成功或失败 + */ + private Boolean sapStatus; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTaskItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java similarity index 96% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTaskItem.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java index f622e7cd..1cdb131a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTaskItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java @@ -24,8 +24,8 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -@TableName("wms_task_item") -public class WmsTaskItem implements Serializable { +@TableName("wms_in_task_item") +public class WmsInTaskItem implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceipt.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceipt.java new file mode 100644 index 00000000..18885a99 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceipt.java @@ -0,0 +1,66 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_srm_material_receipt") +public class WmsSrmMaterialReceipt implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 普通物料送货单的详情ID + */ + private Long orderItemId; + + /** + * 收货数量，如果是需要质检的，数量为0 + */ + private BigDecimal receiptNum; + + /** + * 是否质检 + */ + private Boolean isQuality; + + /** + * 越库数量 + */ + private BigDecimal crossNumber; + + /** + * 收货数量 + */ + private LocalDateTime createTime; + + /** + * 收货人编号 + */ + private Integer createUserId; + + /** + * 收货人名称 + */ + private String createUserName; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskItemMapper.java similarity index 60% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskItemMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskItemMapper.java index 2118620b..e4a0a428 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskItemMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskItemMapper.java @@ -1,7 +1,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.WmsTaskItem; +import com.nflg.wms.repository.entity.WmsInTaskItem; /** *

@@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.WmsTaskItem; * @author 代码生成器生成 * @since 2025 */ -public interface WmsTaskItemMapper extends BaseMapper { +public interface WmsInTaskItemMapper extends BaseMapper { } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskMapper.java similarity index 62% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskMapper.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskMapper.java index 913473a6..1aba6dde 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTaskMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInTaskMapper.java @@ -1,7 +1,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.WmsTask; +import com.nflg.wms.repository.entity.WmsInTask; /** *

@@ -11,6 +11,6 @@ import com.nflg.wms.repository.entity.WmsTask; * @author 代码生成器生成 * @since 2025 */ -public interface WmsTaskMapper extends BaseMapper { +public interface WmsInTaskMapper extends BaseMapper { } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmMaterialReceiptMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmMaterialReceiptMapper.java new file mode 100644 index 00000000..d44f3131 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmMaterialReceiptMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsSrmMaterialReceipt; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsSrmMaterialReceiptMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskItemService.java similarity index 56% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskItemService.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskItemService.java index 39808fd7..1f62ee21 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskItemService.java @@ -1,8 +1,10 @@ package com.nflg.wms.repository.service; -import com.nflg.wms.repository.entity.WmsTaskItem; +import com.nflg.wms.repository.entity.WmsInTaskItem; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -11,6 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author 代码生成器生成 * @since 2025 */ -public interface IWmsTaskItemService extends IService { - +public interface IWmsInTaskItemService extends IService { } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskService.java new file mode 100644 index 00000000..1e2ea320 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInTaskService.java @@ -0,0 +1,26 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsInTask; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.repository.entity.WmsInTaskItem; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsInTaskService extends IService { + + /** + * 生成入库任务 + * @param tasks 任务详情 + * @param taskSource 来源 1、钢构包送货单 2、普通物料送货单 + * @return + */ + boolean generateTask(List tasks, short taskSource) ; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmMaterialReceiptService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmMaterialReceiptService.java new file mode 100644 index 00000000..a9d3d17d --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmMaterialReceiptService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsSrmMaterialReceipt; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsSrmMaterialReceiptService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskService.java deleted file mode 100644 index 92998eda..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTaskService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nflg.wms.repository.service; - -import com.nflg.wms.repository.entity.WmsTask; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.repository.entity.WmsTaskItem; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -public interface IWmsTaskService extends IService { - /** - 生成任务单 - */ - boolean generateTask(List tasks, String taskSource); -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskItemServiceImpl.java new file mode 100644 index 00000000..082c9d50 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsInTaskItem; +import com.nflg.wms.repository.mapper.WmsInTaskItemMapper; +import com.nflg.wms.repository.service.IWmsInTaskItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsInTaskItemServiceImpl extends ServiceImpl implements IWmsInTaskItemService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskServiceImpl.java new file mode 100644 index 00000000..e2993044 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInTaskServiceImpl.java @@ -0,0 +1,85 @@ +package com.nflg.wms.repository.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.IdUtil; +import com.nflg.wms.repository.entity.WmsInTask; +import com.nflg.wms.repository.entity.WmsInTaskItem; +import com.nflg.wms.repository.mapper.WmsInTaskMapper; +import com.nflg.wms.repository.service.IWmsInTaskItemService; +import com.nflg.wms.repository.service.IWmsInTaskService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsInTaskServiceImpl extends ServiceImpl implements IWmsInTaskService { + + @Resource + private IWmsInTaskItemService wmsTaskItemService; + + @Override + @Transactional + public boolean generateTask(List tasks, short taskSource) { + boolean result = false; + if (Objects.isNull(tasks) || CollectionUtil.isEmpty(tasks)) { + return result; + } + try { + List newTaskList = new ArrayList(); + List oldTaskList = new ArrayList(); + + tasks.forEach(task -> { + String taskNumber = "SJ-" + task.getNoteNum(); + task.setId(IdUtil.getSnowflake().nextId()); + task.setTaskNumber(taskNumber); + WmsInTask wmsInTask = lambdaQuery().eq(WmsInTask::getTaskNumber, taskNumber).one(); + if (Objects.isNull(wmsInTask)) { + if (!newTaskList.stream().anyMatch(t -> t.getTaskNumber().equals(taskNumber))) { + newTaskList.add(new WmsInTask().setTaskFrom(taskSource) + .setId(IdUtil.getSnowflakeNextId()) + .setTaskNumber(taskNumber) + .setOrderNumber(task.getNoteNum()) + .setCreateTime(LocalDateTime.now()) + .setUpdateTime(LocalDateTime.now()) + ); + } + } else { + if (!oldTaskList.stream().anyMatch(t -> t.getTaskNumber().equals(taskNumber))) { + wmsInTask.setUpdateTime(LocalDateTime.now()); + oldTaskList.add(wmsInTask); + } + } + }); + + if (CollectionUtil.isNotEmpty(newTaskList)) { + result = saveBatch(newTaskList); + } + + if (result && CollectionUtil.isNotEmpty(oldTaskList)) { + result = updateBatchById(oldTaskList); + } + + if (result) { + result = wmsTaskItemService.saveBatch(tasks); + } + } catch (Exception e) { + log.error("生成上架任务失败", e); + } + + return result; + } +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmMaterialReceiptServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmMaterialReceiptServiceImpl.java new file mode 100644 index 00000000..b07eaede --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmMaterialReceiptServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsSrmMaterialReceipt; +import com.nflg.wms.repository.mapper.WmsSrmMaterialReceiptMapper; +import com.nflg.wms.repository.service.IWmsSrmMaterialReceiptService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsSrmMaterialReceiptServiceImpl extends ServiceImpl implements IWmsSrmMaterialReceiptService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskItemServiceImpl.java deleted file mode 100644 index 0c515a7e..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskItemServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import com.nflg.wms.repository.entity.WmsTaskItem; -import com.nflg.wms.repository.mapper.WmsTaskItemMapper; -import com.nflg.wms.repository.service.IWmsTaskItemService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Service -public class WmsTaskItemServiceImpl extends ServiceImpl implements IWmsTaskItemService { - -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskServiceImpl.java deleted file mode 100644 index e6740339..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTaskServiceImpl.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.IdUtil; -import com.nflg.wms.repository.entity.WmsTask; -import com.nflg.wms.repository.entity.WmsTaskItem; -import com.nflg.wms.repository.mapper.WmsTaskMapper; -import com.nflg.wms.repository.service.IWmsTaskItemService; -import com.nflg.wms.repository.service.IWmsTaskService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - *

- * 服务实现类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Service -public class WmsTaskServiceImpl extends ServiceImpl implements IWmsTaskService { - - @Resource - private IWmsTaskItemService wmsTaskItemService; - - @Override - @Transactional - public boolean generateTask(List tasks, String taskSource) { - boolean result = false; - if (Objects.isNull(tasks) || CollectionUtil.isEmpty(tasks)) { - return result; - } - List newTaskList = new ArrayList(); - List oldTaskList = new ArrayList(); - tasks.forEach(task -> { - String taskNumber = "SJ-" + task.getNoteNum(); - task.setId(IdUtil.getSnowflake().nextId()); - task.setTaskNumber(taskNumber); - WmsTask wmsTask = lambdaQuery().eq(WmsTask::getTaskNumber, taskNumber).one(); - if (Objects.nonNull(wmsTask)) { - if (!newTaskList.stream().anyMatch(t -> t.getTaskNumber().equals(taskNumber))) { - newTaskList.add(new WmsTask().setTaskFrom(taskSource) - .setId(IdUtil.getSnowflakeNextId()) - .setTaskNumber(taskNumber) - .setOrderNumber(task.getNoteNum()) - .setCreateTime(LocalDateTime.now()) - .setModifyTime(LocalDateTime.now()) - ); - } - } else { - if (!oldTaskList.stream().anyMatch(t -> t.getTaskNumber().equals(taskNumber))) { - wmsTask.setModifyTime(LocalDateTime.now()); - oldTaskList.add(wmsTask); - } - } - }); - - if (CollectionUtil.isNotEmpty(newTaskList)) { - result = saveBatch(newTaskList); - } - - if (result && CollectionUtil.isNotEmpty(oldTaskList)) { - result = updateBatchById(oldTaskList); - } - - if (result) { - result = wmsTaskItemService.saveBatch(tasks); - } - return result; - } -} diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInTaskItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInTaskItemMapper.xml new file mode 100644 index 00000000..5e6324bf --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInTaskItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInTaskMapper.xml new file mode 100644 index 00000000..fcc5b294 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInTaskMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmMaterialReceiptMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmMaterialReceiptMapper.xml new file mode 100644 index 00000000..fd4d25b5 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmMaterialReceiptMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java index fb0ad893..3086f7c9 100644 --- a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java +++ b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { ) .strategyConfig(builder -> { builder - .addInclude("wms_task_item") //只生成指定表 + .addInclude("wms_srm_material_receipt") //只生成指定表 .entityBuilder().idType(IdType.ASSIGN_ID) .enableLombok() .enableChainModel()