fix:同类木箱兼容问题

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;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @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<Object> getSameBoxList(@RequestBody JSONObject whereJson) {
+        List<MdpbSameBox> list = mdpbSameBoxService.list(new LambdaQueryWrapper<MdpbSameBox>().eq(MdpbSameBox::getBox_code, whereJson.getString("box_code")));
+        MdpbSameBox mdpbSameBox = new MdpbSameBox();
+        MdpbBoxtype boxtype = mdpbBoxtypeService.getOne(new LambdaQueryWrapper<MdpbBoxtype>().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);
+    }
+
+}

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;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-02-06
+ */
+public interface IMdpbSameBoxService extends IService<MdpbSameBox> {
+
+}

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;
+
+/**
+ * <p>
+ *  木箱规格信息表
+ * </p>
+ *
+ * @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;
+
+}

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;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-02-06
+ */
+public interface MdpbSameboxMapper extends BaseMapper<MdpbSameBox> {
+
+}

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbSameboxMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbSameboxMapper">
+
+</mapper>

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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-02-06
+ */
+@Service
+public class MdpbSameBoxServiceImpl extends ServiceImpl<MdpbSameboxMapper, MdpbSameBox> implements IMdpbSameBoxService {
+
+}