采购订单增加采购订单总金额字段；增加查询条件；修改任务标题

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js

@@ -22,6 +22,9 @@ function initItemGrid() {
             usePager: true,
             rownumbers: true,
             // fixedCellHeight: true,
+            onAfterShowData: function (){
+                initTotalMoney();
+            }
         }
     );
     UICtrl.setSearchAreaToggle(itemGridManager);
@@ -60,6 +63,19 @@ function getGridColumns() {
 
 }
 
+function initTotalMoney(){
+    var _grid = UICtrl.getGridManager('#maingrid');
+    if (_grid != null){
+        var data = _grid.currentData.Rows;
+        var totalMoney = 0;
+        $.each(data, function (i, o) {
+            var _netwr = o['netwr'] + '';
+            totalMoney = MathUtil.add(totalMoney, _netwr);
+            $('#totalMoney').val(totalMoney);
+        });
+    }
+}
+
 
 function getId() {
     return $('#id').val();

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp

@@ -37,6 +37,8 @@
                 <x:inputC name="waers" label="币种" readonly="true" labelCol="1" fieldCol="2" required="false"/>
                 <x:inputC name="fillinDate" label="创建日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
                           required="false"/>
+                <x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2"
+                          required="false"/>
             </div>
         </div>
         <x:title title="sap回执" name="group"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.jsp

@@ -19,6 +19,23 @@
                     <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
                     <x:inputC name="ebeln" label="采购订单号码" labelCol="1"/>
                 </div>
+                <div class="hg-form-row">
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">申请日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">申请日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
+                    </div>
+                </div>
+                <div class="hg-form-row">
+                    <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
+                </div>
                 <x:searchButtons/>
             </form>
             <x:title title="" hideTable="#purchaseOrderGrid" name="list"/>

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -92,6 +92,25 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         return sapPurchaseOrder.getId();
     }
 
+    @Override
+    protected void setTaskDescription(DelegateTask delegateTask) {
+        String bizId = delegateTask.getExecution().getProcessBusinessKey();
+        delegateTask.setDescription(this.getApprovalSubjectName(bizId));
+    }
+
+    /**
+     * 获取任务标题
+     *
+     * @param bizId
+     * @return
+     */
+    private String getApprovalSubjectName(String bizId) {
+        SapPurchaseOrder sapPurchaseOrder = this.sapPurchaseOrderRepository.findOne(bizId);
+        //查询 单据日期
+        String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", sapPurchaseOrder.getFillinDate());
+        //设置标题
+        return String.format("%s-%s(%s)", sapPurchaseOrder.getBatxt(), sapPurchaseOrder.getEbeln(), fillinDateStr);
+    }
 
     @Override
     protected Map<String, Object> getProcessBizParams(String bizId) {

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java

 package com.huigou.topsun.sap.purchaseOrder.controller;
 
+import com.huigou.topsun.common.BillStatus;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
 import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
@@ -62,6 +63,7 @@ public class SapPurchaseOrderController extends CommonController {
 
 
     public String forwardSapPurchaseOrderList(){
+        this.putAttribute("statusKindsList", BillStatus.getValidMap());
         return forward("sapPurchaseOrderList");
     }
 

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -53,6 +54,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
     @Column(name = "WAERS")
     private String waers;
 
+    /**
+     * 订单总金额
+     */
+    @Column(name = "total_money")
+    private BigDecimal totalMoney;
+
 //    /**
 //     * 创建日期
 //     */

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/query/SapPurchaseOrderQueryRequest.java

@@ -4,6 +4,7 @@ import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.util.Date;
 
 /**
  * @Auther: xin.lu
@@ -28,4 +29,10 @@ public class SapPurchaseOrderQueryRequest extends QueryAbstractRequest {
      * 采购订单类型描述
      */
     private String batxt;
+
+    protected Date fillinBeginDate;
+
+    protected Date fillinEndDate;
+
+    private String statusKind;
 }

topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrder.xml

@@ -5,6 +5,10 @@
             select t.* from sap_purchase_order t
         </sql-query>
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="ebeln" name="ebeln" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
+        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
+        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
     </query>
 
 </query-mappings>
\ No newline at end of file