From 6f507a2a6ff037346b052b2b7ce96ab2910c9735 Mon Sep 17 00:00:00 2001
From: deslrey <deslre0381@gmail.com>
Date: 星期一, 12 一月 2026 11:53:35 +0800
Subject: [PATCH] 外购订单的标签打印功能查询接口及查询
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 112 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 45 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 759ecbb..4c474ec 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -16,6 +16,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StructureItemParameterMapper;
@@ -89,7 +91,6 @@
private StructureItemParameterMapper structureItemParameterMapper;
-
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
public IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
@@ -150,7 +151,7 @@
// 鍒ゆ柇璁㈠崟鏈夋病鏈夌粦瀹氭娊鏍疯鍒�
InsOrder order = insOrderMapper.selectById(orderId);
if (order.getQuarterItemId() != null) {
- // 闇�瑕佹坊鍔犱笅鍙戞椂闂村埌鎶芥牱鏃堕棿, 鍙栨牱浜哄憳灏辨槸妫�娴嬩汉
+ // 闇�瑕佹坊鍔犱笅鍙戞椂闂村埌鎶芥牱鏃堕棿, 鍙栨牱浜哄憳灏辨槸妫�娴嬩汉
SpotCheckQuarterItem spotCheckQuarterItem = spotCheckQuarterItemMapper.selectById(order.getQuarterItemId());
spotCheckQuarterItem.setSpotCheckTime(order.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
User user = userMapper.selectById(userId);
@@ -218,7 +219,7 @@
if (insOrder.getQuarterItemId() != null) {
Long quarterItemCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getQuarterItemId, insOrder.getQuarterItemId())
- .notIn(InsOrder::getState, -1 ,2 ,3));
+ .notIn(InsOrder::getState, -1, 2, 3));
if (quarterItemCount > 0) {
throw new ErrorException("璇ユ娊鏍疯鍒掑凡琚粦瀹氳繃");
}
@@ -314,13 +315,13 @@
});
//鍘熸潗鏂欎笅鍗曟垨澶栬喘鎴愬搧涓嬪崟
- if (Objects.nonNull(insOrder.getTypeSource())&&Objects.nonNull(insOrder.getIfsInventoryId())) {
+ if (Objects.nonNull(insOrder.getTypeSource()) && Objects.nonNull(insOrder.getIfsInventoryId())) {
// 濮旀墭浜哄氨鏄姤妫�浜�, 鐢熶骇鍗曚綅灏辨槸渚涘簲鍟嗗崟浣�
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
User user = userMapper.selectById(declareUserId);
if (user == null) {
- throw new ErrorException("缂哄皯鎶ユ浜轰俊鎭�");
+ throw new ErrorException("缂哄皯鎶ユ浜轰俊鎭�");
}
// 渚涘簲鍟嗗悕绉�
insOrder.setProduction(ifsInventoryQuantity.getSupplierName());
@@ -353,11 +354,11 @@
upInsOrderOfState(insOrder);
// 鍒嗛厤妫�楠屼汉
- String sonLaboratory = insOrder.getTypeSource().equals(1)?"鍘熸潗鏂�":"鎴愬搧瀹為獙瀹�";
+ String sonLaboratory = insOrder.getTypeSource().equals(1) ? "鍘熸潗鏂�" : "鎴愬搧瀹為獙瀹�";
upInsOrder(insOrder.getId(), null, appointed != null ? appointed.toString() : null, SecurityUtils.getUserId().intValue(), sonLaboratory);
//鏄惁涓哄師鏉愭枡涓嬪崟
- if(insOrder.getTypeSource().equals(1)){
+ if (insOrder.getTypeSource().equals(1)) {
// 鏍规嵁闆朵欢鍙峰垽鏂槸鍚︽槸杈呮潗
boolean isRaw = false;
StructureTestObject productObject = insOrderMapper.selectProductByPartNo(ifsInventoryQuantity.getPartNo());
@@ -365,7 +366,7 @@
if (productObject != null && StrUtil.isNotBlank(productObject.getObjectType()) && productObject.getObjectType().equals("1")) {
isRaw = true;
} else {
- // 鏌ヨ瀵硅薄
+ // 鏌ヨ瀵硅薄
StructureTestObject testObject = insOrderMapper.selectByPartNo(ifsInventoryQuantity.getPartNo());
if (testObject != null && StrUtil.isNotBlank(testObject.getObjectType()) && testObject.getObjectType().equals("1")) {
isRaw = true;
@@ -392,7 +393,7 @@
startOfNextQuarter,
endOfQuarter);
- if(count == 0) {
+ if (count == 0) {
ifsInventoryQuantity.setIsFirst(1);
ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId())
@@ -406,6 +407,7 @@
/**
* 娣诲姞妫�楠岄」
+ *
* @param sampleId
* @param productList
*/
@@ -453,6 +455,7 @@
/**
* 瀹℃牳妫�楠屽崟
+ *
* @param insOrder
* @return
*/
@@ -482,7 +485,7 @@
InsOrder::getEntrustCode);
// 鍒ゆ柇鏄惁鏄搴︽楠�, 鏄搴︽楠屽彇娑堝師鏉愭枡瀛ｅ害妫�楠屼笅鍗�
if (InsOrderTypeConstants.QUARTERLY_TEST.equals(order.getOrderType())) {
- ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+ ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.eq(IfsInventoryQuantity::getId, order.getIfsInventoryId())
.set(IfsInventoryQuantity::getIsQuarter, 0));
@@ -492,7 +495,7 @@
.ne(InsOrder::getState, -1)
.eq(InsOrder::getOrderType, InsOrderTypeConstants.ENTER_THE_FACTORY));
if (order1 != null) {
- no = order1.getEntrustCode();
+ no = order1.getEntrustCode();
}
}
@@ -552,13 +555,14 @@
/**
* 鑾峰彇ifs搴撳瓨淇℃伅
+ *
* @param
* @return
*/
@Override
- public void getIfsOrder(Map<String, Object> map,Boolean isSplitOrder) {
+ public void getIfsOrder(Map<String, Object> map, Boolean isSplitOrder) {
List<Map<String, Object>> inventory = ifsApiUtils.getInventory(JSONUtil.toJsonStr(map));
- if(inventory.isEmpty()) {
+ if (inventory.isEmpty()) {
return;
}
// 杩涜淇濆瓨
@@ -566,7 +570,7 @@
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // 鏃堕棿鏍煎紡鍖�
IfsInventoryQuantity ifsInventoryQuantity = new IfsInventoryQuantity();
ifsInventoryQuantity.setContract(map1.get("CONTRACT") == null ? "" : map1.get("CONTRACT").toString()); // 鍩�
- ifsInventoryQuantity.setPartNo(map1.get("PART_NO") == null ? "" : map1.get("PART_NO").toString() ); // 闆朵欢鍙�
+ ifsInventoryQuantity.setPartNo(map1.get("PART_NO") == null ? "" : map1.get("PART_NO").toString()); // 闆朵欢鍙�
ifsInventoryQuantity.setPartDesc(map1.get("PART_DESC") == null ? "" : map1.get("PART_DESC").toString()); // 闆朵欢鎻忚堪
ifsInventoryQuantity.setOrderNo(map1.get("ORDER_NO") == null ? "" : map1.get("ORDER_NO").toString()); // 璁㈠崟鍙�
ifsInventoryQuantity.setLineNo(map1.get("LINE_NO") == null ? "" : map1.get("LINE_NO").toString()); // 琛屽彿
@@ -574,20 +578,20 @@
ifsInventoryQuantity.setReceiptNo(Integer.parseInt(map1.get("RECEIPT_NO") == null ? "" : map1.get("RECEIPT_NO").toString())); // 鎺ユ敹鍙�
ifsInventoryQuantity.setStatus(map1.get("STATE") == null ? "" : map1.get("STATE").toString()); // 鐘舵�佹弿杩�
ifsInventoryQuantity.setStatusDb(map1.get("STATE_DB") == null ? "" : map1.get("STATE_DB").toString()); // 鐘舵��
- if(map1.get("QTY_ARRIVED") != null) {
+ if (map1.get("QTY_ARRIVED") != null) {
ifsInventoryQuantity.setQtyArrived(new BigDecimal(map1.get("QTY_ARRIVED").toString())); // 鎶佃揪鐨勯噰璐暟閲�
}
- if(map1.get("QTY_INSPECTED") != null) {
+ if (map1.get("QTY_INSPECTED") != null) {
ifsInventoryQuantity.setQtyInspected(new BigDecimal(map1.get("QTY_INSPECTED").toString())); // 宸叉楠岀殑璐拱鏁伴噺
}
- if(map1.get("QTY_TO_INSPECT") != null) {
+ if (map1.get("QTY_TO_INSPECT") != null) {
ifsInventoryQuantity.setQtyToInspect(new BigDecimal(map1.get("QTY_TO_INSPECT").toString())); // 瑕佹楠岀殑閲囪喘鏁伴噺
}
- if(map1.get("INV_QTY_IN_STORE") != null) {
+ if (map1.get("INV_QTY_IN_STORE") != null) {
ifsInventoryQuantity.setInvQtyInStore(new BigDecimal(map1.get("INV_QTY_IN_STORE").toString())); // 鎶佃揪鐨勫簱瀛樻暟閲�
}
- if(map1.get("PUR_QTY_IN_STORE") != null) {
- ifsInventoryQuantity.setPurQtyInStore(new BigDecimal( map1.get("PUR_QTY_IN_STORE").toString())); // 鎶佃揪鐨勯噰璐暟閲�
+ if (map1.get("PUR_QTY_IN_STORE") != null) {
+ ifsInventoryQuantity.setPurQtyInStore(new BigDecimal(map1.get("PUR_QTY_IN_STORE").toString())); // 鎶佃揪鐨勯噰璐暟閲�
}
ifsInventoryQuantity.setSupplierId(map1.get("SUPPLIER_ID") == null ? "" : map1.get("SUPPLIER_ID").toString()); // 渚涘簲鍟咺D
@@ -605,21 +609,21 @@
ifsInventoryQuantity.setBuyerCode(map1.get("BUYER_CODE") == null ? "" : map1.get("BUYER_CODE").toString()); // 閲囪喘鍛�
ifsInventoryQuantity.setBuyerName(map1.get("BUYER_NAME") == null ? "" : map1.get("BUYER_NAME").toString()); // 閲囪喘鍛樺悕绉�
- if(map1.get("ARRIVE_DATE") != null) {
- ifsInventoryQuantity.setArriveDate(LocalDateTime.parse(map1.get("ARRIVE_DATE").toString(),dateTimeFormatter)); // 瀹為檯鍒拌揣鏃ユ湡
+ if (map1.get("ARRIVE_DATE") != null) {
+ ifsInventoryQuantity.setArriveDate(LocalDateTime.parse(map1.get("ARRIVE_DATE").toString(), dateTimeFormatter)); // 瀹為檯鍒拌揣鏃ユ湡
}
- if(map1.get("DELIVERY_DATE") != null) {
- ifsInventoryQuantity.setDeliveryDate(LocalDateTime.parse(map1.get("DELIVERY_DATE").toString(),dateTimeFormatter)); // 瀹為檯浜よ揣鏃ユ湡
+ if (map1.get("DELIVERY_DATE") != null) {
+ ifsInventoryQuantity.setDeliveryDate(LocalDateTime.parse(map1.get("DELIVERY_DATE").toString(), dateTimeFormatter)); // 瀹為檯浜よ揣鏃ユ湡
}
- if(map1.get("PRODUCT_DATE") != null) {
- ifsInventoryQuantity.setProductDate(LocalDateTime.parse(map1.get("PRODUCT_DATE").toString(),dateTimeFormatter)); // 鐢熶骇鏃ユ湡
+ if (map1.get("PRODUCT_DATE") != null) {
+ ifsInventoryQuantity.setProductDate(LocalDateTime.parse(map1.get("PRODUCT_DATE").toString(), dateTimeFormatter)); // 鐢熶骇鏃ユ湡
}
- if(map1.get("INVALID_DATE") != null) {
- ifsInventoryQuantity.setInvalidDate(LocalDateTime.parse(map1.get("INVALID_DATE").toString(),dateTimeFormatter)); // 澶辨晥鏃ユ湡
+ if (map1.get("INVALID_DATE") != null) {
+ ifsInventoryQuantity.setInvalidDate(LocalDateTime.parse(map1.get("INVALID_DATE").toString(), dateTimeFormatter)); // 澶辨晥鏃ユ湡
}
- if(map1.get("APPROVED_DATE") != null) {
- ifsInventoryQuantity.setApprovedDate(LocalDateTime.parse(map1.get("APPROVED_DATE").toString(),dateTimeFormatter)); // 瀹℃壒鏃ユ湡
+ if (map1.get("APPROVED_DATE") != null) {
+ ifsInventoryQuantity.setApprovedDate(LocalDateTime.parse(map1.get("APPROVED_DATE").toString(), dateTimeFormatter)); // 瀹℃壒鏃ユ湡
}
ifsInventoryQuantity.setReqCeater(map1.get("REQ_CEATER") == null ? "" : map1.get("REQ_CEATER").toString()); // 閲囪喘鐢宠鍒涘缓浜�
ifsInventoryQuantity.setReqCeaterName(map1.get("REQ_CEATER_NAME") == null ? "" : map1.get("REQ_CEATER_NAME").toString()); // 閲囪喘鐢宠鍒涘缓浜哄悕绉�
@@ -641,9 +645,9 @@
.eq(IfsInventoryQuantity::getWaivDevRejNo, ifsInventoryQuantity.getWaivDevRejNo())
.eq(IfsInventoryQuantity::getActivitySeq, ifsInventoryQuantity.getActivitySeq())
);
- if(count == 0) {
+ if (count == 0) {
ifsInventoryQuantity.setIsFirst(0);
- if(isSplitOrder){
+ if (isSplitOrder) {
ifsInventoryQuantity.setIsSplitOrder(1);
}
//todo:涓嶆竻妤氱敤閫旓紝鏆傛椂娉ㄩ噴鎺�
@@ -660,8 +664,9 @@
/**
* id鏄師鏉愭枡鐨刬d
- *
+ * <p>
* 淇敼璁㈠崟鍗曞彿
+ *
* @param insOrder
*/
@Override
@@ -674,7 +679,7 @@
List<Integer> insOrderIds = insOrders.stream().map(InsOrder::getId).collect(Collectors.toList());
Long count = insReportMapper.selectCount(Wrappers.<InsReport>lambdaQuery()
.in(InsReport::getInsOrderId, insOrderIds));
- if (count > 0 ) {
+ if (count > 0) {
throw new ErrorException("褰撳墠璁㈠崟宸茬粡鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀圭紪鍙�");
}
@@ -726,6 +731,7 @@
/**
* 淇敼閲囪喘璁㈠崟鎺ユ敹鐘舵��, 閬垮厤鍥炴粴
+ *
* @param id
*/
@Transactional
@@ -737,6 +743,7 @@
/**
* 鏂板閾滃崟涓濅笅鍗�
+ *
* @param list
* @param insOrder
* @return
@@ -822,6 +829,7 @@
/**
* 淇敼濮旀墭涓嬪崟缂栧彿
+ *
* @param insOrder
*/
@Override
@@ -829,7 +837,7 @@
// 鍒ゆ柇褰撳墠璁㈠崟鏄惁鐢熸垚浜嗘姤鍛�, 鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀瑰崟鍙�
Long count = insReportMapper.selectCount(Wrappers.<InsReport>lambdaQuery()
.eq(InsReport::getInsOrderId, insOrder.getId()));
- if (count > 0 ) {
+ if (count > 0) {
throw new ErrorException("褰撳墠璁㈠崟宸茬粡鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀圭紪鍙�");
}
@@ -872,6 +880,7 @@
/**
* 淇敼妫�楠屼笅鍗曞唴瀹�
+ *
* @param insOrderUpdateDto
* @return
*/
@@ -897,6 +906,7 @@
/**
* 鎴愬搧鏍囩鎵撳嵃
+ *
* @param ids
* @return
*/
@@ -905,8 +915,14 @@
return insOrderMapper.labelOrderPrinting(ids);
}
+ @Override
+ public List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids) {
+ return insOrderMapper.labelOutsideOrderPrinting(ids);
+ }
+
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�
+ *
* @param insSampleId
* @return
*/
@@ -935,6 +951,7 @@
/**
* 娣诲姞閬楁紡鐨勬楠岄」
+ *
* @param omitOrderProductDto
* @return
*/
@@ -970,6 +987,7 @@
/**
* 鎴愬搧妫�楠屽崟瀵煎嚭
+ *
* @param sampleOrderDto
* @param response
*/
@@ -993,7 +1011,7 @@
// 鍒ゆ柇鏄惁鏄笉鍚堟牸, 涓嶅悎鏍兼煡璇笉鍚堟牸椤�
for (SampleOrderDto orderDto : sampleOrderDtoList) {
- if (orderDto.getInsResult() != null && orderDto.getInsResult() == 0){
+ if (orderDto.getInsResult() != null && orderDto.getInsResult() == 0) {
// 鏌ヨ涓嶅悎鏍奸」
List<String> unqualifiedList = insProductMapper.selectUnqualifiedList(orderDto.getId());
orderDto.setUnqualifiedItem(CollUtil.join(unqualifiedList, ","));
@@ -1024,6 +1042,7 @@
/**
* 淇敼鏍峰搧鍨嬪彿
+ *
* @param insSample
*/
@Override
@@ -1031,7 +1050,7 @@
// 鍒ゆ柇褰撳墠璁㈠崟鏄惁鐢熸垚浜嗘姤鍛�, 鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀瑰崟鍙�
Long count = insReportMapper.selectCount(Wrappers.<InsReport>lambdaQuery()
.eq(InsReport::getInsOrderId, insSample.getInsOrderId()));
- if (count > 0 ) {
+ if (count > 0) {
throw new ErrorException("褰撳墠璁㈠崟宸茬粡鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀圭紪鍙�");
}
@@ -1042,6 +1061,7 @@
/**
* 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�
+ *
* @param sampleList
* @param insOrder
* @return
@@ -1052,7 +1072,7 @@
if (insOrder.getQuarterItemId() != null) {
Long quarterItemCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getQuarterItemId, insOrder.getQuarterItemId())
- .notIn(InsOrder::getState, -1 ,2 ,3));
+ .notIn(InsOrder::getState, -1, 2, 3));
if (quarterItemCount > 0) {
throw new ErrorException("璇ユ娊鏍疯鍒掑凡琚粦瀹氳繃");
}
@@ -1159,11 +1179,12 @@
/**
* ifs绉诲簱鎿嶄綔
+ *
* @param inventoryQuantity
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
public String moveRawMaterial(IfsInventoryQuantity inventoryQuantity) {
//鏌ヨifs璁㈠崟璇︽儏
IfsInventoryQuantity one = ifsInventoryQuantityMapper.selectById(inventoryQuantity.getId());
@@ -1188,7 +1209,7 @@
throw new ErrorException("IFS鐧昏閲囪喘妫�楠岀粨鏋滃け璐�: " + result.getMessage());
}
//濡傛灉鏄媶鍒嗚鍗曪紝鍒欏皢鍚屼竴鎺ユ敹鍙风殑璁㈠崟鏍囪宸茬櫥璁版牎楠�
- if(one.getIsSplitOrder()==1){
+ if (one.getIsSplitOrder() == 1) {
//鏌ヨ鍏朵綑鎷嗗垎鐨勮鍗�
List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
.eq(IfsInventoryQuantity::getOrderNo, one.getOrderNo())
@@ -1198,15 +1219,15 @@
.eq(IfsInventoryQuantity::getReceiptNo, one.getReceiptNo())
.eq(IfsInventoryQuantity::getIsSplitOrder, 1)
);
- if(Objects.nonNull(quantityList) && !quantityList.isEmpty()){
+ if (Objects.nonNull(quantityList) && !quantityList.isEmpty()) {
//淇敼閲囪喘璁㈠崟鐧昏鐘舵��
List<Long> ids = quantityList.stream().map(IfsInventoryQuantity::getId).collect(Collectors.toList());
- ifsInventoryQuantityMapper.update(null,Wrappers.<IfsInventoryQuantity>lambdaUpdate()
- .set(IfsInventoryQuantity::getIsRegister,1)
+ ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+ .set(IfsInventoryQuantity::getIsRegister, 1)
.in(IfsInventoryQuantity::getId, ids)
);
}
- }else{
+ } else {
this.updateIfsInventoryQuantity(one.getId());
}
}
@@ -1215,7 +1236,7 @@
*/
// 妫�楠屽悗绉诲簱
//1301:鍘熸潗鏂欏悎鏍煎簱锛孋P-02-001:鎴愬搧搴�
- toLocation = StringUtils.equals(inventoryQuantity.getOrderType(), OrderType.RAW.getValue())?"1301":"CP-02-001";
+ toLocation = StringUtils.equals(inventoryQuantity.getOrderType(), OrderType.RAW.getValue()) ? "1301" : "CP-02-001";
Map<String, Object> moveResultMap = new HashMap<>();
List<Map<String, Object>> moveResultList = new ArrayList<>();
Map<String, Object> moveMap = new HashMap<>();
@@ -1254,6 +1275,7 @@
/**
* 鍏堜慨鏀归噰璐鍗曟壒娆″彿, 鍚庤繘琛岀Щ搴撴搷浣�
+ *
* @param one
* @param toLocation
*/
--
Gitblit v1.9.3