Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
bailuntec-api
Commits
d20c1637
Commit
d20c1637
authored
Jul 09, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
b2cc5120
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
143 additions
and
35 deletions
+143
-35
MjcgApi.java
src/main/java/com/bailuntec/api/bailuntec/mjcg/MjcgApi.java
+15
-0
MjcgResult.java
...ava/com/bailuntec/api/bailuntec/mjcg/resp/MjcgResult.java
+16
-0
SemiPurchaseDetailDTO.java
...luntec/api/bailuntec/mjcg/resp/SemiPurchaseDetailDTO.java
+47
-0
SemiPurchaseDetailPageInfoDTO.java
...pi/bailuntec/mjcg/resp/SemiPurchaseDetailPageInfoDTO.java
+26
-0
LogisticsSupplierTransactionDTO.java
...luntec/purchase/resp/LogisticsSupplierTransactionDTO.java
+13
-11
PurchaseResult.java
...bailuntec/api/bailuntec/purchase/resp/PurchaseResult.java
+4
-4
SupplierTransactionDTO.java
...c/api/bailuntec/purchase/resp/SupplierTransactionDTO.java
+22
-20
No files found.
src/main/java/com/bailuntec/api/bailuntec/mjcg/MjcgApi.java
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
mjcg
;
import
com.bailuntec.api.bailuntec.mjcg.resp.MjcgResult
;
import
com.bailuntec.api.bailuntec.mjcg.resp.SemiPurchaseDetailPageInfoDTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.time.LocalDate
;
/**
* <p>
*
...
...
@@ -8,5 +16,12 @@ package com.bailuntec.api.bailuntec.mjcg;
* @author robbendev
* @since 2020/10/6 3:45 下午
*/
@FeignClient
(
name
=
"mjcg"
,
url
=
"http://mjcg.bailuntec.com"
)
public
interface
MjcgApi
{
@GetMapping
(
"/api/BuyDetailList"
)
MjcgResult
<
SemiPurchaseDetailPageInfoDTO
>
GetBuyDetailList
(
@RequestParam
(
"btime"
)
LocalDate
btime
,
@RequestParam
(
"etime"
)
LocalDate
etime
,
@RequestParam
(
"page"
)
int
page
,
@RequestParam
(
"rows"
)
int
rows
);
}
src/main/java/com/bailuntec/api/bailuntec/mjcg/resp/MjcgResult.java
0 → 100644
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
mjcg
.
resp
;
import
lombok.Data
;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public
class
MjcgResult
<
T
>
{
private
Boolean
result
;
private
String
msg
;
private
T
list
;
}
src/main/java/com/bailuntec/api/bailuntec/mjcg/resp/SemiPurchaseDetailDTO.java
0 → 100644
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
mjcg
.
resp
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public
class
SemiPurchaseDetailDTO
{
@JsonProperty
(
"buy_id"
)
private
Integer
buyId
;
@JsonProperty
(
"detail_id"
)
private
Integer
detailId
;
@JsonProperty
(
"no"
)
private
String
buyNo
;
@JsonProperty
(
"supplier_id"
)
private
Integer
supplierId
;
@JsonProperty
(
"supplier_name"
)
private
String
supplierName
;
@JsonProperty
(
"sku_code"
)
private
String
skuCode
;
@JsonProperty
(
"sku_name"
)
private
String
skuName
;
@JsonProperty
(
"warehouse_id"
)
private
Integer
warehouseId
;
@JsonProperty
(
"warehouse_name"
)
private
String
warehouseName
;
@JsonProperty
(
"ontheway_quantity"
)
private
BigDecimal
transferQuantity
;
@JsonProperty
(
"unit_price"
)
private
BigDecimal
unitPrice
;
@JsonProperty
(
"update_date_str"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDate
semiUpdateDate
;
@JsonProperty
(
"sku_del_status"
)
private
Integer
skuDelStatus
;
@JsonProperty
(
"purchase_del_status"
)
private
Integer
purchaseDelStatus
;
}
src/main/java/com/bailuntec/api/bailuntec/mjcg/resp/SemiPurchaseDetailPageInfoDTO.java
0 → 100644
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
mjcg
.
resp
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public
class
SemiPurchaseDetailPageInfoDTO
{
@JsonProperty
(
"CurrentPage"
)
private
Integer
currentPage
;
@JsonProperty
(
"TotalPages"
)
private
Integer
totalPages
;
@JsonProperty
(
"TotalItems"
)
private
Integer
totalItems
;
@JsonProperty
(
"ItemsPerPage"
)
private
Integer
itemsPerPage
;
@JsonProperty
(
"Items"
)
private
List
<
SemiPurchaseDetailDTO
>
items
;
}
src/main/java/com/bailuntec/api/bailuntec/purchase/resp/LogisticsSupplierTransactionDTO.java
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
purchase
.
resp
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
...
...
@@ -14,24 +15,25 @@ import java.time.LocalDate;
*/
@Data
public
class
LogisticsSupplierTransactionDTO
{
@J
SONField
(
name
=
"SupplierId"
)
@J
sonProperty
(
"SupplierId"
)
private
Integer
supplierId
;
@J
SONField
(
name
=
"SupplierName"
)
@J
sonProperty
(
"SupplierName"
)
private
String
supplierName
;
@J
SONField
(
name
=
"PayCompanyId"
)
@J
sonProperty
(
"PayCompanyId"
)
private
Integer
payCompanyValue
;
@J
SONField
(
name
=
"PayCompanyName"
)
@J
sonProperty
(
"PayCompanyName"
)
private
String
payCompanyName
;
@J
SONField
(
name
=
"StartAmount"
)
@J
sonProperty
(
"StartAmount"
)
private
BigDecimal
startAmount
;
@J
SONField
(
name
=
"EndAmount"
)
@J
sonProperty
(
"EndAmount"
)
private
BigDecimal
endAmount
;
@J
SONField
(
name
=
"BorrowAmount"
)
@J
sonProperty
(
"BorrowAmount"
)
private
BigDecimal
borrowAmount
;
@J
SONField
(
name
=
"LoanAmount"
)
@J
sonProperty
(
"LoanAmount"
)
private
BigDecimal
loanAmount
;
@J
SONField
(
name
=
"Type"
)
@J
sonProperty
(
"Type"
)
private
String
type
;
@JSONField
(
name
=
"Day"
,
format
=
"yyyy/MM/dd HH:mm:ss"
)
@JsonProperty
(
"str_Day"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
LocalDate
day
;
}
src/main/java/com/bailuntec/api/bailuntec/purchase/resp/PurchaseResult.java
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
purchase
.
resp
;
import
com.
alibaba.fastjson.annotation.JSONField
;
import
com.
fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
/**
...
...
@@ -14,10 +14,10 @@ import lombok.Data;
@Data
public
class
PurchaseResult
<
T
>
{
@J
SONField
(
name
=
"IsSuccessed"
)
@J
sonProperty
(
"IsSuccessed"
)
private
Boolean
isSuccessed
;
@J
SONField
(
name
=
"Message"
)
@J
sonProperty
(
"Message"
)
private
String
message
;
@J
SONField
(
name
=
"Data"
)
@J
sonProperty
(
"Data"
)
private
T
data
;
}
src/main/java/com/bailuntec/api/bailuntec/purchase/resp/SupplierTransactionDTO.java
View file @
d20c1637
package
com
.
bailuntec
.
api
.
bailuntec
.
purchase
.
resp
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
...
...
@@ -14,42 +15,43 @@ import java.time.LocalDate;
*/
@Data
public
class
SupplierTransactionDTO
{
@J
SONField
(
name
=
"PayCompanyId"
)
@J
sonProperty
(
"PayCompanyId"
)
private
Integer
payCompanyValue
;
@J
SONField
(
name
=
"PayCompanyName"
)
@J
sonProperty
(
"PayCompanyName"
)
private
String
payCompanyName
;
@J
SONField
(
name
=
"SupplierId"
)
@J
sonProperty
(
"SupplierId"
)
private
Integer
supplierId
;
@J
SONField
(
name
=
"SupplierName"
)
@J
sonProperty
(
"SupplierName"
)
private
String
supplierName
;
@J
SONField
(
name
=
"ParentSupplierId"
)
@J
sonProperty
(
"ParentSupplierId"
)
private
Integer
parentSupplierId
;
@J
SONField
(
name
=
"ParentSupplierName"
)
@J
sonProperty
(
"ParentSupplierName"
)
private
String
parentSupplierName
;
@J
SONField
(
name
=
"PutinAmount"
)
@J
sonProperty
(
"PutinAmount"
)
private
BigDecimal
puttingAmount
;
@J
SONField
(
name
=
"ExpressAmount"
)
@J
sonProperty
(
"ExpressAmount"
)
private
BigDecimal
expressAmount
;
@J
SONField
(
name
=
"PayAmount"
)
@J
sonProperty
(
"PayAmount"
)
private
BigDecimal
payAmount
;
@J
SONField
(
name
=
"ReturnAmount"
)
@J
sonProperty
(
"ReturnAmount"
)
private
BigDecimal
returnAmount
;
@J
SONField
(
name
=
"ReturnExpress"
)
@J
sonProperty
(
"ReturnExpress"
)
private
BigDecimal
returnExpress
;
@J
SONField
(
name
=
"ReceviceAmount"
)
@J
sonProperty
(
"ReceviceAmount"
)
private
BigDecimal
receiveAmount
;
@J
SONField
(
name
=
"AdjustAmount"
)
@J
sonProperty
(
"AdjustAmount"
)
private
BigDecimal
adjustAmount
;
@J
SONField
(
name
=
"StartAmount"
)
@J
sonProperty
(
"StartAmount"
)
private
BigDecimal
startAmount
;
@J
SONField
(
name
=
"EndAmount"
)
@J
sonProperty
(
"EndAmount"
)
private
BigDecimal
endAmount
;
@JSONField
(
name
=
"Day"
,
format
=
"yyyy/MM/dd HH:mm:ss"
)
@JsonProperty
(
"str_Day"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
LocalDate
day
;
@J
SONField
(
name
=
"Types"
)
@J
sonProperty
(
"Types"
)
private
Integer
types
;
@J
SONField
(
name
=
"IsFinish"
)
@J
sonProperty
(
"IsFinish"
)
private
Integer
isFinish
;
@J
SONField
(
name
=
"DelayNoPayAmount"
)
@J
sonProperty
(
"DelayNoPayAmount"
)
private
BigDecimal
delayNoPayAmount
;
}
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