From 47d57d9977fa5b5375de176499bcec7e2dc29e88 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 14 Jul 2025 15:53:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=90=8C=E7=B1=BB=E6=9C=A8=E7=AE=B1?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MdpbSameBoxController.java | 65 +++++++++++++++++++ .../database/service/IMdpbSameBoxService.java | 17 +++++ .../database/service/dao/MdpbSameBox.java | 46 +++++++++++++ .../service/dao/mapper/MdpbSameboxMapper.java | 16 +++++ .../service/dao/mapper/MdpbSameboxMapper.xml | 5 ++ .../service/impl/MdpbSameBoxServiceImpl.java | 20 ++++++ 6 files changed, 169 insertions(+) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbSameBoxController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbSameBoxService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbSameBox.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.xml create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbSameBoxServiceImpl.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbSameBoxController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbSameBoxController.java new file mode 100644 index 000000000..be30e0a7e --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbSameBoxController.java @@ -0,0 +1,65 @@ +package org.nl.b_lms.storage_manage.database.controller; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; +import org.nl.b_lms.storage_manage.database.service.IMdpbSameBoxService; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbSameBox; +import org.nl.modules.logging.annotation.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 前端控制器 + *

+ * + * @author author + * @since 2024-02-06 + */ +@RestController +@RequestMapping("/api/samebox") +public class MdpbSameBoxController { + + @Autowired + private IMdpbSameBoxService mdpbSameBoxService; + @Autowired + private IMdpbBoxtypeService mdpbBoxtypeService; + + @PostMapping("/getSameBoxList") + @Log("保存bom") + @SaIgnore + public ResponseEntity getSameBoxList(@RequestBody JSONObject whereJson) { + List list = mdpbSameBoxService.list(new LambdaQueryWrapper().eq(MdpbSameBox::getBox_code, whereJson.getString("box_code"))); + MdpbSameBox mdpbSameBox = new MdpbSameBox(); + MdpbBoxtype boxtype = mdpbBoxtypeService.getOne(new LambdaQueryWrapper().eq(MdpbBoxtype::getBox_type, whereJson.getString("box_code"))); + + mdpbSameBox.setSame_box_code(boxtype.getBox_type()); + mdpbSameBox.setSame_box_name(boxtype.getBox_name()); + list.add(0, mdpbSameBox); + JSONArray jsonArray; + jsonArray = list.stream() + .map(item -> { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("text", item.getSame_box_name()); + jsonObject.put("value", item.getSame_box_code()); + return jsonObject; + }) + .collect(Collectors.toCollection(JSONArray::new)); + return new ResponseEntity<>(jsonArray, HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbSameBoxService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbSameBoxService.java new file mode 100644 index 000000000..a957ba510 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbSameBoxService.java @@ -0,0 +1,17 @@ +package org.nl.b_lms.storage_manage.database.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbSameBox; + +/** + *

+ * 服务类 + *

+ * + * @author author + * @since 2024-02-06 + */ +public interface IMdpbSameBoxService extends IService { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbSameBox.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbSameBox.java new file mode 100644 index 000000000..f0d3e84f4 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbSameBox.java @@ -0,0 +1,46 @@ +package org.nl.b_lms.storage_manage.database.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *

+ * 木箱规格信息表 + *

+ * + * @author author + * @since 2024-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("mdpb_samebox") +public class MdpbSameBox implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 木箱类型 + */ + @TableId(value = "id") + private String id; + + /** + * 木箱编码 + */ + private String box_code; + + /** + * 同类木箱编码 + */ + private String same_box_code; + + /** + * 同类木箱描述 + */ + private String same_box_name; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.java new file mode 100644 index 000000000..eef5782ac --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.java @@ -0,0 +1,16 @@ +package org.nl.b_lms.storage_manage.database.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbSameBox; + +/** + *

+ * Mapper 接口 + *

+ * + * @author author + * @since 2024-02-06 + */ +public interface MdpbSameboxMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.xml new file mode 100644 index 000000000..0018acb2a --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbSameBoxServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbSameBoxServiceImpl.java new file mode 100644 index 000000000..db4d62e32 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbSameBoxServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.b_lms.storage_manage.database.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.b_lms.storage_manage.database.service.IMdpbSameBoxService; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbSameBox; +import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbSameboxMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author author + * @since 2024-02-06 + */ +@Service +public class MdpbSameBoxServiceImpl extends ServiceImpl implements IMdpbSameBoxService { + +}