Skip to content

I
iBiz商业中心
提交 8365316d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码

上级 fae1c3f5
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 272 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_product.java
浏览文件 @ 8365316d
......@@ -1177,13 +1177,6 @@ public class Product_product extends EntityMP implements Serializable {
@JSONField(name = "categ_id")
@JsonProperty("categ_id")
private Long categId;
/**
* Can be Part
*/
@TableField(exist = false)
@JSONField(name = "isparts")
@JsonProperty("isparts")
private Boolean isparts;
/**
* 计量单位
*/
......@@ -1212,13 +1205,6 @@ public class Product_product extends EntityMP implements Serializable {
@JSONField(name = "purchase_method")
@JsonProperty("purchase_method")
private String purchaseMethod;
/**
* 负责人
*/
@TableField(exist = false)
@JSONField(name = "responsible_id")
@JsonProperty("responsible_id")
private Long responsibleId;
/**
* 跟踪服务
*/
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_template.java
浏览文件 @ 8365316d
......@@ -265,13 +265,6 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "purchase_line_warn_msg")
@JsonProperty("purchase_line_warn_msg")
private String purchaseLineWarnMsg;
/**
* Can be Part
*/
@TableField(value = "isparts")
@JSONField(name = "isparts")
@JsonProperty("isparts")
private Boolean isparts;
/**
* 网站价格差异
*/
......@@ -1173,13 +1166,6 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "uom_name")
@JsonProperty("uom_name")
private String uomName;
/**
* 负责人
*/
@TableField(exist = false)
@JSONField(name = "responsible_id_text")
@JsonProperty("responsible_id_text")
private String responsibleIdText;
/**
* 创建人
*/
......@@ -1249,14 +1235,6 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "uom_po_id")
@JsonProperty("uom_po_id")
private Long uomPoId;
/**
* 负责人
*/
@DEField(name = "responsible_id")
@TableField(value = "responsible_id")
@JSONField(name = "responsible_id")
@JsonProperty("responsible_id")
private Long responsibleId;
/**
*
......@@ -1282,14 +1260,6 @@ public class Product_template extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooResponsible;
/**
*
*/
......@@ -1372,14 +1342,6 @@ public class Product_template extends EntityMP implements Serializable {
this.modify("purchase_line_warn_msg",purchaseLineWarnMsg);
}
/**
* 设置 [Can be Part]
*/
public void setIsparts(Boolean isparts){
this.isparts = isparts ;
this.modify("isparts",isparts);
}
/**
* 设置 [网站meta标题]
*/
......@@ -1756,14 +1718,6 @@ public class Product_template extends EntityMP implements Serializable {
this.modify("uom_po_id",uomPoId);
}
/**
* 设置 [负责人]
*/
public void setResponsibleId(Long responsibleId){
this.responsibleId = responsibleId ;
this.modify("responsible_id",responsibleId);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/filter/Product_templateSearchContext.java
浏览文件 @ 8365316d
......@@ -159,20 +159,6 @@ public class Product_templateSearchContext extends QueryWrapperContext<Product_t
if(!ObjectUtils.isEmpty(this.n_uom_name_like)){
this.getSearchCond().like("uom_name", n_uom_name_like);
}
}
private String n_responsible_id_text_eq;//[负责人]
public void setN_responsible_id_text_eq(String n_responsible_id_text_eq) {
this.n_responsible_id_text_eq = n_responsible_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_responsible_id_text_eq)){
this.getSearchCond().eq("responsible_id_text", n_responsible_id_text_eq);
}
}
private String n_responsible_id_text_like;//[负责人]
public void setN_responsible_id_text_like(String n_responsible_id_text_like) {
this.n_responsible_id_text_like = n_responsible_id_text_like;
if(!ObjectUtils.isEmpty(this.n_responsible_id_text_like)){
this.getSearchCond().like("responsible_id_text", n_responsible_id_text_like);
}
}
private String n_create_uid_text_eq;//[创建人]
public void setN_create_uid_text_eq(String n_create_uid_text_eq) {
......@@ -258,13 +244,6 @@ public class Product_templateSearchContext extends QueryWrapperContext<Product_t
this.getSearchCond().eq("uom_po_id", n_uom_po_id_eq);
}
}
private Long n_responsible_id_eq;//[负责人]
public void setN_responsible_id_eq(Long n_responsible_id_eq) {
this.n_responsible_id_eq = n_responsible_id_eq;
if(!ObjectUtils.isEmpty(this.n_responsible_id_eq)){
this.getSearchCond().eq("responsible_id", n_responsible_id_eq);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/mapper/Product_templateMapper.java
浏览文件 @ 8365316d
......@@ -68,8 +68,6 @@ public interface Product_templateMapper extends BaseMapper<Product_template>{
List<Product_template> selectByCreateUid(@Param("id") Serializable id) ;
List<Product_template> selectByResponsibleId(@Param("id") Serializable id) ;
List<Product_template> selectByWriteUid(@Param("id") Serializable id) ;
List<Product_template> selectByUomId(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/IProduct_templateService.java
浏览文件 @ 8365316d
......@@ -44,8 +44,6 @@ public interface IProduct_templateService extends IService<Product_template>{
void removeByCompanyId(Long id) ;
List<Product_template> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ;
List<Product_template> selectByResponsibleId(Long id) ;
void removeByResponsibleId(Long id) ;
List<Product_template> selectByWriteUid(Long id) ;
void removeByWriteUid(Long id) ;
List<Product_template> selectByUomId(Long id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_productServiceImpl.java
浏览文件 @ 8365316d
......@@ -428,12 +428,10 @@ public class Product_productServiceImpl extends ServiceImpl<Product_productMappe
et.setPropertyAccountIncomeId(odooProductTmpl.getPropertyAccountIncomeId());
et.setPropertyCostMethod(odooProductTmpl.getPropertyCostMethod());
et.setCategId(odooProductTmpl.getCategId());
et.setIsparts(odooProductTmpl.getIsparts());
et.setUomId(odooProductTmpl.getUomId());
et.setProductVariantId(odooProductTmpl.getProductVariantId());
et.setType(odooProductTmpl.getType());
et.setPurchaseMethod(odooProductTmpl.getPurchaseMethod());
et.setResponsibleId(odooProductTmpl.getResponsibleId());
et.setServiceType(odooProductTmpl.getServiceType());
et.setUomName(odooProductTmpl.getUomName());
et.setAvailableThreshold(odooProductTmpl.getAvailableThreshold());
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_templateServiceImpl.java
浏览文件 @ 8365316d
......@@ -239,16 +239,6 @@ public class Product_templateServiceImpl extends ServiceImpl<Product_templateMap
this.remove(new QueryWrapper<Product_template>().eq("create_uid",id));
}
@Override
public List<Product_template> selectByResponsibleId(Long id) {
return baseMapper.selectByResponsibleId(id);
}
@Override
public void removeByResponsibleId(Long id) {
this.remove(new QueryWrapper<Product_template>().eq("responsible_id",id));
}
@Override
public List<Product_template> selectByWriteUid(Long id) {
return baseMapper.selectByWriteUid(id);
......@@ -326,16 +316,6 @@ public class Product_templateServiceImpl extends ServiceImpl<Product_templateMap
}
et.setCreateUidText(odooCreate.getName());
}
//实体关系[DER1N_PRODUCT_TEMPLATE__RES_USERS__RESPONSIBLE_ID]
if(!ObjectUtils.isEmpty(et.getResponsibleId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooResponsible=et.getOdooResponsible();
if(ObjectUtils.isEmpty(odooResponsible)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users majorEntity=resUsersService.get(et.getResponsibleId());
et.setOdooResponsible(majorEntity);
odooResponsible=majorEntity;
}
et.setResponsibleIdText(odooResponsible.getName());
}
//实体关系[DER1N_PRODUCT_TEMPLATE__RES_USERS__WRITE_UID]
if(!ObjectUtils.isEmpty(et.getWriteUid())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite=et.getOdooWrite();
......
businesscentral-core/src/main/resources/mapper/odoo_product/product_product/Product_productMapper.xml
浏览文件 @ 8365316d
......@@ -160,7 +160,6 @@
<result property="uomId" column="uom_id" />
<result property="productVariantId" column="product_variant_id" />
<result property="purchaseMethod" column="purchase_method" />
<result property="responsibleId" column="responsible_id" />
<result property="serviceType" column="service_type" />
<result property="uomName" column="uom_name" />
<result property="availableThreshold" column="available_threshold" />
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ 8365316d
......@@ -112504,22 +112504,6 @@
"major_field":0
},
{
"fieldname":"ISPARTS" ,
"codename":"IsParts",
"field_logic_name":"Can be Part",
"entity_name":"Product_product",
"ref_de":"PRODUCT_TEMPLATE",
"ref_field_name":"ISPARTS",
"relation_name":"DER1N_PRODUCT_PRODUCT__PRODUCT_TEMPLATE__PRODUCT_TMPL_ID",
"relation_codename":"Odoo_product_tmpl",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"BIT",
"key_field":0,
"major_field":0
},
{
"fieldname":"UOM_ID" ,
"codename":"Uom_id",
"field_logic_name":"计量单位",
......@@ -112588,22 +112572,6 @@
"major_field":0
},
{
"fieldname":"RESPONSIBLE_ID" ,
"codename":"Responsible_id",
"field_logic_name":"负责人",
"entity_name":"Product_product",
"ref_de":"PRODUCT_TEMPLATE",
"ref_field_name":"RESPONSIBLE_ID",
"relation_name":"DER1N_PRODUCT_PRODUCT__PRODUCT_TEMPLATE__PRODUCT_TMPL_ID",
"relation_codename":"Odoo_product_tmpl",
"field_type":"PICKUPDATA",
"nullable":0,
"physical_field":0,
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"SERVICE_TYPE" ,
"codename":"Service_type",
"field_logic_name":"跟踪服务",
......@@ -115356,18 +115324,6 @@
"major_field":0
},
{
"fieldname":"ISPARTS" ,
"codename":"IsParts",
"field_logic_name":"Can be Part",
"entity_name":"Product_template",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"major_field":0
},
{
"fieldname":"WEBSITE_PRICE_DIFFERENCE" ,
"codename":"Website_price_difference",
"field_logic_name":"网站价格差异",
......@@ -116927,23 +116883,6 @@
"major_field":0
},
{
"fieldname":"RESPONSIBLE_ID_TEXT" ,
"codename":"Responsible_id_text",
"field_logic_name":"负责人",
"entity_name":"Product_template",
"ref_de":"RES_USERS",
"ref_field_name":"NAME",
"relation_name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__RESPONSIBLE_ID",
"relation_codename":"Odoo_responsible",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"major_field":0
},
{
"fieldname":"CREATE_UID_TEXT" ,
"codename":"Create_uid_text",
"field_logic_name":"创建人",
......@@ -117091,22 +117030,6 @@
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"RESPONSIBLE_ID" ,
"codename":"Responsible_id",
"field_logic_name":"负责人",
"entity_name":"Product_template",
"ref_de":"RES_USERS",
"ref_field_name":"ID",
"relation_name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__RESPONSIBLE_ID",
"relation_codename":"Odoo_responsible",
"field_type":"PICKUP",
"nullable":0,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"major_field":0
}
],
"subEntitys":[
......@@ -117214,12 +117137,6 @@
"entity_name":"PRODUCT_TEMPLATE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__RESPONSIBLE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_responsible",
"entity_name":"PRODUCT_TEMPLATE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__WRITE_UID",
"relation_type":"DER1N",
"code_name":"Odoo_write",
......@@ -146937,12 +146854,6 @@
"entity_name":"PRODUCT_TEMPLATE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__RESPONSIBLE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_responsible",
"entity_name":"PRODUCT_TEMPLATE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_PRODUCT_TEMPLATE__RES_USERS__WRITE_UID",
"relation_type":"DER1N",
"code_name":"Odoo_write",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_productDTO.java
浏览文件 @ 8365316d
......@@ -1407,14 +1407,6 @@ public class Product_productDTO extends DTOBase implements Serializable {
@NotNull(message = "[产品种类]不允许为空!")
private Long categId;
/**
* 属性 [ISPARTS]
*
*/
@JSONField(name = "isparts")
@JsonProperty("isparts")
private Boolean isparts;
/**
* 属性 [UOM_ID]
*
......@@ -1452,16 +1444,6 @@ public class Product_productDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String purchaseMethod;
/**
* 属性 [RESPONSIBLE_ID]
*
*/
@JSONField(name = "responsible_id")
@JsonProperty("responsible_id")
@JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "[负责人]不允许为空!")
private Long responsibleId;
/**
* 属性 [SERVICE_TYPE]
*
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_templateDTO.java
浏览文件 @ 8365316d
......@@ -293,14 +293,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String purchaseLineWarnMsg;
/**
* 属性 [ISPARTS]
*
*/
@JSONField(name = "isparts")
@JsonProperty("isparts")
private Boolean isparts;
/**
* 属性 [WEBSITE_PRICE_DIFFERENCE]
*
......@@ -1352,15 +1344,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String uomName;
/**
* 属性 [RESPONSIBLE_ID_TEXT]
*
*/
@JSONField(name = "responsible_id_text")
@JsonProperty("responsible_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String responsibleIdText;
/**
* 属性 [CREATE_UID_TEXT]
*
......@@ -1445,16 +1428,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@NotNull(message = "[采购计量单位]不允许为空!")
private Long uomPoId;
/**
* 属性 [RESPONSIBLE_ID]
*
*/
@JSONField(name = "responsible_id")
@JsonProperty("responsible_id")
@JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "[负责人]不允许为空!")
private Long responsibleId;
/**
* 设置 [MESSAGE_MAIN_ATTACHMENT_ID]
......@@ -1512,14 +1485,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
this.modify("purchase_line_warn_msg",purchaseLineWarnMsg);
}
/**
* 设置 [ISPARTS]
*/
public void setIsparts(Boolean isparts){
this.isparts = isparts ;
this.modify("isparts",isparts);
}
/**
* 设置 [WEBSITE_META_TITLE]
*/
......@@ -1896,14 +1861,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
this.modify("uom_po_id",uomPoId);
}
/**
* 设置 [RESPONSIBLE_ID]
*/
public void setResponsibleId(Long responsibleId){
this.responsibleId = responsibleId ;
this.modify("responsible_id",responsibleId);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或