|
|
@ -9,6 +9,7 @@ import com.gaotao.modules.handlingunit.service.HandlingUnitIdLogService; |
|
|
import com.gaotao.modules.handlingunit.dao.HandlingUnitMapper; |
|
|
import com.gaotao.modules.handlingunit.dao.HandlingUnitMapper; |
|
|
import com.gaotao.modules.sys.controller.AbstractController; |
|
|
import com.gaotao.modules.sys.controller.AbstractController; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
@ -212,44 +213,11 @@ public class PdaLabelController extends AbstractController { |
|
|
|
|
|
|
|
|
// 6. 创建新标签(复制原标签所有信息,只修改数量) |
|
|
// 6. 创建新标签(复制原标签所有信息,只修改数量) |
|
|
HandlingUnit newUnit = new HandlingUnit(); |
|
|
HandlingUnit newUnit = new HandlingUnit(); |
|
|
|
|
|
BeanUtils.copyProperties(originalUnit, newUnit); |
|
|
newUnit.setUnitId(newUnitId); |
|
|
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.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.setSourceType("SPLIT"); // 来源类型:拆分 |
|
|
newUnit.setSourceRef(unitId); // 原标签编码 |
|
|
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.setCreatedDate(new Date()); |
|
|
newUnit.setCreatedBy(operatorName); |
|
|
newUnit.setCreatedBy(operatorName); |
|
|
newUnit.setModifiedDate(new Date()); |
|
|
newUnit.setModifiedDate(new Date()); |
|
|
@ -282,7 +250,6 @@ public class PdaLabelController extends AbstractController { |
|
|
originalUnit.setQty(remainQty); |
|
|
originalUnit.setQty(remainQty); |
|
|
originalUnit.setModifiedDate(new Date()); |
|
|
originalUnit.setModifiedDate(new Date()); |
|
|
originalUnit.setModifiedBy(operatorName); |
|
|
originalUnit.setModifiedBy(operatorName); |
|
|
originalUnit.setRemark("拆分出标签 " + newUnitId + ",数量: " + splitQty); |
|
|
|
|
|
|
|
|
|
|
|
boolean updateResult = handlingUnitService.updateById(originalUnit); |
|
|
boolean updateResult = handlingUnitService.updateById(originalUnit); |
|
|
if (!updateResult) { |
|
|
if (!updateResult) { |
|
|
|