Skip to content

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

xignzi006 发布系统代码，后台体系[Spring Boot]

上级 5e8521f0
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 64 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_template.java
浏览文件 @ eaf49fd7
...@@ -646,13 +646,6 @@ public class Product_template extends EntityMP implements Serializable { ...@@ -646,13 +646,6 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "item_ids") @JSONField(name = "item_ids")
@JsonProperty("item_ids") @JsonProperty("item_ids")
private String itemIds; private String itemIds;
/**
* 进项税
*/
@TableField(exist = false)
@JSONField(name = "supplier_taxes_id")
@JsonProperty("supplier_taxes_id")
private String supplierTaxesId;
/** /**
* 体积 * 体积
*/ */
...@@ -868,13 +861,6 @@ public class Product_template extends EntityMP implements Serializable { ...@@ -868,13 +861,6 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "bom_count") @JSONField(name = "bom_count")
@JsonProperty("bom_count") @JsonProperty("bom_count")
private Integer bomCount; private Integer bomCount;
/**
* 销项税
*/
@TableField(exist = false)
@JSONField(name = "taxes_id")
@JsonProperty("taxes_id")
private String taxesId;
/** /**
* 错误数 * 错误数
*/ */
...@@ -1236,6 +1222,22 @@ public class Product_template extends EntityMP implements Serializable { ...@@ -1236,6 +1222,22 @@ public class Product_template extends EntityMP implements Serializable {
@JSONField(name = "uom_po_id") @JSONField(name = "uom_po_id")
@JsonProperty("uom_po_id") @JsonProperty("uom_po_id")
private Long uomPoId; private Long uomPoId;
/**
* 进项税
*/
@TableField(exist = false)
@JSONField(name = "supplier_taxes_id")
@JsonProperty("supplier_taxes_id")
private String supplierTaxesId;
/**
* 销项税
*/
@TableField(exist = false)
@JSONField(name = "taxes_id")
@JsonProperty("taxes_id")
private String taxesId;
/** /**
* *
...@@ -1719,6 +1721,22 @@ public class Product_template extends EntityMP implements Serializable { ...@@ -1719,6 +1721,22 @@ public class Product_template extends EntityMP implements Serializable {
this.modify("uom_po_id",uomPoId); this.modify("uom_po_id",uomPoId);
} }
/**
* 设置 [进项税]
*/
public void setSupplierTaxesId(String supplierTaxesId){
this.supplierTaxesId = supplierTaxesId ;
this.modify("supplier_taxes_id",supplierTaxesId);
}
/**
* 设置 [销项税]
*/
public void setTaxesId(String taxesId){
this.taxesId = taxesId ;
this.modify("taxes_id",taxesId);
}
@Override @Override
public Serializable getDefaultKey(boolean gen) { public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/mapper/Product_templateMapper.java
浏览文件 @ eaf49fd7
...@@ -75,4 +75,10 @@ public interface Product_templateMapper extends BaseMapper<Product_template>{ ...@@ -75,4 +75,10 @@ public interface Product_templateMapper extends BaseMapper<Product_template>{
List<Product_template> selectByUomPoId(@Param("id") Serializable id) ; List<Product_template> selectByUomPoId(@Param("id") Serializable id) ;
boolean saveRelByOdooProd(@Param("prod_id") Long prod_id, List<cn.ibizlab.businesscentral.util.domain.MultiSelectItem> account_taxes);
boolean saveRelByOdooProd(@Param("prod_id") Long prod_id, List<cn.ibizlab.businesscentral.util.domain.MultiSelectItem> account_taxes);
} }
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_templateServiceImpl.java
浏览文件 @ eaf49fd7
...@@ -126,6 +126,10 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template ...@@ -126,6 +126,10 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template
@Override @Override
@Transactional @Transactional
public boolean create(Product_template et) { public boolean create(Product_template et) {
String supplier_taxes_id = et.getSupplierTaxesId() ;
String taxes_id = et.getTaxesId() ;
boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null; boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
boolean mail_create_nolog = et.get("mail_create_nolog") != null; boolean mail_create_nolog = et.get("mail_create_nolog") != null;
boolean mail_notrack = et.get("mail_notrack") != null; boolean mail_notrack = et.get("mail_notrack") != null;
...@@ -145,6 +149,14 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template ...@@ -145,6 +149,14 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template
if (messageinfo && !mail_notrack) { if (messageinfo && !mail_notrack) {
} }
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getSupplierTaxesId())){
this.baseMapper.saveRelByOdooProd(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(supplier_taxes_id, cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getTaxesId())){
this.baseMapper.saveRelByOdooProd(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(taxes_id, cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
return true; return true;
} }
...@@ -158,6 +170,20 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template ...@@ -158,6 +170,20 @@ public class Product_templateServiceImpl extends EBSServiceImpl<Product_template
@Override @Override
@Transactional @Transactional
public boolean update(Product_template et) { public boolean update(Product_template et) {
if(et.getFocusNull().contains("supplier_taxes_id") || org.apache.commons.lang3.StringUtils.isNotBlank(et.getSupplierTaxesId())){
productSupplierTaxesRelService.removeByProdId(et.getId());
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getSupplierTaxesId())){
this.baseMapper.saveRelByOdooProd(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(et.getSupplierTaxesId(), cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
}
if(et.getFocusNull().contains("taxes_id") || org.apache.commons.lang3.StringUtils.isNotBlank(et.getTaxesId())){
productTaxesRelService.removeByProdId(et.getId());
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getTaxesId())){
this.baseMapper.saveRelByOdooProd(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(et.getTaxesId(), cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
}
Product_template old = new Product_template() ; Product_template old = new Product_template() ;
CachedBeanCopier.copy(get(et.getId()), old); CachedBeanCopier.copy(get(et.getId()), old);
boolean mail_notrack = et.get("mail_notrack") != null; boolean mail_notrack = et.get("mail_notrack") != null;
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ eaf49fd7
...@@ -124731,20 +124731,6 @@ ...@@ -124731,20 +124731,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"SUPPLIER_TAXES_ID" ,
"codename":"Supplier_taxes_id",
"field_logic_name":"进项税",
"entity_name":"Product_template",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"VOLUME" , "fieldname":"VOLUME" ,
"codename":"Volume", "codename":"Volume",
"field_logic_name":"体积", "field_logic_name":"体积",
...@@ -125137,20 +125123,6 @@ ...@@ -125137,20 +125123,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"TAXES_ID" ,
"codename":"Taxes_id",
"field_logic_name":"销项税",
"entity_name":"Product_template",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"MESSAGE_HAS_ERROR_COUNTER" , "fieldname":"MESSAGE_HAS_ERROR_COUNTER" ,
"codename":"Message_has_error_counter", "codename":"Message_has_error_counter",
"field_logic_name":"错误数", "field_logic_name":"错误数",
...@@ -125868,6 +125840,36 @@ ...@@ -125868,6 +125840,36 @@
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1000,
"major_field":0 "major_field":0
},
{
"fieldname":"SUPPLIER_TAXES_ID" ,
"codename":"Supplier_taxes_id",
"field_logic_name":"进项税",
"entity_name":"Product_template",
"field_type":"ONE2MANYDATA",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"expression":"(SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM PRODUCT_SUPPLIER_TAXES_REL M1 LEFT JOIN ACCOUNT_TAX M2 ON M1.TAX_ID = M2.ID WHERE M1.PROD_ID =T1.ID ) T)",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"TAXES_ID" ,
"codename":"Taxes_id",
"field_logic_name":"销项税",
"entity_name":"Product_template",
"field_type":"ONE2MANYDATA",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"expression":"(SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM PRODUCT_TAXES_REL M1 LEFT JOIN ACCOUNT_TAX M2 ON M1.TAX_ID = M2.ID WHERE M1.PROD_ID =T1.ID ) T)",
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_templateDTO.java
浏览文件 @ eaf49fd7
...@@ -733,15 +733,6 @@ public class Product_templateDTO extends DTOBase implements Serializable { ...@@ -733,15 +733,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]") @Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String itemIds; private String itemIds;
/**
* 属性 [SUPPLIER_TAXES_ID]
*
*/
@JSONField(name = "supplier_taxes_id")
@JsonProperty("supplier_taxes_id")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String supplierTaxesId;
/** /**
* 属性 [VOLUME] * 属性 [VOLUME]
* *
...@@ -989,15 +980,6 @@ public class Product_templateDTO extends DTOBase implements Serializable { ...@@ -989,15 +980,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@JsonProperty("bom_count") @JsonProperty("bom_count")
private Integer bomCount; private Integer bomCount;
/**
* 属性 [TAXES_ID]
*
*/
@JSONField(name = "taxes_id")
@JsonProperty("taxes_id")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String taxesId;
/** /**
* 属性 [MESSAGE_HAS_ERROR_COUNTER] * 属性 [MESSAGE_HAS_ERROR_COUNTER]
* *
...@@ -1428,6 +1410,20 @@ public class Product_templateDTO extends DTOBase implements Serializable { ...@@ -1428,6 +1410,20 @@ public class Product_templateDTO extends DTOBase implements Serializable {
@NotNull(message = "[采购计量单位]不允许为空!") @NotNull(message = "[采购计量单位]不允许为空!")
private Long uomPoId; private Long uomPoId;
/**
* 属性 [SUPPLIER_TAXES_ID]
*
*/
@JSONField(name = "supplier_taxes_id")
@JsonProperty("supplier_taxes_id")
private String supplierTaxesId;
/**
* 属性 [TAXES_ID]
*
*/
@JSONField(name = "taxes_id")
@JsonProperty("taxes_id")
private String taxesId;
/** /**
* 设置 [MESSAGE_MAIN_ATTACHMENT_ID] * 设置 [MESSAGE_MAIN_ATTACHMENT_ID]
...@@ -1861,6 +1857,22 @@ public class Product_templateDTO extends DTOBase implements Serializable { ...@@ -1861,6 +1857,22 @@ public class Product_templateDTO extends DTOBase implements Serializable {
this.modify("uom_po_id",uomPoId); this.modify("uom_po_id",uomPoId);
} }
/**
* 设置 [SUPPLIER_TAXES_ID]
*/
public void setSupplierTaxesId(String supplierTaxesId){
this.supplierTaxesId = supplierTaxesId ;
this.modify("supplier_taxes_id",supplierTaxesId);
}
/**
* 设置 [TAXES_ID]
*/
public void setTaxesId(String taxesId){
this.taxesId = taxesId ;
this.modify("taxes_id",taxesId);
}
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或