xignzi006 发布系统代码

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

@@ -68,13 +68,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     @JSONField(name = "write_date" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("write_date")
     private Timestamp writeDate;
-    /**
-     * 申请编号
-     */
-    @TableField(value = "name")
-    @JSONField(name = "name")
-    @JsonProperty("name")
-    private String name;
     /**
      * 创建人
      */
@@ -121,14 +114,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     @JSONField(name = "price_unit")
     @JsonProperty("price_unit")
     private Double priceUnit;
-    /**
-     * 已订购数量
-     */
-    @DEField(name = "qty_ordered")
-    @TableField(value = "qty_ordered")
-    @JSONField(name = "qty_ordered")
-    @JsonProperty("qty_ordered")
-    private Double qtyOrdered;
     /**
      * 安排的日期
      */
@@ -339,14 +324,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.format(writeDate);
     }
-    /**
-     * 设置 [申请编号]
-     */
-    public void setName(String name){
-        this.name = name ;
-        this.modify("name",name);
-    }
-
     /**
      * 设置 [创建人]
      */
@@ -379,14 +356,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
         this.modify("price_unit",priceUnit);
     }
 
-    /**
-     * 设置 [已订购数量]
-     */
-    public void setQtyOrdered(Double qtyOrdered){
-        this.qtyOrdered = qtyOrdered ;
-        this.modify("qty_ordered",qtyOrdered);
-    }
-
     /**
      * 设置 [安排的日期]
      */

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

@@ -27,13 +27,6 @@ import cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition
 @Data
 public class Purchase_requisition_lineSearchContext extends QueryWrapperContext<Purchase_requisition_line> {
 
-	private String n_name_like;//[申请编号]
-	public void setN_name_like(String n_name_like) {
-        this.n_name_like = n_name_like;
-        if(!ObjectUtils.isEmpty(this.n_name_like)){
-            this.getSearchCond().like("name", n_name_like);
-        }
-    }
 	private String n_create_uname_eq;//[创建人]
 	public void setN_create_uname_eq(String n_create_uname_eq) {
         this.n_create_uname_eq = n_create_uname_eq;
@@ -210,9 +203,6 @@ public class Purchase_requisition_lineSearchContext extends QueryWrapperContext<
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSearchCond().and( wrapper ->
-                     wrapper.like("name", query)   
-            );
 		 }
 	}
 }

businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_requisition_line/Purchase_requisition_lineMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Purchase_requisition_lineResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.QTY_ORDERED, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -19,7 +19,6 @@
 		<result property="writeUname" column="write_uname" />
 		<result property="productQty" column="product_qty" />
 		<result property="priceUnit" column="price_unit" />
-		<result property="qtyOrdered" column="qty_ordered" />
 		<result property="scheduleDate" column="schedule_date" />
 		<result property="productId" column="product_id" />
 		<result property="requisitionId" column="requisition_id" />
@@ -122,12 +121,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.QTY_ORDERED, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  
+		<![CDATA[ SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.QTY_ORDERED, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  
+		<![CDATA[ SELECT t1.ACCOUNT_ANALYTIC_ID, t81.NAME AS ACCOUNT_ANALYTIC_NAME, t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UNAME, t1.ID, t1.MOVE_DEST_ID, t111.NAME AS MOVE_DEST_NAME, t1.PRICE_UNIT, t1.PRODUCT_ID, t71.NAME AS PRODUCT_NAME, t1.PRODUCT_QTY, t1.PRODUCT_UOM_ID, t121.NAME AS PRODUCT_UOM_NAME, t1.REQUISITION_ID, t51.NAME AS REQUISITION_NAME, t1.SCHEDULE_DATE, t1.WRITE_DATE, t1.WRITE_UID, t41.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION_LINE t1  LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN RES_USERS t31 ON t1.WRITE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN PURCHASE_REQUISITION t51 ON t1.REQUISITION_ID = t51.ID  LEFT JOIN PRODUCT_PRODUCT t61 ON t1.PRODUCT_ID = t61.ID  LEFT JOIN PRODUCT_TEMPLATE t71 ON t61.PRODUCT_TMPL_ID = t71.ID  LEFT JOIN ACCOUNT_ANALYTIC_ACCOUNT t81 ON t1.ACCOUNT_ANALYTIC_ID = t81.ID  LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN STOCK_MOVE t111 ON t1.MOVE_DEST_ID = t111.ID  LEFT JOIN UOM_UOM t121 ON t1.PRODUCT_UOM_ID = t121.ID  
 			]]>
     </sql>
 </mapper>

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

@@ -124047,19 +124047,6 @@
     "major_field":0
     },
     {
-    "fieldname":"NAME" ,
-    "codename":"Name",
-    "field_logic_name":"申请编号",
-    "entity_name":"Purchase_requisition_line",
-    "field_type":"TEXT",
-    "nullable":0,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "major_field":1
-    },
-    {
     "fieldname":"CREATE_UNAME" ,
     "codename":"Create_uname",
     "field_logic_name":"创建人",
@@ -124150,18 +124137,6 @@
     "major_field":0
     },
     {
-    "fieldname":"QTY_ORDERED" ,
-    "codename":"Qty_ordered",
-    "field_logic_name":"已订购数量",
-    "entity_name":"Purchase_requisition_line",
-    "field_type":"FLOAT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"FLOAT",
-    "key_field":0,
-    "major_field":0
-    },
-    {
     "fieldname":"SCHEDULE_DATE" ,
     "codename":"Schedule_date",
     "field_logic_name":"安排的日期",

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

@@ -56,16 +56,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
     @JsonProperty("write_date")
     private Timestamp writeDate;
 
-    /**
-     * 属性 [NAME]
-     *
-     */
-    @JSONField(name = "name")
-    @JsonProperty("name")
-    @NotBlank(message = "[申请编号]不允许为空!")
-    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
-    private String name;
-
     /**
      * 属性 [CREATE_UNAME]
      *
@@ -118,14 +108,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
     @JsonProperty("price_unit")
     private Double priceUnit;
 
-    /**
-     * 属性 [QTY_ORDERED]
-     *
-     */
-    @JSONField(name = "qty_ordered")
-    @JsonProperty("qty_ordered")
-    private Double qtyOrdered;
-
     /**
      * 属性 [SCHEDULE_DATE]
      *
@@ -269,14 +251,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
         this.modify("write_date",writeDate);
     }
 
-    /**
-     * 设置 [NAME]
-     */
-    public void setName(String  name){
-        this.name = name ;
-        this.modify("name",name);
-    }
-
     /**
      * 设置 [CREATE_UID]
      */
@@ -309,14 +283,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
         this.modify("price_unit",priceUnit);
     }
 
-    /**
-     * 设置 [QTY_ORDERED]
-     */
-    public void setQtyOrdered(Double  qtyOrdered){
-        this.qtyOrdered = qtyOrdered ;
-        this.modify("qty_ordered",qtyOrdered);
-    }
-
     /**
      * 设置 [SCHEDULE_DATE]
      */