xignzi006 发布系统代码

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

@@ -53,6 +53,7 @@ public class Purchase_requisition extends EntityMP implements Serializable {
     /**
      * 申请编号
      */
+    @DEField(defaultValue = "New")
     @TableField(value = "name")
     @JSONField(name = "name")
     @JsonProperty("name")
@@ -191,6 +192,13 @@ public class Purchase_requisition extends EntityMP implements Serializable {
     @JSONField(name = "vendor_id_text")
     @JsonProperty("vendor_id_text")
     private String vendorIdText;
+    /**
+     * 设置数量方式
+     */
+    @TableField(exist = false)
+    @JSONField(name = "quantity_copy")
+    @JsonProperty("quantity_copy")
+    private String quantityCopy;
 
     /**
      * 

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

@@ -121,7 +121,7 @@ public class Purchase_requisition_type extends EntityMP implements Serializable
     @JsonProperty("exclusive")
     private String exclusive;
     /**
-     * 数量
+     * 设置数量方式
      */
     @DEField(name = "quantity_copy")
     @TableField(value = "quantity_copy")
@@ -224,7 +224,7 @@ public class Purchase_requisition_type extends EntityMP implements Serializable
     }
 
     /**
-     * 设置 [数量]
+     * 设置 [设置数量方式]
      */
     public void setQuantityCopy(String quantityCopy){
         this.quantityCopy = quantityCopy ;

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

@@ -83,7 +83,7 @@ public class Purchase_requisition_typeSearchContext extends QueryWrapperContext<
             this.getSearchCond().eq("exclusive", n_exclusive_eq);
         }
     }
-	private String n_quantity_copy_eq;//[数量]
+	private String n_quantity_copy_eq;//[设置数量方式]
 	public void setN_quantity_copy_eq(String n_quantity_copy_eq) {
         this.n_quantity_copy_eq = n_quantity_copy_eq;
         if(!ObjectUtils.isEmpty(this.n_quantity_copy_eq)){

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

@@ -278,6 +278,7 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
                 odooType=majorEntity;
             }
             et.setTypeIdText(odooType.getName());
+            et.setQuantityCopy(odooType.getQuantityCopy());
         }
         //实体关系[DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID]
         if(!ObjectUtils.isEmpty(et.getVendorId())){

businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_requisition/Purchase_requisitionMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Purchase_requisitionResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -26,6 +26,7 @@
 		<result property="orderCount" column="order_count" />
 		<result property="vendorId" column="vendor_id" />
 		<result property="vendorIdText" column="vendor_id_text" />
+		<result property="quantityCopy" column="quantity_copy" />
             
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
@@ -78,12 +79,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID  
 			]]>
     </sql>
 </mapper>

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

@@ -71323,7 +71323,7 @@
     "field_logic_name":"实施",
     "entity_name":"Ir_sequence",
     "field_type":"SSCODELIST",
-    "dict":"IR_SEQUENCE_IMPLEMENTATION",
+    "dict":"IR_SEQUENCE__IMPLEMENTATION",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
@@ -124506,6 +124506,24 @@
     "data_length":100,
     "key_field":0,
     "major_field":0
+    },
+    {
+    "fieldname":"QUANTITY_COPY" ,
+    "codename":"Quantity_copy",
+    "field_logic_name":"设置数量方式",
+    "entity_name":"Purchase_requisition",
+    "ref_de":"PURCHASE_REQUISITION_TYPE",
+    "ref_field_name":"QUANTITY_COPY",
+    "relation_name":"DER1N_PURCHASE_REQUISITION_PURCHASE_REQUISITION_TYPE_TYPE_ID",
+    "relation_codename":"Odoo_type",
+    "field_type":"PICKUPDATA",
+    "dict":"PURCHASE_REQUISITION_TYPE__QUANTITY_COPY",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":60,
+    "key_field":0,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -125117,6 +125135,7 @@
     "field_logic_name":"供应商选择",
     "entity_name":"Purchase_requisition_type",
     "field_type":"SSCODELIST",
+    "dict":"PURCHASE_REQUISITION_TYPE__EXCLUSIVE",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
@@ -125127,7 +125146,7 @@
     {
     "fieldname":"QUANTITY_COPY" ,
     "codename":"Quantity_copy",
-    "field_logic_name":"数量",
+    "field_logic_name":"设置数量方式",
     "entity_name":"Purchase_requisition_type",
     "field_type":"SSCODELIST",
     "nullable":1,
@@ -125143,6 +125162,7 @@
     "field_logic_name":"明细行",
     "entity_name":"Purchase_requisition_type",
     "field_type":"SSCODELIST",
+    "dict":"PURCHASE_REQUISITION_TYPE__LINE_COPY",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",

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

@@ -200,6 +200,15 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
     private String vendorIdText;
 
+    /**
+     * 属性 [QUANTITY_COPY]
+     *
+     */
+    @JSONField(name = "quantity_copy")
+    @JsonProperty("quantity_copy")
+    @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    private String quantityCopy;
+
 
     /**
      * 设置 [NAME]