From 320339f7d14dcc6e946e31f83cc64f355f0f1303 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 18 Dec 2025 15:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PdaLabelController.java | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java index 04f9308..a925289 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java +++ b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java @@ -9,6 +9,7 @@ import com.gaotao.modules.handlingunit.service.HandlingUnitIdLogService; import com.gaotao.modules.handlingunit.dao.HandlingUnitMapper; import com.gaotao.modules.sys.controller.AbstractController; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -212,44 +213,11 @@ public class PdaLabelController extends AbstractController { // 6. 创建新标签(复制原标签所有信息,只修改数量) HandlingUnit newUnit = new HandlingUnit(); + BeanUtils.copyProperties(originalUnit, newUnit); newUnit.setUnitId(newUnitId); - newUnit.setSite(site); - newUnit.setParentUnitId(originalUnit.getParentUnitId()); - newUnit.setUnitType(originalUnit.getUnitType()); - newUnit.setUnitTypeDb(originalUnit.getUnitTypeDb()); - newUnit.setPartNo(originalUnit.getPartNo()); - newUnit.setPartDesc(originalUnit.getPartDesc()); newUnit.setQty(splitQty); // 新标签数量 - newUnit.setBatchNo(originalUnit.getBatchNo()); - newUnit.setLocationId(originalUnit.getLocationId()); - newUnit.setWarehouseId(originalUnit.getWarehouseId()); - newUnit.setWdr(originalUnit.getWdr()); - newUnit.setAvailabilityControlId(originalUnit.getAvailabilityControlId()); - newUnit.setStatus(originalUnit.getStatus()); - newUnit.setStatusDb(originalUnit.getStatusDb()); - newUnit.setFreezeFlag(originalUnit.getFreezeFlag()); - newUnit.setMergedFlag(originalUnit.getMergedFlag()); - newUnit.setInStockFlag("Y"); - newUnit.setOrderRef1(originalUnit.getOrderRef1()); - newUnit.setOrderRef2(originalUnit.getOrderRef2()); - newUnit.setOrderRef3(originalUnit.getOrderRef3()); - newUnit.setSupplierId(originalUnit.getSupplierId()); - newUnit.setCustomerId(originalUnit.getCustomerId()); - newUnit.setManufactureDate(originalUnit.getManufactureDate()); - newUnit.setExpiredDate(originalUnit.getExpiredDate()); newUnit.setSourceType("SPLIT"); // 来源类型:拆分 newUnit.setSourceRef(unitId); // 原标签编码 - newUnit.setGrossWeight(originalUnit.getGrossWeight()); - newUnit.setNetWeight(originalUnit.getNetWeight()); - newUnit.setWeightUnit(originalUnit.getWeightUnit()); - newUnit.setVolume(originalUnit.getVolume()); - newUnit.setVolumeUnit(originalUnit.getVolumeUnit()); - newUnit.setBarCode(newUnitId); - newUnit.setQrCode(newUnitId); - newUnit.setOriginalQty(splitQty); - newUnit.setReceiveDate(originalUnit.getReceiveDate()); - newUnit.setEngChgLevel(originalUnit.getEngChgLevel()); - newUnit.setReserveFlag("N"); newUnit.setCreatedDate(new Date()); newUnit.setCreatedBy(operatorName); newUnit.setModifiedDate(new Date()); @@ -282,7 +250,6 @@ public class PdaLabelController extends AbstractController { originalUnit.setQty(remainQty); originalUnit.setModifiedDate(new Date()); originalUnit.setModifiedBy(operatorName); - originalUnit.setRemark("拆分出标签 " + newUnitId + ",数量: " + splitQty); boolean updateResult = handlingUnitService.updateById(originalUnit); if (!updateResult) {