diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java new file mode 100644 index 0000000..d6e32e9 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupBucketController.java @@ -0,0 +1,29 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +/** + *

+ * 组桶 控制层 + *

+ * + * @author Liuxy + * @since 2025-11-24 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/groupBucket") +@Slf4j +public class GroupBucketController { + + @Resource + private final IMdPdGroupbucketService iMdPdGroupbucketService; +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java new file mode 100644 index 0000000..a08a14e --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata_manage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; + +/** + *

+ * 组桶记录表 服务类 + *

+ * + * @author Liuxy + * @since 2025-11-24 + */ +public interface IMdPdGroupbucketService extends IService { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPdGroupbucket.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPdGroupbucket.java new file mode 100644 index 0000000..a65c7e7 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPdGroupbucket.java @@ -0,0 +1,84 @@ +package org.nl.wms.basedata_manage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 组桶记录表 + *

+ * + * @author Liuxy + * @since 2025-11-24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("md_pd_groupbucket") +public class MdPdGroupbucket implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id标识 + */ + @TableId(value = "id") + private String id; + + /** + * 桶号 + */ + private String bucket_code; + + /** + * 桶自重 + */ + private BigDecimal bucket_weight; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 批次号 + */ + private String pcsn; + + /** + * 数量 + */ + private BigDecimal qty; + + /** + * 计量单位标识 + */ + private String qty_unit_id; + + /** + * 计量单位名称 + */ + private String qty_unit_name; + + /** + * 组桶人 + */ + private String create_id; + + /** + * 组桶人名称 + */ + private String create_name; + + /** + * 组桶时间 + */ + private String create_time; + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java new file mode 100644 index 0000000..78c2c6e --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; + +/** + *

+ * 组桶记录表 Mapper 接口 + *

+ * + * @author Liuxy + * @since 2025-11-24 + */ +public interface MdPdGroupbucketMapper extends BaseMapper { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml new file mode 100644 index 0000000..260e3a1 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java new file mode 100644 index 0000000..479d877 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.basedata_manage.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; +import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; +import org.nl.wms.basedata_manage.service.dao.mapper.MdPdGroupbucketMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 组桶记录表 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-11-24 + */ +@Service +public class MdPdGroupbucketServiceImpl extends ServiceImpl implements IMdPdGroupbucketService { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java index 492cca8..aa2ef96 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java @@ -116,7 +116,7 @@ public class PdaUpdatePointServiceImpl implements PdaUpdatePointService { mdPbGroupplateMapper.delete( new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, pointDao.getVehicle_code()) + .eq(GroupPlate::getVehicle_code, pointDao.getVehicle_code()) .in(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘"), IOSEnum.GROUP_PLATE_STATUS.code("出库") ) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index f59a142..a5519a6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -297,7 +297,7 @@ public class SchBasePointServiceImpl extends ServiceImpl().lambda() - .eq(GroupPlate::getStoragevehicle_code, dao.getVehicle_code()) + .eq(GroupPlate::getVehicle_code, dao.getVehicle_code()) ); if (ObjectUtil.isEmpty(plateDao)) { throw new BadRequestException("当前点位载具信息不存在组盘信息!"); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java index 0ab6299..723baa1 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java @@ -230,7 +230,7 @@ public class CheckBackMoveTask extends AbstractTask { new UpdateWrapper().lambda() .set(GroupPlate::getQty, base_qty) .eq(GroupPlate::getMaterial_id, dtlDao.getMaterial_id()) - .eq(GroupPlate::getStoragevehicle_code, dtlDao.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, dtlDao.getStoragevehicle_code()) .eq(GroupPlate::getPcsn, dtlDao.getPcsn()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java index 112db9a..6d8d734 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java @@ -246,7 +246,7 @@ public class EmpVehicleInTask extends AbstractTask { // 删除组盘信息 groupPlateMapper.delete( new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + .eq(GroupPlate::getVehicle_code, taskObj.getVehicle_code()) ); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java index 086e81b..3bcb792 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java @@ -227,7 +227,7 @@ public class HandOutTask extends AbstractTask { // 删除组盘信息 groupPlateMapper.delete( new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code()) + .eq(GroupPlate::getVehicle_code, taskObj.getVehicle_code()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) ); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java index 2334f12..1b3afad 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java @@ -23,12 +23,17 @@ public class GroupPlate implements Serializable { private String group_id; /** - * 载具编码 + * 袋码 */ - private String storagevehicle_code; + private String bag_code; /** - * 物料编码 + * 载具编码 + */ + private String vehicle_code; + + /** + * 物料标识 */ private String material_id; @@ -59,7 +64,7 @@ public class GroupPlate implements Serializable { /** * 状态 - * 1-组盘 2-入库 3-出库 + * 0-组袋 1-组盘 2-入库 3-出库 */ private String status; @@ -68,43 +73,6 @@ public class GroupPlate implements Serializable { */ private String supp_code; - /** - * 有效日期 - */ - private String quality_time; - - /** - * 生产日期 - */ - private String produce_time; - - /** - * 执行标准 - */ - private String execution_stand; - - /** - * 烘干次数 - */ - private Integer bake_num; - - /** - * 品质类型 - * 1-待检，2-合格，3-不合格 - */ - private String quality_type; - - /** - * 料箱类型 - * 1-大料箱，2-小料箱，3-焊条桶 - */ - private String box_type; - - /** - * 工单信息 - */ - private String bom_id; - /** * 组盘人 */ @@ -119,14 +87,4 @@ public class GroupPlate implements Serializable { * 组盘时间 */ private String create_time; - - /** - * 出库业务类型 - */ - private String out_type; - - /** - * 打印标签后是否删除 - */ - private String is_need_delete; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index 72472ff..509e341 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -1,6 +1,5 @@ package org.nl.wms.warehouse_management.service.impl; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; @@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; @@ -26,7 +24,6 @@ import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; import org.nl.wms.warehouse_management.service.dao.GroupPlate; import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper; -import org.nl.wms.warehouse_management.service.dto.GroupPlateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,7 +78,7 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl groupList = this.list( new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, dto.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, dto.getVehicle_code()) ); if (ObjectUtil.isNotEmpty(groupList)) { - throw new BadRequestException("当前载具已经组盘【" + dto.getStoragevehicle_code() + "】"); + throw new BadRequestException("当前载具已经组盘【" + dto.getVehicle_code() + "】"); } dto.setGroup_id(IdUtil.getStringId()); @@ -100,14 +97,8 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl GroupPlate groupPlate = groupPlateMapper.selectOne( new QueryWrapper().lambda() .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn()) - .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, ioStorInvDis.getStoragevehicle_code()) .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); @@ -1192,10 +1192,6 @@ public class OutBillServiceImpl extends ServiceImpl groupPlate.setQty(BigDecimal.valueOf(sub_qty)); } groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("出库")); - groupPlate.setOut_type(ioStorInv.getBill_type()); - if (ioStorInvDis.getIs_check().equals(IOSConstant.ZERO)) { - groupPlate.setIs_need_delete(IOSConstant.ONE); - } groupPlateMapper.updateById(groupPlate); } @@ -1278,7 +1274,7 @@ public class OutBillServiceImpl extends ServiceImpl GroupPlate groupPlate = groupPlateMapper.selectOne( new QueryWrapper().lambda() .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn()) - .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, ioStorInvDis.getStoragevehicle_code()) .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); @@ -1288,10 +1284,6 @@ public class OutBillServiceImpl extends ServiceImpl groupPlate.setQty(BigDecimal.valueOf(sub_qty)); } groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("出库")); - groupPlate.setOut_type(ioStorInv.getBill_type()); - if (ioStorInvDis.getIs_check().equals(IOSConstant.ZERO)) { - groupPlate.setIs_need_delete(IOSConstant.ONE); - } groupPlateMapper.updateById(groupPlate); // 查询该明细下是否还有未完成的分配明细 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java index d735654..48fc0ac 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java @@ -622,7 +622,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(GroupPlate.class) .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn()) - .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, ioStorInvDis.getStoragevehicle_code()) .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")) ); @@ -693,7 +693,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(GroupPlate.class) .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn()) - .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, ioStorInvDis.getStoragevehicle_code()) .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")) ); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java index d4bd23a..ba4b60c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java @@ -206,7 +206,7 @@ public class StIvtCheckmstServiceImpl extends ServiceImpl().lambda() .set(GroupPlate::getQty, dtlDao.getFac_qty()) .eq(GroupPlate::getMaterial_id, dtlDao.getMaterial_id()) - .eq(GroupPlate::getStoragevehicle_code, dtlDao.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, dtlDao.getStoragevehicle_code()) .eq(GroupPlate::getPcsn, dtlDao.getPcsn()) .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java index e5be17c..021e327 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java @@ -313,7 +313,7 @@ public class UpdateIvtUtils { private void updateGroupNum(MdPbStoragevehicleext extDao) { GroupPlate groupPlate = groupPlateMapper.selectOne( new QueryWrapper().lambda() - .eq(GroupPlate::getStoragevehicle_code, extDao.getStoragevehicle_code()) + .eq(GroupPlate::getVehicle_code, extDao.getStoragevehicle_code()) .eq(GroupPlate::getMaterial_id, extDao.getMaterial_id()) .eq(GroupPlate::getPcsn, extDao.getPcsn()) );