diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java new file mode 100644 index 0000000..bc94917 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java @@ -0,0 +1,64 @@ +package org.nl.wms.pdm_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 产线叫料 控制层 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/bomCallMaterial") +@Slf4j +public class BomCallMaterialController { + + @Autowired + private IPdmBomCallMaterialService iPdmBomCallMaterialService; + + @GetMapping + @Log("分页查询") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iPdmBomCallMaterialService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增叫料单") + public ResponseEntity create(@Validated @RequestBody PdmBomCallMaterial dto) { + iPdmBomCallMaterialService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改叫料单") + public ResponseEntity update(@Validated @RequestBody PdmBomCallMaterial dto) { + iPdmBomCallMaterialService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除叫料单") + public ResponseEntity delete(@RequestBody Set ids) { + iPdmBomCallMaterialService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java new file mode 100644 index 0000000..8969a97 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java @@ -0,0 +1,47 @@ +package org.nl.wms.pdm_manage.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.MapOf; + +import java.util.Map; + +/** + *

+ * 生产枚举类 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +@AllArgsConstructor +@Getter +public enum BomEnum { + + // 叫料单状态 + CALL_BOM_STATUS(MapOf.of("生成", "1", "叫料中", "2", "叫料完成", "3" + , "退料中", "4", "完成", "5" + )), + + ; + + private Map code; + + public String code(String desc) { + String code = this.getCode().get(desc); + if (StringUtils.isNotEmpty(code)) { + return code; + } + throw new BadRequestException(this.name() + "对应类型" + desc + "未定义"); + } + + public String check(String code) { + for (Map.Entry entry : this.getCode().entrySet()) + if (entry.getValue().equals("code")) { + return entry.getValue(); + } + throw new BadRequestException(this.name() + "对应类型" + code + "未定义"); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java new file mode 100644 index 0000000..f0a855b --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java @@ -0,0 +1,50 @@ +package org.nl.wms.pdm_manage.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; +import org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 产线叫料单 服务类 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +public interface IPdmBomCallMaterialService extends IService { + + /** + * 分页查询 + * + * @param whereJson : {查询参数} + * @param page : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery page); + + /** + * 新增叫料单 + * + * @param dto 实体类 + */ + void create(PdmBomCallMaterial dto); + + /** + * 修改叫料单 + * + * @param dto 实体类 + */ + void update(PdmBomCallMaterial dto); + + /** + * 删除叫料单 + * @param ids id集合 + */ + void delete(Set ids); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java new file mode 100644 index 0000000..c18c5a1 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java @@ -0,0 +1,77 @@ +package org.nl.wms.pdm_manage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 产线叫料单 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bom_callmaterial") +public class PdmBomCallMaterial implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 工单标识 + */ + @TableId(value = "bom_id") + private String bom_id; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 设备编码 + */ + private String device_code; + + /** + * 叫料重量 + */ + private BigDecimal call_qty; + + /** + * 实际重量 + */ + private BigDecimal real_qty; + + /** + * 工单状态 + */ + private String bom_status; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人名称 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 结束时间 + */ + private String confirm_time; + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java new file mode 100644 index 0000000..af1755c --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java @@ -0,0 +1,29 @@ +package org.nl.wms.pdm_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; +import org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto; + +import java.util.Map; + +/** + *

+ * 产线叫料单 Mapper 接口 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +public interface PdmBomCallMaterialMapper extends BaseMapper { + + /** + * 分页查询 + * @param page 分页条件 + * @param whereJson 查询条件 + * @return IPage + */ + IPage queryAllByPage(Page page, @Param("param") Map whereJson); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml new file mode 100644 index 0000000..103471c --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml @@ -0,0 +1,37 @@ + + + + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dto/PdmBomCallMaterialDto.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dto/PdmBomCallMaterialDto.java new file mode 100644 index 0000000..154bccd --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dto/PdmBomCallMaterialDto.java @@ -0,0 +1,32 @@ +package org.nl.wms.pdm_manage.service.dto; + +import lombok.Data; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; + +/** + *

+ * 产线叫料单dto + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +@Data +public class PdmBomCallMaterialDto extends PdmBomCallMaterial { + + /** + * 物料标批次 + */ + private String material_spec; + + /** + * 物料编码 + */ + private String material_code; + + /** + * 物料编码 + */ + private String material_name; + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java new file mode 100644 index 0000000..14ee959 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java @@ -0,0 +1,60 @@ +package org.nl.wms.pdm_manage.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.pdm_manage.enums.BomEnum; +import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; +import org.nl.wms.pdm_manage.service.dao.mapper.PdmBomCallMaterialMapper; +import org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 产线叫料单 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-08-14 + */ +@Service +public class PdmBomCallMaterialServiceImpl extends ServiceImpl implements IPdmBomCallMaterialService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), + whereJson); + } + + @Override + @Transactional + public void create(PdmBomCallMaterial dto) { + dto.setBom_id(IdUtil.getStringId()); + dto.setBom_status(BomEnum.CALL_BOM_STATUS.code("生成")); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + this.save(dto); + } + + @Override + @Transactional + public void update(PdmBomCallMaterial dto) { + this.updateById(dto); + } + + @Override + @Transactional + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } +} diff --git a/wms/nladmin-ui/README.md b/wms/nladmin-ui/README.md index 2d75b9e..22028e3 100644 --- a/wms/nladmin-ui/README.md +++ b/wms/nladmin-ui/README.md @@ -1,3 +1,3 @@ -# 北安新生WMS系统 +# 徐工汉云WMS系统 /api/sysMenu/build?systemType=1 \ No newline at end of file diff --git a/wms/nladmin-ui/src/i18n/langs/zh-CN.js b/wms/nladmin-ui/src/i18n/langs/zh-CN.js index 27c72fe..fa4fbfc 100644 --- a/wms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/wms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -2,7 +2,7 @@ export default { 'lang': 'zh', // 平台 'platform': { - 'title': '北安新生WMS系统', + 'title': '徐工汉云WMS系统', 'tip1': '用户名不能为空', 'tip2': '密码不能为空', 'tip3': '验证码不能为空' diff --git a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index f9d69b6..323b243 100644 --- a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - title: '北安新生WMS系统', + title: '徐工汉云WMS系统', logo: Logo, title_param: 'platform' } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js new file mode 100644 index 0000000..6b437c1 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/bomCallMaterial', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/bomCallMaterial/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/bomCallMaterial', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue new file mode 100644 index 0000000..bd06dcc --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue @@ -0,0 +1,233 @@ + + + + +