add：组盘记录

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java

@@ -0,0 +1,48 @@
+package org.nl.wms.basedata_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.warehouse_management.service.IMdPbGroupplateService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * <p>
+ * 组盘记录 控制层
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-06-03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/group")
+@Slf4j
+public class GroupController {
+
+    @Resource
+    private final IMdPbGroupplateService iMdPbGroupplateService;
+
+    @GetMapping
+    @Log("分页查询")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iMdPbGroupplateService.queryAll(whereJson, page)), HttpStatus.OK);
+    }
+
+    @DeleteMapping
+    @Log("删除组盘")
+    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
+        iMdPbGroupplateService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java

@@ -1,8 +1,14 @@
 package org.nl.wms.warehouse_management.service;
 
+import com.alibaba.fastjson.JSONObject;
+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.warehouse_management.service.dao.GroupPlate;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * <p>
  * 组盘记录表 服务类
@@ -13,4 +19,17 @@ import org.nl.wms.warehouse_management.service.dao.GroupPlate;
  */
 public interface IMdPbGroupplateService extends IService<GroupPlate> {
 
+    /**
+     * 分页查询
+     * @param whereJson : {查询参数}
+     * @param page : 分页对象
+     * @return 返回结果
+     */
+    IPage<JSONObject> queryAll(Map whereJson, PageQuery page);
+
+    /**
+     * 删除组盘
+     * @param ids 标识集合
+     */
+    void delete(Set<String> ids);
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java

@@ -2,10 +2,13 @@ package org.nl.wms.warehouse_management.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 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.warehouse_management.service.dao.GroupPlate;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,4 +27,12 @@ public interface MdPbGroupplateMapper extends BaseMapper<GroupPlate> {
      * }
      */
     List<JSONObject> getDtl(@Param("param") JSONObject whereJson);
+
+    /**
+     * 分页查询
+     * @param page 分页条件
+     * @param whereJson 查询条件
+     * @return IPage<StIvtMoveinv>
+     */
+    IPage<JSONObject> queryAllByPage(Page<JSONObject> page, @Param("param") Map whereJson);
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml

@@ -18,4 +18,38 @@
             </if>
         </where>
     </select>
+
+    <select id="queryAllByPage" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            late.*,
+            mater.material_code,
+            mater.material_name
+        FROM
+            md_pb_groupplate late
+            INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id
+        <where>
+            1 = 1
+            <if test="param.material_code != null and param.material_code != ''">
+                AND
+                (mater.material_code LIKE  #{param.material_code} or
+                 mater.material_name LIKE  #{param.material_code} )
+            </if>
+
+            <if test="param.pcsn != null and param.pcsn != ''">
+                AND
+                late.pcsn LIKE #{param.pcsn}
+            </if>
+
+            <if test="param.storagevehicle_code != null and param.storagevehicle_code != ''">
+                AND
+                late.storagevehicle_code LIKE #{param.storagevehicle_code}
+            </if>
+
+            <if test="param.status != null and param.status != ''">
+                AND
+                late.status = #{param.status}
+            </if>
+        </where>
+        ORDER BY late.create_time Desc
+    </select>
 </mapper>

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java

@@ -1,10 +1,18 @@
 package org.nl.wms.warehouse_management.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+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.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.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -17,4 +25,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper, GroupPlate> implements IMdPbGroupplateService {
 
+    @Override
+    public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
+        return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
+                whereJson);
+    }
+
+    @Override
+    @Transactional
+    public void delete(Set<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java

@@ -187,7 +187,7 @@ public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
         // 更新
         this.update(
                 new UpdateWrapper<IOStorInv>().lambda()
-                    .in(IOStorInv::getIo_type, idList)
+                    .in(IOStorInv::getIostorinv_id, idList)
                     .set(IOStorInv::getIs_upload, IOSConstant.IS_DELETE_YES)
                     .set(IOStorInv::getUpdate_optid, SecurityUtils.getCurrentUserId())
                     .set(IOStorInv::getUpdate_optname, SecurityUtils.getCurrentNickName())