xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition_line.java

@@ -192,14 +192,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     @JSONField(name = "move_dest_id")
     @JsonProperty("move_dest_id")
     private Long moveDestId;
-    /**
-     * 计量单位类别
-     */
-    @DEField(name = "product_uom_category_id")
-    @TableField(value = "product_uom_category_id")
-    @JSONField(name = "product_uom_category_id")
-    @JsonProperty("product_uom_category_id")
-    private Long productUomCategoryId;
     /**
      * 单位
      */
@@ -237,13 +229,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     @JSONField(name = "move_dest_name")
     @JsonProperty("move_dest_name")
     private String moveDestName;
-    /**
-     * 计量单位类别
-     */
-    @TableField(exist = false)
-    @JSONField(name = "product_uom_category_name")
-    @JsonProperty("product_uom_category_name")
-    private String productUomCategoryName;
     /**
      * 单位
      */
@@ -316,14 +301,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_stock.domain.Stock_move movedest;
 
-    /**
-     * 
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private cn.ibizlab.businesscentral.core.odoo_uom.domain.Uom_category productuomcategory;
-
     /**
      * 
      */
@@ -476,14 +453,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
         this.modify("move_dest_id",moveDestId);
     }
 
-    /**
-     * 设置 [计量单位类别]
-     */
-    public void setProductUomCategoryId(Long productUomCategoryId){
-        this.productUomCategoryId = productUomCategoryId ;
-        this.modify("product_uom_category_id",productUomCategoryId);
-    }
-
     /**
      * 设置 [单位]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_requisition_lineSearchContext.java

@@ -131,13 +131,6 @@ public class Purchase_requisition_lineSearchContext extends QueryWrapperContext<
         if(!ObjectUtils.isEmpty(this.n_move_dest_id_eq)){
             this.getSearchCond().eq("move_dest_id", n_move_dest_id_eq);
         }
-    }
-	private Long n_product_uom_category_id_eq;//[计量单位类别]
-	public void setN_product_uom_category_id_eq(Long n_product_uom_category_id_eq) {
-        this.n_product_uom_category_id_eq = n_product_uom_category_id_eq;
-        if(!ObjectUtils.isEmpty(this.n_product_uom_category_id_eq)){
-            this.getSearchCond().eq("product_uom_category_id", n_product_uom_category_id_eq);
-        }
     }
 	private Long n_product_uom_id_eq;//[单位]
 	public void setN_product_uom_id_eq(Long n_product_uom_id_eq) {
@@ -194,20 +187,6 @@ public class Purchase_requisition_lineSearchContext extends QueryWrapperContext<
         if(!ObjectUtils.isEmpty(this.n_move_dest_name_like)){
             this.getSearchCond().like("move_dest_name", n_move_dest_name_like);
         }
-    }
-	private String n_product_uom_category_name_eq;//[计量单位类别]
-	public void setN_product_uom_category_name_eq(String n_product_uom_category_name_eq) {
-        this.n_product_uom_category_name_eq = n_product_uom_category_name_eq;
-        if(!ObjectUtils.isEmpty(this.n_product_uom_category_name_eq)){
-            this.getSearchCond().eq("product_uom_category_name", n_product_uom_category_name_eq);
-        }
-    }
-	private String n_product_uom_category_name_like;//[计量单位类别]
-	public void setN_product_uom_category_name_like(String n_product_uom_category_name_like) {
-        this.n_product_uom_category_name_like = n_product_uom_category_name_like;
-        if(!ObjectUtils.isEmpty(this.n_product_uom_category_name_like)){
-            this.getSearchCond().like("product_uom_category_name", n_product_uom_category_name_like);
-        }
     }
 	private String n_product_uom_name_eq;//[单位]
 	public void setN_product_uom_name_eq(String n_product_uom_name_eq) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/mapper/Purchase_requisition_lineMapper.java

@@ -76,8 +76,6 @@ public interface Purchase_requisition_lineMapper extends BaseMapper<Purchase_req
 
     List<Purchase_requisition_line> selectByMoveDestId(@Param("id") Serializable id) ;
 
-    List<Purchase_requisition_line> selectByProductUomCategoryId(@Param("id") Serializable id) ;
-
     List<Purchase_requisition_line> selectByProductUomId(@Param("id") Serializable id) ;
 
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_requisition_lineService.java

@@ -52,8 +52,6 @@ public interface IPurchase_requisition_lineService extends IService<Purchase_req
     void removeByWriteUid(Long id) ;
     List<Purchase_requisition_line> selectByMoveDestId(Long id) ;
     void removeByMoveDestId(Long id) ;
-    List<Purchase_requisition_line> selectByProductUomCategoryId(Long id) ;
-    void removeByProductUomCategoryId(Long id) ;
     List<Purchase_requisition_line> selectByProductUomId(Long id) ;
     void removeByProductUomId(Long id) ;
     /**

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisition_lineServiceImpl.java

@@ -68,9 +68,6 @@ public class Purchase_requisition_lineServiceImpl extends ServiceImpl<Purchase_r
     protected cn.ibizlab.businesscentral.core.odoo_stock.service.IStock_moveService stockMoveService;
     @Autowired
     @Lazy
-    protected cn.ibizlab.businesscentral.core.odoo_uom.service.IUom_categoryService uomCategoryService;
-    @Autowired
-    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_uom.service.IUom_uomService uomUomService;
 
     protected int batchSize = 500;
@@ -249,16 +246,6 @@ public class Purchase_requisition_lineServiceImpl extends ServiceImpl<Purchase_r
         this.remove(new QueryWrapper<Purchase_requisition_line>().eq("move_dest_id",id));
     }
 
-	@Override
-    public List<Purchase_requisition_line> selectByProductUomCategoryId(Long id) {
-        return baseMapper.selectByProductUomCategoryId(id);
-    }
-
-    @Override
-    public void removeByProductUomCategoryId(Long id) {
-        this.remove(new QueryWrapper<Purchase_requisition_line>().eq("product_uom_category_id",id));
-    }
-
 	@Override
     public List<Purchase_requisition_line> selectByProductUomId(Long id) {
         return baseMapper.selectByProductUomId(id);
@@ -356,16 +343,6 @@ public class Purchase_requisition_lineServiceImpl extends ServiceImpl<Purchase_r
             }
             et.setMoveDestName(movedest.getName());
         }
-        //实体关系[DER1N_PURCHASE_REQUISITION_LINE_UOM_CATEGORY_PRODUCT_UOM_CATEGORY_ID]
-        if(!ObjectUtils.isEmpty(et.getProductUomCategoryId())){
-            cn.ibizlab.businesscentral.core.odoo_uom.domain.Uom_category productuomcategory=et.getProductuomcategory();
-            if(ObjectUtils.isEmpty(productuomcategory)){
-                cn.ibizlab.businesscentral.core.odoo_uom.domain.Uom_category majorEntity=uomCategoryService.get(et.getProductUomCategoryId());
-                et.setProductuomcategory(majorEntity);
-                productuomcategory=majorEntity;
-            }
-            et.setProductUomCategoryName(productuomcategory.getName());
-        }
         //实体关系[DER1N_PURCHASE_REQUISITION_LINE_UOM_UOM_PRODUCT_UOM_ID]
         if(!ObjectUtils.isEmpty(et.getProductUomId())){
             cn.ibizlab.businesscentral.core.odoo_uom.domain.Uom_uom productuom=et.getProductuom();

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_uom/service/impl/Uom_categoryServiceImpl.java

@@ -48,9 +48,6 @@ import org.springframework.util.StringUtils;
 @Service("Uom_categoryServiceImpl")
 public class Uom_categoryServiceImpl extends ServiceImpl<Uom_categoryMapper, Uom_category> implements IUom_categoryService {
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_lineService purchaseRequisitionLineService;
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_uom.service.IUom_uomService uomUomService;

businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json

@@ -124286,22 +124286,6 @@
     "major_field":0
     },
     {
-    "fieldname":"PRODUCT_UOM_CATEGORY_ID" ,
-    "codename":"Product_uom_category_id",
-    "field_logic_name":"计量单位类别",
-    "entity_name":"Purchase_requisition_line",
-    "ref_de":"UOM_CATEGORY",
-    "ref_field_name":"ID",
-    "relation_name":"DER1N_PURCHASE_REQUISITION_LINE_UOM_CATEGORY_PRODUCT_UOM_CATEGORY_ID",
-    "relation_codename":"ProductUomCategory",
-    "field_type":"PICKUP",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"BIGINT",
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"PRODUCT_UOM_ID" ,
     "codename":"Product_uom_id",
     "field_logic_name":"单位",
@@ -124385,23 +124369,6 @@
     "major_field":0
     },
     {
-    "fieldname":"PRODUCT_UOM_CATEGORY_NAME" ,
-    "codename":"Product_uom_category_name",
-    "field_logic_name":"计量单位类别",
-    "entity_name":"Purchase_requisition_line",
-    "ref_de":"UOM_CATEGORY",
-    "ref_field_name":"NAME",
-    "relation_name":"DER1N_PURCHASE_REQUISITION_LINE_UOM_CATEGORY_PRODUCT_UOM_CATEGORY_ID",
-    "relation_codename":"ProductUomCategory",
-    "field_type":"PICKUPTEXT",
-    "nullable":1,
-    "physical_field":0,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"PRODUCT_UOM_NAME" ,
     "codename":"Product_uom_name",
     "field_logic_name":"单位",
@@ -124476,12 +124443,6 @@
      "entity_name":"PURCHASE_REQUISITION_LINE",
      "ref_entity_name":"STOCK_MOVE"
     },
-    {"name":"DER1N_PURCHASE_REQUISITION_LINE_UOM_CATEGORY_PRODUCT_UOM_CATEGORY_ID",
-     "relation_type":"DER1N",
-     "code_name":"ProductUomCategory",
-     "entity_name":"PURCHASE_REQUISITION_LINE",
-     "ref_entity_name":"UOM_CATEGORY"
-    },
     {"name":"DER1N_PURCHASE_REQUISITION_LINE_UOM_UOM_PRODUCT_UOM_ID",
      "relation_type":"DER1N",
      "code_name":"ProductUom",
@@ -177826,12 +177787,6 @@
     }
     ],
     "subEntitys":[
-    {"name":"DER1N_PURCHASE_REQUISITION_LINE_UOM_CATEGORY_PRODUCT_UOM_CATEGORY_ID",
-     "relation_type":"DER1N",
-     "code_name":"ProductUomCategory",
-     "entity_name":"PURCHASE_REQUISITION_LINE",
-     "ref_entity_name":"UOM_CATEGORY"
-    },
     {"name":"DER1N_UOM_UOM__UOM_CATEGORY__CATEGORY_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_category",

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_requisition_lineDTO.java

@@ -198,15 +198,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
     @JsonSerialize(using = ToStringSerializer.class)
     private Long moveDestId;
 
-    /**
-     * 属性 [PRODUCT_UOM_CATEGORY_ID]
-     *
-     */
-    @JSONField(name = "product_uom_category_id")
-    @JsonProperty("product_uom_category_id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long productUomCategoryId;
-
     /**
      * 属性 [PRODUCT_UOM_ID]
      *
@@ -252,15 +243,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
     private String moveDestName;
 
-    /**
-     * 属性 [PRODUCT_UOM_CATEGORY_NAME]
-     *
-     */
-    @JSONField(name = "product_uom_category_name")
-    @JsonProperty("product_uom_category_name")
-    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
-    private String productUomCategoryName;
-
     /**
      * 属性 [PRODUCT_UOM_NAME]
      *
@@ -392,14 +374,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
         this.modify("move_dest_id",moveDestId);
     }
 
-    /**
-     * 设置 [PRODUCT_UOM_CATEGORY_ID]
-     */
-    public void setProductUomCategoryId(Long  productUomCategoryId){
-        this.productUomCategoryId = productUomCategoryId ;
-        this.modify("product_uom_category_id",productUomCategoryId);
-    }
-
     /**
      * 设置 [PRODUCT_UOM_ID]
      */