Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
cdek-warehouse
Commits
7889f1ab
Commit
7889f1ab
authored
8 years ago
by
Pavel Vinokurov
Browse files
Options
Download
Email Patches
Plain Diff
review notes
parent
309cd633
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/operation/CargoPlaceOperation.java
+1
-0
...m/cdek/transport/model/operation/CargoPlaceOperation.java
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/operation/DocumentOperation.java
+1
-0
...com/cdek/transport/model/operation/DocumentOperation.java
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/sked/SkedToDocumentMap.java
+1
-0
...java/com/cdek/transport/model/sked/SkedToDocumentMap.java
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/impl/WarehouseServiceImpl.java
+2
-0
...om/cdek/warehouse/services/impl/WarehouseServiceImpl.java
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/interceptors/CargoPlaceOperationContext.java
+0
-1
...use/services/interceptors/CargoPlaceOperationContext.java
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/SkedCreator.java
+2
-2
...in/java/com/cdek/warehouse/services/sked/SkedCreator.java
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/SkedDocumentMapper.java
+1
-0
.../com/cdek/warehouse/services/sked/SkedDocumentMapper.java
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/impl/SkedAcceptanceMapper.java
+1
-0
...ek/warehouse/services/sked/impl/SkedAcceptanceMapper.java
with
9 additions
and
3 deletions
+9
-3
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/operation/CargoPlaceOperation.java
View file @
7889f1ab
...
...
@@ -5,6 +5,7 @@ import com.cdek.transport.model.document.DocumentType;
/**
*
*/
//TODO refactor: javadoc
public
abstract
class
CargoPlaceOperation
extends
DocumentOperation
{
/**
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/operation/DocumentOperation.java
View file @
7889f1ab
...
...
@@ -5,6 +5,7 @@ import com.cdek.transport.model.document.DocumentType;
/**
*
*/
//TODO refactor: javadoc
public
abstract
class
DocumentOperation
extends
Operation
{
/**
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-api/src/main/java/com/cdek/transport/model/sked/SkedToDocumentMap.java
View file @
7889f1ab
...
...
@@ -50,6 +50,7 @@ public class SkedToDocumentMap {
documentToSkedMap
.
put
(
SORTER_INCOME
,
skedSorterIncome
);
}
//TODO refactor: может убрать мапу и сделать javadoc
public
static
Map
<
String
,
Integer
>
get
(
DocumentType
documentType
)
{
if
(
null
==
documentType
)
return
new
HashMap
<>();
if
(
documentToSkedMap
.
containsKey
(
documentType
))
{
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/impl/WarehouseServiceImpl.java
View file @
7889f1ab
...
...
@@ -383,6 +383,8 @@ public class WarehouseServiceImpl implements WarehouseService {
return
sked
;
}
//TODO refactor: можно ли как объеденить все методы ниже
//TODO refactor: сделать protected
private
PrimeIncomeCreateOrUpdate
newPrimeIncomeCreateOrUpdate
(
Sked
sked
,
String
userCode
)
{
PrimeIncomeCreateOrUpdate
operation
;
//Опись без идентификатора, значит создаем новую Опись и Документ Первичного Прихода
if
(
sked
.
getUuid
()
==
null
)
{
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/interceptors/CargoPlaceOperationContext.java
View file @
7889f1ab
...
...
@@ -8,7 +8,6 @@ import com.cdek.transport.model.operation.CargoPlaceOperation;
* Контекст для обработчика при выполнении операций с документами
* Операция типа {@link CargoPlaceOperation}
*/
public
class
CargoPlaceOperationContext
extends
ExecutionContext
{
protected
Document
document
;
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/SkedCreator.java
View file @
7889f1ab
package
com.cdek.warehouse.services.sked
;
import
com.cdek.transport.model.document.
*
;
import
com.cdek.transport.model.document.
Document
;
import
com.cdek.transport.model.sked.Sked
;
import
com.cdek.transport.model.sorter.document.SorterIncome
;
/**
* Создает новую опись из Документа
...
...
@@ -11,6 +10,7 @@ import com.cdek.transport.model.sorter.document.SorterIncome;
public
interface
SkedCreator
{
//TODO refactor: javadoc
<
E
extends
Document
>
Sked
createSked
(
final
E
document
);
<
E
extends
Document
>
void
setFields
(
final
Sked
sked
,
final
E
document
);
...
...
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/SkedDocumentMapper.java
View file @
7889f1ab
...
...
@@ -6,6 +6,7 @@ import com.cdek.transport.model.sked.Sked;
/**
*
*/
//TODO refactor:
public
interface
SkedDocumentMapper
{
void
setFields
(
final
Sked
sked
,
final
Document
document
);
}
This diff is collapsed.
Click to expand it.
warehouse-common/warehouse-services/src/main/java/com/cdek/warehouse/services/sked/impl/SkedAcceptanceMapper.java
View file @
7889f1ab
...
...
@@ -9,6 +9,7 @@ import com.cdek.warehouse.services.sked.SkedDocumentMapper;
/**
*
*/
//TODO refactor: javadoc в маппере
public
class
SkedAcceptanceMapper
extends
SkedBaseDocumentMapper
implements
SkedDocumentMapper
{
public
SkedAcceptanceMapper
(
UserService
userService
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help