xignzi006 发布系统代码 [Spring Boot]

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

@@ -316,7 +316,7 @@ public class Purchase_order_line extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -621,14 +621,6 @@ public class Purchase_order_line extends EntityMP implements Serializable {
         this.modify("qty_invoiced",qtyInvoiced);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [分析账户]
      */

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

@@ -220,7 +220,7 @@ public class Purchase_requisition extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -492,14 +492,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
         this.modify("user_id",userId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ID]
      */

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

@@ -158,7 +158,7 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -399,14 +399,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
         this.modify("requisition_id",requisitionId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [说明]
      */

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

@@ -76,6 +76,8 @@ public interface IPurchase_requisitionService extends IService<Purchase_requisit
      */
     boolean execute(String sql, Map param);
 
+    List<Purchase_requisition> getPurchaseRequisitionByIds(List<Long> ids) ;
+    List<Purchase_requisition> getPurchaseRequisitionByEntities(List<Purchase_requisition> entities) ;
 }
 
 

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

@@ -69,6 +69,8 @@ public interface IPurchase_requisition_lineService extends IService<Purchase_req
      */
     boolean execute(String sql, Map param);
 
+    List<Purchase_requisition_line> getPurchaseRequisitionLineByIds(List<Long> ids) ;
+    List<Purchase_requisition_line> getPurchaseRequisitionLineByEntities(List<Purchase_requisition_line> entities) ;
 }
 
 

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

@@ -458,6 +458,25 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
         return true;
     }
 
+    @Override
+    public List<Purchase_requisition> getPurchaseRequisitionByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Purchase_requisition> getPurchaseRequisitionByEntities(List<Purchase_requisition> entities) {
+        List ids =new ArrayList();
+        for(Purchase_requisition entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

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

@@ -418,6 +418,25 @@ public class Purchase_requisition_lineServiceImpl extends EBSServiceImpl<Purchas
         return true;
     }
 
+    @Override
+    public List<Purchase_requisition_line> getPurchaseRequisitionLineByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Purchase_requisition_line> getPurchaseRequisitionLineByEntities(List<Purchase_requisition_line> entities) {
+        List ids =new ArrayList();
+        for(Purchase_requisition_line entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -1105,7 +1105,7 @@
     "sysmoudle":{"id":"ODOO_PURCHASE","name":"[ODOO]采购"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Action_cancel" , "name":"取消" , "type":"USERCUSTOM" },{"id":"Action_done" , "name":"关闭" , "type":"USERCUSTOM" },{"id":"Action_draft" , "name":"重置为草稿" , "type":"USERCUSTOM" },{"id":"Action_in_progress" , "name":"确认" , "type":"USERCUSTOM" },{"id":"Action_open" , "name":"验证" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"MasterTabCount" , "name":"主数据分页计数" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
-    "datascope":[{"id":"all","name":"全部数据"}]
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} ]
      }
     ,    {
     "dename":"Account_invoice_tax",
@@ -1793,7 +1793,7 @@
     "sysmoudle":{"id":"ODOO_PURCHASE","name":"[ODOO]采购"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
-    "datascope":[{"id":"all","name":"全部数据"}]
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} ]
      }
     ,    {
     "dename":"Crm_activity_report",
@@ -2105,7 +2105,7 @@
     "sysmoudle":{"id":"ODOO_PURCHASE","name":"[ODOO]采购"},
     "dedataset":[{"id":"Calc_order_amount" , "name":"calc_order_amount"},{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"建立数据" , "type":"BUILTIN" },{"id":"Update" , "name":"更新数据" , "type":"BUILTIN" },{"id":"Remove" , "name":"删除数据" , "type":"BUILTIN" },{"id":"Get" , "name":"获取数据" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Calc_amount" , "name":"计算订单金额" , "type":"DELOGIC" },{"id":"Calc_price" , "name":"计算金额" , "type":"USERCUSTOM" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"CreateBatch" , "name":"批建立数据" , "type":"BUILTIN" },{"id":"Product_change" , "name":"选择产品" , "type":"USERCUSTOM" },{"id":"RemoveBatch" , "name":"批删除数据" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"UpdateBatch" , "name":"批更新数据" , "type":"BUILTIN" }],
-    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} , {"id":"createman","name":"创建人"}]
      }
     ,    {
     "dename":"Survey_survey",

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

@@ -134235,6 +134235,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -135687,6 +135688,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -136092,6 +136094,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0

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

@@ -563,14 +563,6 @@ public class Purchase_order_lineDTO extends DTOBase implements Serializable {
         this.modify("qty_invoiced",qtyInvoiced);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ACCOUNT_ANALYTIC_ID]
      */

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

@@ -386,14 +386,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
         this.modify("user_id",userId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [CURRENCY_ID]
      */

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

@@ -315,14 +315,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
         this.modify("requisition_id",requisitionId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [MOVE_DEST_ID]
      */