From 66517edf1de22c8203daa256abffddae43bae704 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 17:58:28 +0800
Subject: [PATCH] feat(mes): 袋码绑定托盘免先录生产批次
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java | 88 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
index 1aba55e..51614da 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/MesProPalletController.java
@@ -21,13 +21,12 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
-import cn.iocoder.yudao.module.mes.framework.qrcode.MesProQrLabelBuilder;
import cn.iocoder.yudao.module.mes.framework.qrcode.QrCodeImageUtils;
-import cn.iocoder.yudao.module.mes.framework.qrcode.QrLabelInfo;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
+import cn.iocoder.yudao.module.mes.service.pro.qrexport.MesProQrLabelAssembler;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -41,7 +40,6 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -53,7 +51,6 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_PALLET_NOT_EXISTS;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_QR_EXPORT_TOO_MANY;
@Tag(name = "绠＄悊鍚庡彴 - MES 鎵樼洏鐮�")
@RestController
@@ -71,6 +68,8 @@
private MesMdmItemService mdmItemService;
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MesProQrLabelAssembler labelAssembler;
@PostMapping("/batch-create")
@Operation(summary = "鎵归噺鐢熸垚鎵樼洏鐮侊紙涓�娆″綍鍏ユ壒娆＄敓鎴愭寮忔墭鐩樼爜锛�")
@@ -106,10 +105,7 @@
if (CollUtil.isEmpty(list)) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- if (list.size() > QrCodeImageUtils.MAX_QR_EXPORT) {
- throw exception(PRO_QR_EXPORT_TOO_MANY);
- }
- QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜", buildPalletQrLabels(list));
+ QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜", labelAssembler.buildPalletLabels(list));
}
@DeleteMapping("/delete")
@@ -127,7 +123,7 @@
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
public CommonResult<MesProPalletRespVO> getPallet(@RequestParam("id") Long id) {
MesProPalletDO pallet = palletService.getPallet(id);
- return success(BeanUtils.toBean(pallet, MesProPalletRespVO.class));
+ return success(pallet == null ? null : buildPalletRespVOList(List.of(pallet)).get(0));
}
@GetMapping("/get-by-code")
@@ -135,7 +131,7 @@
@Parameter(name = "code", description = "鎵樼洏鐮侊紙浜岀淮鐮佸唴瀹癸級", required = true, example = "PC20260818L01001-P01")
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
public CommonResult<MesProPalletTraceRespVO> getPalletByCode(@RequestParam("code") String code) {
- MesProPalletDO pallet = palletService.getPalletByCode(code);
+ MesProPalletDO pallet = palletService.getPalletByScanCode(code);
if (pallet == null) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
@@ -147,7 +143,7 @@
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
public CommonResult<PageResult<MesProPalletRespVO>> getPalletPage(@Valid MesProPalletPageReqVO pageReqVO) {
PageResult<MesProPalletDO> pageResult = palletService.getPalletPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesProPalletRespVO.class));
+ return success(new PageResult<>(buildPalletRespVOList(pageResult.getList()), pageResult.getTotal()));
}
@GetMapping("/simple-list")
@@ -156,7 +152,7 @@
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
public CommonResult<List<MesProPalletRespVO>> getPalletSimpleList(@RequestParam("batchId") Long batchId) {
List<MesProPalletDO> list = palletService.getPalletListByBatchId(batchId);
- return success(BeanUtils.toBean(list, MesProPalletRespVO.class));
+ return success(buildPalletRespVOList(list));
}
@GetMapping("/unbound-list")
@@ -164,7 +160,17 @@
@PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
public CommonResult<List<MesProPalletRespVO>> getUnboundPalletList() {
List<MesProPalletDO> list = palletService.getUnboundPalletList();
- return success(BeanUtils.toBean(list, MesProPalletRespVO.class));
+ return success(buildPalletRespVOList(list));
+ }
+
+ @GetMapping("/bindable-list")
+ @Operation(summary = "鑾峰緱琚嬬爜缁戝畾鎵樼洏鏃跺彲閫夌殑鐩爣鎵樼洏鍒楄〃锛堜复鏃舵墭鐩� + 姝ｅ紡鎵樼洏锛屾帓闄ゅ凡浣滃簾锛�")
+ @Parameter(name = "itemId", description = "琚嬬爜鍝佺缂栧彿锛堝彲閫夛紝鐢ㄤ簬杩囨护闈炲悓鍝佺鎵樼洏锛�", example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:pro-pallet:query')")
+ public CommonResult<List<MesProPalletRespVO>> getBindablePalletList(
+ @RequestParam(value = "itemId", required = false) Long itemId) {
+ List<MesProPalletDO> list = palletService.getBindablePalletList(itemId);
+ return success(buildPalletRespVOList(list));
}
@GetMapping("/export-excel")
@@ -175,7 +181,7 @@
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<MesProPalletDO> list = palletService.getPalletPage(pageReqVO).getList();
- List<MesProPalletRespVO> voList = BeanUtils.toBean(list, MesProPalletRespVO.class);
+ List<MesProPalletRespVO> voList = buildPalletRespVOList(list);
ExcelUtils.write(response, "鎵樼洏鐮�.xls", "鏁版嵁", MesProPalletRespVO.class, voList);
}
@@ -190,16 +196,45 @@
if (CollUtil.isEmpty(list)) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- if (list.size() > QrCodeImageUtils.MAX_QR_EXPORT) {
- throw exception(PRO_QR_EXPORT_TOO_MANY);
- }
- QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜-" + batchId, buildPalletQrLabels(list));
+ QrCodeImageUtils.writeZip(response, "鎵樼洏鐮佷簩缁寸爜-" + batchId, labelAssembler.buildPalletLabels(list));
}
// ==================== 鎷兼帴 VO ====================
+ @PostMapping("/generate-business-code")
+ @Operation(summary = "琛ョ敓鎴愬凡鏈夋墭鐩樹笟鍔＄爜锛屽凡鏈夌爜鍊间笉鍙�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-pallet:create')")
+ public CommonResult<Integer> generateBusinessCodes(@Valid @RequestBody
+ cn.iocoder.yudao.module.mes.controller.admin.pro.vo.MesProBusinessCodeGenerateReqVO reqVO) {
+ return success(palletService.generateBusinessCodes(reqVO.getIds()));
+ }
+
+ @PostMapping("/export-business-qr-by-ids")
+ @Operation(summary = "鎸夌紪鍙峰鍑烘墭鐩樹笟鍔＄爜浜岀淮鐮侊紝鍐呭涓虹函涓氬姟鐮佸��")
+ @PreAuthorize("@ss.hasPermission('mes:pro-pallet:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportBusinessQrByIds(@Valid @RequestBody MesProPalletExportQrReqVO reqVO,
+ HttpServletResponse response) throws IOException {
+ List<MesProPalletDO> list = palletService.getPalletListByIds(reqVO.getIds()).stream()
+ .filter(record -> !cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum.CANCELED.getStatus().equals(record.getStatus())).toList();
+ if (CollUtil.isEmpty(list)) throw exception(PRO_PALLET_NOT_EXISTS);
+ QrCodeImageUtils.writeZip(response, "鎵樼洏涓氬姟浜岀淮鐮�", labelAssembler.buildPalletBusinessLabels(list));
+ }
+
+ private List<MesProPalletRespVO> buildPalletRespVOList(List<MesProPalletDO> list) {
+ Map<Long, MesMdmItemDO> items = mdmItemService.getItemMap(convertSet(list, MesProPalletDO::getItemId));
+ return BeanUtils.toBean(list, MesProPalletRespVO.class, vo ->
+ MapUtils.findAndThen(items, vo.getItemId(), item -> { vo.setItemCode(item.getCode()); vo.setItemName(item.getName()); }));
+ }
+
private MesProPalletTraceRespVO buildPalletTraceRespVO(MesProPalletDO pallet) {
MesProPalletTraceRespVO respVO = BeanUtils.toBean(pallet, MesProPalletTraceRespVO.class);
+ respVO.setPendingBagQuantity((int) bagCodeService.getBagCodeListByPalletId(pallet.getId()).stream()
+ .filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() == null).count());
+ if (pallet.getItemId() != null) {
+ MesMdmItemDO item = mdmItemService.getItem(pallet.getItemId());
+ if (item != null) respVO.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
+ }
// 鎵规淇℃伅锛堜复鏃舵墭鐩樻湭缁戝畾鎵规鏃朵负绌烘壒娆★級
MesProBatchDO batch = pallet.getBatchId() == null ? null : batchService.getBatch(pallet.getBatchId());
if (batch != null) {
@@ -241,23 +276,6 @@
return BeanUtils.toBean(list, MesProBagCodeRespVO.class, vo ->
MapUtils.findAndThen(batchMap, vo.getBatchId(), batch ->
vo.setLineCode(batch.getLineCode()).setLineName(batch.getLineName())));
- }
-
- private List<QrLabelInfo> buildPalletQrLabels(List<MesProPalletDO> list) {
- // 鑾峰緱鍏宠仈鏁版嵁锛堟壒娆°�佸搧绉嶃�佽矗浠讳汉锛�
- Map<Long, MesProBatchDO> batchMap = convertMap(
- batchService.getBatchList(convertSet(list, MesProPalletDO::getBatchId)), MesProBatchDO::getId);
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(batchMap.values(), MesProBatchDO::getItemId));
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(batchMap.values(), MesProBatchDO::getOwnerUserId));
- // 鏋勫缓鏍囩
- List<QrLabelInfo> labels = new ArrayList<>(list.size());
- for (MesProPalletDO pallet : list) {
- labels.add(MesProQrLabelBuilder.buildPalletLabel(
- pallet, batchMap.get(pallet.getBatchId()), itemMap, userMap));
- }
- return labels;
}
}
--
Gitblit v1.9.3