Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
1cd92926
提交
1cd92926
编写于
11月 02, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码 [Spring Boot]
上级
9f40f2c6
变更
10
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
3 行增加
和
530 行删除
+3
-530
Res_partnerServiceImpl.java
...l/core/odoo_base/service/impl/Res_partnerServiceImpl.java
+0
-5
Product_putawayServiceImpl.java
...odoo_product/service/impl/Product_putawayServiceImpl.java
+0
-5
Stock_location.java
...usinesscentral/core/odoo_stock/domain/Stock_location.java
+0
-93
Stock_locationSearchContext.java
...l/core/odoo_stock/filter/Stock_locationSearchContext.java
+0
-63
Stock_locationMapper.java
...scentral/core/odoo_stock/mapper/Stock_locationMapper.java
+0
-6
IStock_locationService.java
...ntral/core/odoo_stock/service/IStock_locationService.java
+0
-11
Stock_locationServiceImpl.java
...re/odoo_stock/service/impl/Stock_locationServiceImpl.java
+0
-92
Stock_locationMapper.xml
...mapper/odoo_stock/stock_location/Stock_locationMapper.xml
+3
-36
iBizBusinessCentral.json
...core/src/main/resources/sysmodel/iBizBusinessCentral.json
+0
-141
Stock_locationDTO.java
...n/ibizlab/businesscentral/core/dto/Stock_locationDTO.java
+0
-78
未找到文件。
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_partnerServiceImpl.java
浏览文件 @
1cd92926
...
...
@@ -259,9 +259,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_inventoryService
stockInventoryService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_locationService
stockLocationService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_move_lineService
stockMoveLineService
;
@Autowired
@Lazy
...
...
@@ -461,7 +458,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
snailmailLetterService
.
resetByPartnerId
(
key
);
stockInventoryLineService
.
resetByPartnerId
(
key
);
stockInventoryService
.
resetByPartnerId
(
key
);
stockLocationService
.
resetByPartnerId
(
key
);
stockMoveLineService
.
resetByOwnerId
(
key
);
stockMoveService
.
resetByPartnerId
(
key
);
stockMoveService
.
resetByRestrictPartnerId
(
key
);
...
...
@@ -568,7 +564,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
snailmailLetterService
.
resetByPartnerId
(
idList
);
stockInventoryLineService
.
resetByPartnerId
(
idList
);
stockInventoryService
.
resetByPartnerId
(
idList
);
stockLocationService
.
resetByPartnerId
(
idList
);
stockMoveLineService
.
resetByOwnerId
(
idList
);
stockMoveService
.
resetByPartnerId
(
idList
);
stockMoveService
.
resetByRestrictPartnerId
(
idList
);
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_putawayServiceImpl.java
浏览文件 @
1cd92926
...
...
@@ -56,9 +56,6 @@ public class Product_putawayServiceImpl extends EBSServiceImpl<Product_putawayMa
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_fixed_putaway_stratService
stockFixedPutawayStratService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_locationService
stockLocationService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
service
.
IRes_usersService
resUsersService
;
protected
int
batchSize
=
500
;
...
...
@@ -132,7 +129,6 @@ public class Product_putawayServiceImpl extends EBSServiceImpl<Product_putawayMa
@Transactional
public
boolean
remove
(
Long
key
)
{
stockFixedPutawayStratService
.
resetByPutawayId
(
key
);
stockLocationService
.
resetByPutawayStrategyId
(
key
);
boolean
result
=
removeById
(
key
);
return
result
;
}
...
...
@@ -141,7 +137,6 @@ public class Product_putawayServiceImpl extends EBSServiceImpl<Product_putawayMa
@Transactional
public
void
removeBatch
(
Collection
<
Long
>
idList
)
{
stockFixedPutawayStratService
.
resetByPutawayId
(
idList
);
stockLocationService
.
resetByPutawayStrategyId
(
idList
);
removeByIds
(
idList
);
}
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_location.java
浏览文件 @
1cd92926
...
...
@@ -186,13 +186,6 @@ public class Stock_location extends EntityMP implements Serializable {
@JSONField
(
name
=
"child_ids"
)
@JsonProperty
(
"child_ids"
)
private
String
childIds
;
/**
* 上级位置
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"location_id_text"
)
@JsonProperty
(
"location_id_text"
)
private
String
locationIdText
;
/**
* 公司
*/
...
...
@@ -214,13 +207,6 @@ public class Stock_location extends EntityMP implements Serializable {
@JSONField
(
name
=
"valuation_out_account_id_text"
)
@JsonProperty
(
"valuation_out_account_id_text"
)
private
String
valuationOutAccountIdText
;
/**
* 所有者
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"partner_id_text"
)
@JsonProperty
(
"partner_id_text"
)
private
String
partnerIdText
;
/**
* 下架策略
*/
...
...
@@ -228,13 +214,6 @@ public class Stock_location extends EntityMP implements Serializable {
@JSONField
(
name
=
"removal_strategy_id_text"
)
@JsonProperty
(
"removal_strategy_id_text"
)
private
String
removalStrategyIdText
;
/**
* 上架策略
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"putaway_strategy_id_text"
)
@JsonProperty
(
"putaway_strategy_id_text"
)
private
String
putawayStrategyIdText
;
/**
* 最后更新者
*/
...
...
@@ -281,14 +260,6 @@ public class Stock_location extends EntityMP implements Serializable {
@JSONField
(
name
=
"company_id"
)
@JsonProperty
(
"company_id"
)
private
Long
companyId
;
/**
* 上级位置
*/
@DEField
(
name
=
"location_id"
)
@TableField
(
value
=
"location_id"
)
@JSONField
(
name
=
"location_id"
)
@JsonProperty
(
"location_id"
)
private
Long
locationId
;
/**
* 库存计价科目(出向)
*/
...
...
@@ -297,22 +268,6 @@ public class Stock_location extends EntityMP implements Serializable {
@JSONField
(
name
=
"valuation_out_account_id"
)
@JsonProperty
(
"valuation_out_account_id"
)
private
Long
valuationOutAccountId
;
/**
* 所有者
*/
@DEField
(
name
=
"partner_id"
)
@TableField
(
value
=
"partner_id"
)
@JSONField
(
name
=
"partner_id"
)
@JsonProperty
(
"partner_id"
)
private
Long
partnerId
;
/**
* 上架策略
*/
@DEField
(
name
=
"putaway_strategy_id"
)
@TableField
(
value
=
"putaway_strategy_id"
)
@JSONField
(
name
=
"putaway_strategy_id"
)
@JsonProperty
(
"putaway_strategy_id"
)
private
Long
putawayStrategyId
;
/**
* 下架策略
*/
...
...
@@ -338,14 +293,6 @@ public class Stock_location extends EntityMP implements Serializable {
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_account
.
domain
.
Account_account
odooValuationOutAccount
;
/**
*
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
domain
.
Product_putaway
odooPutawayStrategy
;
/**
*
*/
...
...
@@ -362,14 +309,6 @@ public class Stock_location extends EntityMP implements Serializable {
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_company
odooCompany
;
/**
*
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_partner
odooPartner
;
/**
*
*/
...
...
@@ -386,14 +325,6 @@ public class Stock_location extends EntityMP implements Serializable {
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_users
odooWrite
;
/**
*
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
domain
.
Stock_location
odooLocation
;
/**
...
...
@@ -508,14 +439,6 @@ public class Stock_location extends EntityMP implements Serializable {
this
.
modify
(
"company_id"
,
companyId
);
}
/**
* 设置 [上级位置]
*/
public
void
setLocationId
(
Long
locationId
){
this
.
locationId
=
locationId
;
this
.
modify
(
"location_id"
,
locationId
);
}
/**
* 设置 [库存计价科目(出向)]
*/
...
...
@@ -524,22 +447,6 @@ public class Stock_location extends EntityMP implements Serializable {
this
.
modify
(
"valuation_out_account_id"
,
valuationOutAccountId
);
}
/**
* 设置 [所有者]
*/
public
void
setPartnerId
(
Long
partnerId
){
this
.
partnerId
=
partnerId
;
this
.
modify
(
"partner_id"
,
partnerId
);
}
/**
* 设置 [上架策略]
*/
public
void
setPutawayStrategyId
(
Long
putawayStrategyId
){
this
.
putawayStrategyId
=
putawayStrategyId
;
this
.
modify
(
"putaway_strategy_id"
,
putawayStrategyId
);
}
/**
* 设置 [下架策略]
*/
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/filter/Stock_locationSearchContext.java
浏览文件 @
1cd92926
...
...
@@ -40,20 +40,6 @@ public class Stock_locationSearchContext extends QueryWrapperContext<Stock_locat
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_usage_eq
)){
this
.
getSearchCond
().
eq
(
"usage"
,
n_usage_eq
);
}
}
private
String
n_location_id_text_eq
;
//[上级位置]
public
void
setN_location_id_text_eq
(
String
n_location_id_text_eq
)
{
this
.
n_location_id_text_eq
=
n_location_id_text_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_location_id_text_eq
)){
this
.
getSearchCond
().
eq
(
"location_id_text"
,
n_location_id_text_eq
);
}
}
private
String
n_location_id_text_like
;
//[上级位置]
public
void
setN_location_id_text_like
(
String
n_location_id_text_like
)
{
this
.
n_location_id_text_like
=
n_location_id_text_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_location_id_text_like
)){
this
.
getSearchCond
().
like
(
"location_id_text"
,
n_location_id_text_like
);
}
}
private
String
n_company_id_text_eq
;
//[公司]
public
void
setN_company_id_text_eq
(
String
n_company_id_text_eq
)
{
...
...
@@ -96,20 +82,6 @@ public class Stock_locationSearchContext extends QueryWrapperContext<Stock_locat
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_valuation_out_account_id_text_like
)){
this
.
getSearchCond
().
like
(
"valuation_out_account_id_text"
,
n_valuation_out_account_id_text_like
);
}
}
private
String
n_partner_id_text_eq
;
//[所有者]
public
void
setN_partner_id_text_eq
(
String
n_partner_id_text_eq
)
{
this
.
n_partner_id_text_eq
=
n_partner_id_text_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_partner_id_text_eq
)){
this
.
getSearchCond
().
eq
(
"partner_id_text"
,
n_partner_id_text_eq
);
}
}
private
String
n_partner_id_text_like
;
//[所有者]
public
void
setN_partner_id_text_like
(
String
n_partner_id_text_like
)
{
this
.
n_partner_id_text_like
=
n_partner_id_text_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_partner_id_text_like
)){
this
.
getSearchCond
().
like
(
"partner_id_text"
,
n_partner_id_text_like
);
}
}
private
String
n_removal_strategy_id_text_eq
;
//[下架策略]
public
void
setN_removal_strategy_id_text_eq
(
String
n_removal_strategy_id_text_eq
)
{
...
...
@@ -124,20 +96,6 @@ public class Stock_locationSearchContext extends QueryWrapperContext<Stock_locat
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_removal_strategy_id_text_like
)){
this
.
getSearchCond
().
like
(
"removal_strategy_id_text"
,
n_removal_strategy_id_text_like
);
}
}
private
String
n_putaway_strategy_id_text_eq
;
//[上架策略]
public
void
setN_putaway_strategy_id_text_eq
(
String
n_putaway_strategy_id_text_eq
)
{
this
.
n_putaway_strategy_id_text_eq
=
n_putaway_strategy_id_text_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_putaway_strategy_id_text_eq
)){
this
.
getSearchCond
().
eq
(
"putaway_strategy_id_text"
,
n_putaway_strategy_id_text_eq
);
}
}
private
String
n_putaway_strategy_id_text_like
;
//[上架策略]
public
void
setN_putaway_strategy_id_text_like
(
String
n_putaway_strategy_id_text_like
)
{
this
.
n_putaway_strategy_id_text_like
=
n_putaway_strategy_id_text_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_putaway_strategy_id_text_like
)){
this
.
getSearchCond
().
like
(
"putaway_strategy_id_text"
,
n_putaway_strategy_id_text_like
);
}
}
private
String
n_write_uid_text_eq
;
//[最后更新者]
public
void
setN_write_uid_text_eq
(
String
n_write_uid_text_eq
)
{
...
...
@@ -194,13 +152,6 @@ public class Stock_locationSearchContext extends QueryWrapperContext<Stock_locat
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_company_id_eq
)){
this
.
getSearchCond
().
eq
(
"company_id"
,
n_company_id_eq
);
}
}
private
Long
n_location_id_eq
;
//[上级位置]
public
void
setN_location_id_eq
(
Long
n_location_id_eq
)
{
this
.
n_location_id_eq
=
n_location_id_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_location_id_eq
)){
this
.
getSearchCond
().
eq
(
"location_id"
,
n_location_id_eq
);
}
}
private
Long
n_valuation_out_account_id_eq
;
//[库存计价科目(出向)]
public
void
setN_valuation_out_account_id_eq
(
Long
n_valuation_out_account_id_eq
)
{
...
...
@@ -208,20 +159,6 @@ public class Stock_locationSearchContext extends QueryWrapperContext<Stock_locat
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_valuation_out_account_id_eq
)){
this
.
getSearchCond
().
eq
(
"valuation_out_account_id"
,
n_valuation_out_account_id_eq
);
}
}
private
Long
n_partner_id_eq
;
//[所有者]
public
void
setN_partner_id_eq
(
Long
n_partner_id_eq
)
{
this
.
n_partner_id_eq
=
n_partner_id_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_partner_id_eq
)){
this
.
getSearchCond
().
eq
(
"partner_id"
,
n_partner_id_eq
);
}
}
private
Long
n_putaway_strategy_id_eq
;
//[上架策略]
public
void
setN_putaway_strategy_id_eq
(
Long
n_putaway_strategy_id_eq
)
{
this
.
n_putaway_strategy_id_eq
=
n_putaway_strategy_id_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_putaway_strategy_id_eq
)){
this
.
getSearchCond
().
eq
(
"putaway_strategy_id"
,
n_putaway_strategy_id_eq
);
}
}
private
Long
n_removal_strategy_id_eq
;
//[下架策略]
public
void
setN_removal_strategy_id_eq
(
Long
n_removal_strategy_id_eq
)
{
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/mapper/Stock_locationMapper.java
浏览文件 @
1cd92926
...
...
@@ -66,19 +66,13 @@ public interface Stock_locationMapper extends BaseMapper<Stock_location>{
List
<
Stock_location
>
selectByValuationOutAccountId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByPutawayStrategyId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByRemovalStrategyId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByCompanyId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByPartnerId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByCreateUid
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByWriteUid
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Stock_location
>
selectByLocationId
(
@Param
(
"id"
)
Serializable
id
)
;
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/service/IStock_locationService.java
浏览文件 @
1cd92926
...
...
@@ -45,10 +45,6 @@ public interface IStock_locationService extends IService<Stock_location>{
void
resetByValuationOutAccountId
(
Long
id
);
void
resetByValuationOutAccountId
(
Collection
<
Long
>
ids
);
void
removeByValuationOutAccountId
(
Long
id
);
List
<
Stock_location
>
selectByPutawayStrategyId
(
Long
id
);
void
resetByPutawayStrategyId
(
Long
id
);
void
resetByPutawayStrategyId
(
Collection
<
Long
>
ids
);
void
removeByPutawayStrategyId
(
Long
id
);
List
<
Stock_location
>
selectByRemovalStrategyId
(
Long
id
);
void
resetByRemovalStrategyId
(
Long
id
);
void
resetByRemovalStrategyId
(
Collection
<
Long
>
ids
);
...
...
@@ -57,17 +53,10 @@ public interface IStock_locationService extends IService<Stock_location>{
void
resetByCompanyId
(
Long
id
);
void
resetByCompanyId
(
Collection
<
Long
>
ids
);
void
removeByCompanyId
(
Long
id
);
List
<
Stock_location
>
selectByPartnerId
(
Long
id
);
void
resetByPartnerId
(
Long
id
);
void
resetByPartnerId
(
Collection
<
Long
>
ids
);
void
removeByPartnerId
(
Long
id
);
List
<
Stock_location
>
selectByCreateUid
(
Long
id
);
void
removeByCreateUid
(
Long
id
);
List
<
Stock_location
>
selectByWriteUid
(
Long
id
);
void
removeByWriteUid
(
Long
id
);
List
<
Stock_location
>
selectByLocationId
(
Long
id
);
void
removeByLocationId
(
Collection
<
Long
>
ids
);
void
removeByLocationId
(
Long
id
);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/service/impl/Stock_locationServiceImpl.java
浏览文件 @
1cd92926
...
...
@@ -84,8 +84,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_inventoryService
stockInventoryService
;
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_locationService
stockLocationService
=
this
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_move_lineService
stockMoveLineService
;
...
...
@@ -142,15 +140,9 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_account
.
service
.
IAccount_accountService
accountAccountService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
service
.
IProduct_putawayService
productPutawayService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
service
.
IProduct_removalService
productRemovalService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
service
.
IRes_partnerService
resPartnerService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
service
.
IRes_usersService
resUsersService
;
protected
int
batchSize
=
500
;
...
...
@@ -236,7 +228,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
stockFixedPutawayStratService
.
resetByFixedLocationId
(
key
);
stockInventoryLineService
.
resetByLocationId
(
key
);
stockInventoryService
.
resetByLocationId
(
key
);
stockLocationService
.
removeByLocationId
(
key
);
stockMoveLineService
.
resetByLocationDestId
(
key
);
stockMoveLineService
.
resetByLocationId
(
key
);
stockMoveService
.
resetByLocationDestId
(
key
);
...
...
@@ -290,7 +281,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
stockFixedPutawayStratService
.
resetByFixedLocationId
(
idList
);
stockInventoryLineService
.
resetByLocationId
(
idList
);
stockInventoryService
.
resetByLocationId
(
idList
);
stockLocationService
.
removeByLocationId
(
idList
);
stockMoveLineService
.
resetByLocationDestId
(
idList
);
stockMoveLineService
.
resetByLocationId
(
idList
);
stockMoveService
.
resetByLocationDestId
(
idList
);
...
...
@@ -422,25 +412,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"valuation_out_account_id"
,
id
));
}
@Override
public
List
<
Stock_location
>
selectByPutawayStrategyId
(
Long
id
)
{
return
baseMapper
.
selectByPutawayStrategyId
(
id
);
}
@Override
public
void
resetByPutawayStrategyId
(
Long
id
)
{
this
.
update
(
new
UpdateWrapper
<
Stock_location
>().
set
(
"putaway_strategy_id"
,
null
).
eq
(
"putaway_strategy_id"
,
id
));
}
@Override
public
void
resetByPutawayStrategyId
(
Collection
<
Long
>
ids
)
{
this
.
update
(
new
UpdateWrapper
<
Stock_location
>().
set
(
"putaway_strategy_id"
,
null
).
in
(
"putaway_strategy_id"
,
ids
));
}
@Override
public
void
removeByPutawayStrategyId
(
Long
id
)
{
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"putaway_strategy_id"
,
id
));
}
@Override
public
List
<
Stock_location
>
selectByRemovalStrategyId
(
Long
id
)
{
return
baseMapper
.
selectByRemovalStrategyId
(
id
);
...
...
@@ -479,25 +450,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"company_id"
,
id
));
}
@Override
public
List
<
Stock_location
>
selectByPartnerId
(
Long
id
)
{
return
baseMapper
.
selectByPartnerId
(
id
);
}
@Override
public
void
resetByPartnerId
(
Long
id
)
{
this
.
update
(
new
UpdateWrapper
<
Stock_location
>().
set
(
"partner_id"
,
null
).
eq
(
"partner_id"
,
id
));
}
@Override
public
void
resetByPartnerId
(
Collection
<
Long
>
ids
)
{
this
.
update
(
new
UpdateWrapper
<
Stock_location
>().
set
(
"partner_id"
,
null
).
in
(
"partner_id"
,
ids
));
}
@Override
public
void
removeByPartnerId
(
Long
id
)
{
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"partner_id"
,
id
));
}
@Override
public
List
<
Stock_location
>
selectByCreateUid
(
Long
id
)
{
return
baseMapper
.
selectByCreateUid
(
id
);
...
...
@@ -516,20 +468,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"write_uid"
,
id
));
}
@Override
public
List
<
Stock_location
>
selectByLocationId
(
Long
id
)
{
return
baseMapper
.
selectByLocationId
(
id
);
}
@Override
public
void
removeByLocationId
(
Collection
<
Long
>
ids
)
{
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
in
(
"location_id"
,
ids
));
}
@Override
public
void
removeByLocationId
(
Long
id
)
{
this
.
remove
(
new
QueryWrapper
<
Stock_location
>().
eq
(
"location_id"
,
id
));
}
/**
* 查询集合 数据集
...
...
@@ -567,16 +505,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
}
et
.
setValuationOutAccountIdText
(
odooValuationOutAccount
.
getName
());
}
//实体关系[DER1N_STOCK_LOCATION__PRODUCT_PUTAWAY__PUTAWAY_STRATEGY_ID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getPutawayStrategyId
())){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
domain
.
Product_putaway
odooPutawayStrategy
=
et
.
getOdooPutawayStrategy
();
if
(
ObjectUtils
.
isEmpty
(
odooPutawayStrategy
)){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
domain
.
Product_putaway
majorEntity
=
productPutawayService
.
get
(
et
.
getPutawayStrategyId
());
et
.
setOdooPutawayStrategy
(
majorEntity
);
odooPutawayStrategy
=
majorEntity
;
}
et
.
setPutawayStrategyIdText
(
odooPutawayStrategy
.
getName
());
}
//实体关系[DER1N_STOCK_LOCATION__PRODUCT_REMOVAL__REMOVAL_STRATEGY_ID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getRemovalStrategyId
())){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_product
.
domain
.
Product_removal
odooRemovalStrategy
=
et
.
getOdooRemovalStrategy
();
...
...
@@ -597,16 +525,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
}
et
.
setCompanyIdText
(
odooCompany
.
getName
());
}
//实体关系[DER1N_STOCK_LOCATION__RES_PARTNER__PARTNER_ID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getPartnerId
())){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_partner
odooPartner
=
et
.
getOdooPartner
();
if
(
ObjectUtils
.
isEmpty
(
odooPartner
)){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_partner
majorEntity
=
resPartnerService
.
get
(
et
.
getPartnerId
());
et
.
setOdooPartner
(
majorEntity
);
odooPartner
=
majorEntity
;
}
et
.
setPartnerIdText
(
odooPartner
.
getName
());
}
//实体关系[DER1N_STOCK_LOCATION__RES_USERS__CREATE_UID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getCreateUid
())){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_base
.
domain
.
Res_users
odooCreate
=
et
.
getOdooCreate
();
...
...
@@ -627,16 +545,6 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
}
et
.
setWriteUidText
(
odooWrite
.
getName
());
}
//实体关系[DER1N_STOCK_LOCATION__STOCK_LOCATION__LOCATION_ID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getLocationId
())){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
domain
.
Stock_location
odooLocation
=
et
.
getOdooLocation
();
if
(
ObjectUtils
.
isEmpty
(
odooLocation
)){
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
domain
.
Stock_location
majorEntity
=
stockLocationService
.
get
(
et
.
getLocationId
());
et
.
setOdooLocation
(
majorEntity
);
odooLocation
=
majorEntity
;
}
et
.
setLocationIdText
(
odooLocation
.
getName
());
}
}
...
...
businesscentral-core/src/main/resources/mapper/odoo_stock/stock_location/Stock_locationMapper.xml
浏览文件 @
1cd92926
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @
1cd92926
...
...
@@ -123768,12 +123768,6 @@
"code_name":"Odoo_putaway",
"entity_name":"STOCK_FIXED_PUTAWAY_STRAT",
"ref_entity_name":"PRODUCT_PUTAWAY"
},
{"name":"DER1N_STOCK_LOCATION__PRODUCT_PUTAWAY__PUTAWAY_STRATEGY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_putaway_strategy",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"PRODUCT_PUTAWAY"
}
],
"parentEntitys":[
...
...
@@ -151028,12 +151022,6 @@
"entity_name":"STOCK_INVENTORY",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_STOCK_LOCATION__RES_PARTNER__PARTNER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_partner",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_STOCK_MOVE_LINE__RES_PARTNER__OWNER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_owner",
...
...
@@ -173492,24 +173480,6 @@
"major_field":0
},
{
"fieldname":"LOCATION_ID_TEXT" ,
"codename":"Location_id_text",
"field_logic_name":"上级位置",
"entity_name":"Stock_location",
"ref_de":"STOCK_LOCATION",
"ref_field_name":"NAME",
"relation_name":"DER1N_STOCK_LOCATION__STOCK_LOCATION__LOCATION_ID",
"relation_codename":"Odoo_location",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"COMPANY_ID_TEXT" ,
"codename":"Company_id_text",
"field_logic_name":"公司",
...
...
@@ -173564,24 +173534,6 @@
"major_field":0
},
{
"fieldname":"PARTNER_ID_TEXT" ,
"codename":"Partner_id_text",
"field_logic_name":"所有者",
"entity_name":"Stock_location",
"ref_de":"RES_PARTNER",
"ref_field_name":"NAME",
"relation_name":"DER1N_STOCK_LOCATION__RES_PARTNER__PARTNER_ID",
"relation_codename":"Odoo_partner",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"REMOVAL_STRATEGY_ID_TEXT" ,
"codename":"Removal_strategy_id_text",
"field_logic_name":"下架策略",
...
...
@@ -173600,24 +173552,6 @@
"major_field":0
},
{
"fieldname":"PUTAWAY_STRATEGY_ID_TEXT" ,
"codename":"Putaway_strategy_id_text",
"field_logic_name":"上架策略",
"entity_name":"Stock_location",
"ref_de":"PRODUCT_PUTAWAY",
"ref_field_name":"NAME",
"relation_name":"DER1N_STOCK_LOCATION__PRODUCT_PUTAWAY__PUTAWAY_STRATEGY_ID",
"relation_codename":"Odoo_putaway_strategy",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"WRITE_UID_TEXT" ,
"codename":"Write_uid_text",
"field_logic_name":"最后更新者",
...
...
@@ -173724,23 +173658,6 @@
"major_field":0
},
{
"fieldname":"LOCATION_ID" ,
"codename":"Location_id",
"field_logic_name":"上级位置",
"entity_name":"Stock_location",
"ref_de":"STOCK_LOCATION",
"ref_field_name":"ID",
"relation_name":"DER1N_STOCK_LOCATION__STOCK_LOCATION__LOCATION_ID",
"relation_codename":"Odoo_location",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"VALUATION_OUT_ACCOUNT_ID" ,
"codename":"Valuation_out_account_id",
"field_logic_name":"库存计价科目(出向)",
...
...
@@ -173758,40 +173675,6 @@
"major_field":0
},
{
"fieldname":"PARTNER_ID" ,
"codename":"Partner_id",
"field_logic_name":"所有者",
"entity_name":"Stock_location",
"ref_de":"RES_PARTNER",
"ref_field_name":"ID",
"relation_name":"DER1N_STOCK_LOCATION__RES_PARTNER__PARTNER_ID",
"relation_codename":"Odoo_partner",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"PUTAWAY_STRATEGY_ID" ,
"codename":"Putaway_strategy_id",
"field_logic_name":"上架策略",
"entity_name":"Stock_location",
"ref_de":"PRODUCT_PUTAWAY",
"ref_field_name":"ID",
"relation_name":"DER1N_STOCK_LOCATION__PRODUCT_PUTAWAY__PUTAWAY_STRATEGY_ID",
"relation_codename":"Odoo_putaway_strategy",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"REMOVAL_STRATEGY_ID" ,
"codename":"Removal_strategy_id",
"field_logic_name":"下架策略",
...
...
@@ -173906,12 +173789,6 @@
"entity_name":"STOCK_INVENTORY",
"ref_entity_name":"STOCK_LOCATION"
},
{"name":"DER1N_STOCK_LOCATION__STOCK_LOCATION__LOCATION_ID",
"relation_type":"DER1N",
"code_name":"Odoo_location",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"STOCK_LOCATION"
},
{"name":"DER1N_STOCK_MOVE_LINE__STOCK_LOCATION__LOCATION_DEST_ID",
"relation_type":"DER1N",
"code_name":"Odoo_location_dest",
...
...
@@ -174118,12 +173995,6 @@
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_STOCK_LOCATION__PRODUCT_PUTAWAY__PUTAWAY_STRATEGY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_putaway_strategy",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"PRODUCT_PUTAWAY"
},
{"name":"DER1N_STOCK_LOCATION__PRODUCT_REMOVAL__REMOVAL_STRATEGY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_removal_strategy",
...
...
@@ -174136,12 +174007,6 @@
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"RES_COMPANY"
},
{"name":"DER1N_STOCK_LOCATION__RES_PARTNER__PARTNER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_partner",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_STOCK_LOCATION__RES_USERS__CREATE_UID",
"relation_type":"DER1N",
"code_name":"Odoo_create",
...
...
@@ -174153,12 +174018,6 @@
"code_name":"Odoo_write",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_STOCK_LOCATION__STOCK_LOCATION__LOCATION_ID",
"relation_type":"DER1N",
"code_name":"Odoo_location",
"entity_name":"STOCK_LOCATION",
"ref_entity_name":"STOCK_LOCATION"
}
]
}
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Stock_locationDTO.java
浏览文件 @
1cd92926
...
...
@@ -196,15 +196,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
@Size
(
min
=
0
,
max
=
1048576
,
message
=
"内容长度必须小于等于[1048576]"
)
private
String
childIds
;
/**
* 属性 [LOCATION_ID_TEXT]
*
*/
@JSONField
(
name
=
"location_id_text"
)
@JsonProperty
(
"location_id_text"
)
@Size
(
min
=
0
,
max
=
200
,
message
=
"内容长度必须小于等于[200]"
)
private
String
locationIdText
;
/**
* 属性 [COMPANY_ID_TEXT]
*
...
...
@@ -232,15 +223,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
@Size
(
min
=
0
,
max
=
200
,
message
=
"内容长度必须小于等于[200]"
)
private
String
valuationOutAccountIdText
;
/**
* 属性 [PARTNER_ID_TEXT]
*
*/
@JSONField
(
name
=
"partner_id_text"
)
@JsonProperty
(
"partner_id_text"
)
@Size
(
min
=
0
,
max
=
200
,
message
=
"内容长度必须小于等于[200]"
)
private
String
partnerIdText
;
/**
* 属性 [REMOVAL_STRATEGY_ID_TEXT]
*
...
...
@@ -250,15 +232,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
@Size
(
min
=
0
,
max
=
200
,
message
=
"内容长度必须小于等于[200]"
)
private
String
removalStrategyIdText
;
/**
* 属性 [PUTAWAY_STRATEGY_ID_TEXT]
*
*/
@JSONField
(
name
=
"putaway_strategy_id_text"
)
@JsonProperty
(
"putaway_strategy_id_text"
)
@Size
(
min
=
0
,
max
=
200
,
message
=
"内容长度必须小于等于[200]"
)
private
String
putawayStrategyIdText
;
/**
* 属性 [WRITE_UID_TEXT]
*
...
...
@@ -313,15 +286,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
companyId
;
/**
* 属性 [LOCATION_ID]
*
*/
@JSONField
(
name
=
"location_id"
)
@JsonProperty
(
"location_id"
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
locationId
;
/**
* 属性 [VALUATION_OUT_ACCOUNT_ID]
*
...
...
@@ -331,24 +295,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
valuationOutAccountId
;
/**
* 属性 [PARTNER_ID]
*
*/
@JSONField
(
name
=
"partner_id"
)
@JsonProperty
(
"partner_id"
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
partnerId
;
/**
* 属性 [PUTAWAY_STRATEGY_ID]
*
*/
@JSONField
(
name
=
"putaway_strategy_id"
)
@JsonProperty
(
"putaway_strategy_id"
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
putawayStrategyId
;
/**
* 属性 [REMOVAL_STRATEGY_ID]
*
...
...
@@ -471,14 +417,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
this
.
modify
(
"company_id"
,
companyId
);
}
/**
* 设置 [LOCATION_ID]
*/
public
void
setLocationId
(
Long
locationId
){
this
.
locationId
=
locationId
;
this
.
modify
(
"location_id"
,
locationId
);
}
/**
* 设置 [VALUATION_OUT_ACCOUNT_ID]
*/
...
...
@@ -487,22 +425,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
this
.
modify
(
"valuation_out_account_id"
,
valuationOutAccountId
);
}
/**
* 设置 [PARTNER_ID]
*/
public
void
setPartnerId
(
Long
partnerId
){
this
.
partnerId
=
partnerId
;
this
.
modify
(
"partner_id"
,
partnerId
);
}
/**
* 设置 [PUTAWAY_STRATEGY_ID]
*/
public
void
setPutawayStrategyId
(
Long
putawayStrategyId
){
this
.
putawayStrategyId
=
putawayStrategyId
;
this
.
modify
(
"putaway_strategy_id"
,
putawayStrategyId
);
}
/**
* 设置 [REMOVAL_STRATEGY_ID]
*/
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录