From c057cffea9ec53e836a5e3c13ad0985c15aade32 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 26 Dec 2025 14:50:31 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E5=87=BA=E5=BA=93=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=BB=84?=
 =?UTF-8?q?=E7=9B=98=E9=A1=B5=E9=9D=A2=E6=89=B9=E6=AC=A1=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupController.java           |  6 ++++++
 .../mapper/MdPbStoragevehicleextMapper.xml    |  3 ++-
 .../service/IMdPbGroupplateService.java       |  7 +++++++
 .../service/dao/GroupPlate.java               |  5 +++++
 .../impl/MdPbGroupplateServiceImpl.java       | 13 ++++++++++++
 .../impl/RawAssistIStorServiceImpl.java       |  3 +++
 .../src/views/wms/basedata/group/group.js     | 10 ++++++++-
 .../src/views/wms/basedata/group/index.vue    | 21 ++++++++++++++++++-
 .../views/wms/statement/structivt/index.vue   | 11 +++++++---
 9 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 2359249..4895b70 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -98,6 +98,12 @@ public class GroupController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/getPcsn")
+    @Log("获取批次下拉框")
+    public ResponseEntity<Object> getPcsn() {
+        return new ResponseEntity<>(iMdPbGroupplateService.getPcsn(),HttpStatus.OK);
+    }
+
     @PostMapping("/printDelete")
     @Log("打印物料标签后删除")
     public ResponseEntity<Object> printDelete(@RequestBody GroupPlate dto) {
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
index 801a672..d18a4dd 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
@@ -133,6 +133,7 @@
             late.quality_type,
             late.quality_type AS old_quality_type,
             late.bake_num,
+            late.is_return,
             false AS edit,
             (
                 CASE late.quality_type
@@ -304,7 +305,7 @@
                 late.device_code = #{device_code}
             </if>
         </where>
-        ORDER BY quality_day,late.produce_time,ex.canuse_qty
+        ORDER BY late.is_return DESC,late.produce_time,ex.canuse_qty
     </select>
 
     <select id="erpQueryIvt" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
index 8c58a08..61fb225 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
+import org.nl.wms.pda.util.PdaResponse;
 import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -104,4 +105,10 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
      * @param request post请求
      */
     void importExcel(MultipartFile file, HttpServletRequest request);
+
+    /**
+     * 获取批次下拉框
+     * @return PdaResponse
+     */
+    PdaResponse getPcsn();
 }
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 2224923..eaa0b24 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
@@ -134,4 +134,9 @@ public class GroupPlate implements Serializable {
      * 机台编码
      */
     private String device_code;
+
+    /**
+     * 是否退料
+     */
+    private String is_return;
 }
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 2ca3145..1cd85b4 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
@@ -23,6 +23,8 @@ import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
 import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
+import org.nl.wms.pda.general_management.service.PdaInGroupBoxService;
+import org.nl.wms.pda.util.PdaResponse;
 import org.nl.wms.warehouse_management.enums.IOSConstant;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
 import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
@@ -75,6 +77,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
     @Autowired
     private IMdPbMeasureunitService iMdPbMeasureunitService;
 
+    /**
+     * 手持组盘服务
+     */
+    @Autowired
+    private PdaInGroupBoxService pdaInGroupBoxService;
+
     @Override
     public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
         return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -194,4 +202,9 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
             throw new BadRequestException("导入失败!" + e.getMessage());
         }
     }
+
+    @Override
+    public PdaResponse getPcsn() {
+        return pdaInGroupBoxService.queryPcsn();
+    }
 }
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..13e5fe9 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
@@ -621,6 +621,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
             //更新组盘记录表
             groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
                     .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+                    .set(ioStorInv.getBill_type().equals(IOSEnum.IN_BILL_TYPE.code("退料入库")),GroupPlate::getIs_return, IOSConstant.ONE)
                     .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                     .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
                     .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
@@ -659,6 +660,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         if (ObjectUtil.isEmpty(ioStorInvDis)) {
             throw new BadRequestException("未找到任务对应的分配明细");
         }
+        IOStorInv ioStorInv = ioStorInvMapper.selectById(ioStorInvDis.getIostorinv_id());
 
         // 完成当前分配明细
         ioStorInvDisMapper.update(ioStorInvDis, new LambdaUpdateWrapper<>(IOStorInvDis.class)
@@ -692,6 +694,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         //更新组盘记录表
         groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
                 .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+                .set(ioStorInv.getBill_type().equals(IOSEnum.IN_BILL_TYPE.code("退料入库")),GroupPlate::getIs_return, IOSConstant.ONE)
                 .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                 .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
                 .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/group.js b/wms/nladmin-ui/src/views/wms/basedata/group/group.js
index 14a8cb5..3b5b96b 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/group/group.js
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/group.js
@@ -80,4 +80,12 @@ export function excelImport(data) {
   })
 }
 
-export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete, excelImport }
+export function getPcsn(data) {
+  return request({
+    url: 'api/group/getPcsn',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete, excelImport, getPcsn }
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
index bba8005..1b173f9 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
@@ -145,7 +145,22 @@
 
             <el-col :span="8">
               <el-form-item label="焊材批号" prop="pcsn">
-                <el-input v-model="form.pcsn" style="width: 200px;" />
+                <el-select
+                  v-model="form.pcsn"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                  filterable
+                  allow-create
+                >
+                  <el-option
+                    v-for="item in pcsnList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -410,6 +425,7 @@ export default {
       suppList: [],
       deviceList: [],
       materList: [],
+      pcsnList: [],
       formPrint: {
         print_num: 1
       },
@@ -445,6 +461,9 @@ export default {
     crudDeviceinfo.getDevice({}).then(res => {
       this.deviceList = res
     })
+    crudGroup.getPcsn({}).then(res => {
+      this.pcsnList = res.data
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
diff --git a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
index 6fc655a..ef6cc1c 100644
--- a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
+++ b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
@@ -108,8 +108,9 @@
         <el-table-column prop="produce_time" label="生产日期" :min-width="flexWidth('produce_time',crud.data,'生产日期')" />
         <el-table-column prop="quality_time" label="有效日期" :min-width="flexWidth('quality_time',crud.data,'有效日期')" />
         <el-table-column prop="bake_num" label="烘干次数" :min-width="flexWidth('bake_num',crud.data,'烘干次数')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="insert_time" label="入库时间" :min-width="flexWidth('insert_time',crud.data,'入库时间')" />
+        <el-table-column prop="is_return" label="是否退料" :min-width="flexWidth('is_return',crud.data,'是否退料')" :formatter="isReturn" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -133,6 +134,7 @@ export default {
   name: 'Structivt',
   components: { pagination, crudOperation, rrOperation, imageModal },
   mixins: [presenter(), header(), crud()],
+  dicts: ['IS_OR_NOT'],
   cruds() {
     return CRUD({
       title: '库存管理', url: 'api/structivt', idField: 'stockrecord_id', sort: 'stockrecord_id,desc',
@@ -173,8 +175,8 @@ export default {
       crudStructivt.imageLoad(vehicle).then(response => {
         const blob = new Blob([response]) // 尽可能根据响应头确定类型
         this.imageUrl = URL.createObjectURL(blob)
-          this.showModal = true
-        }
+        this.showModal = true
+      }
       )
     },
     sectQueryChange(val) {
@@ -195,6 +197,9 @@ export default {
     querytable() {
       this.crud.toQuery()
     },
+    isReturn(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_return]
+    },
     downdtl() {
       if (this.currentRow !== null) {
         this.showDtlLoading = true