成品外购第一个审批人是申请人；增加备注字段

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

@@ -40,8 +40,8 @@
                           required="false"/>
                 <x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2"
                           required="false"/>
-                <x:inputC name="namel" label="供应商" readonly="true" labelCol="1" fieldCol="2"
-                          required="false"/>
+                <x:inputC name="namel" label="供应商" readonly="true" labelCol="1" fieldCol="2" required="false"/>
+                <x:inputC name="headText" label="备注" readonly="true" labelCol="1" fieldCol="8" required="false"/>
             </div>
         </div>
         <x:title title="sap回执" name="group"/>

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

@@ -102,7 +102,7 @@ function viewHandler(id) {
     UICtrl.addTabItem({
         tabid: 'viewPurchase' + id,
         text: '查看采购订单',
-        url: web_app.name + '/sapPurchaseOrder/showSapPurchaseOrderDetail.job?bizId=' + id
+        url: web_app.name + '/sapPurchaseOrder/showSapPurchaseOrderDetail.job?isReadOnly=true&bizId=' + id
     });
 }
 

topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -231,7 +231,7 @@
     </colgroup>
     <tr>
         <td class="center">备注</td>
-        <td class="left" style="height: 80px"></td>
+        <td class="left" style="height: 80px">${headText?default("")?html}</td>
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">

topsun-xt/src/main/webapp/template/print/topsun/productProcessOuter.ftl

@@ -231,7 +231,7 @@
     </colgroup>
     <tr>
         <td class="center">备注</td>
-        <td class="left" style="height: 80px"></td>
+        <td class="left" style="height: 80px">${headText?default("")?html}</td>
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">

topsun/src/main/java/com/huigou/topsun/common/Function.java

@@ -153,4 +153,15 @@ public class Function extends AbstractDaoFunction {
 		ArrayList<OrgUnit> orgUnitArrayList = new ArrayList<>(orgUnitHashSet);
 		return orgUnitArrayList;
 	}
+
+	/**
+	 * 根据业务主表id查询申请人
+	 * @param bizId
+	 * @return
+	 */
+	public List<OrgUnit> findPurchaseOrderPersonMember(String bizId){
+		Assert.hasText(bizId, "参数id不能为空。");
+		String sql = this.getSqlByname("findPurchaseOrderPersonMember");
+		return this.sqlExecutorDao.queryToList(sql, OrgUnit.class,bizId);
+	}
 }

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

@@ -148,7 +148,16 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     @Override
     protected Map<String, Object> getProcessBizParams(String bizId) {
         // 返回业务数据给流程实例
-        return ClassHelper.toMap(sapPurchaseOrderRepository.getOne(bizId));
+        SapPurchaseOrder purchaseOrder = sapPurchaseOrderRepository.getOne(bizId);
+        Map<String, Object> map = ClassHelper.toMap(purchaseOrder);
+        List<SapPurchaseOrderItem> purchaseOrderItems = sapPurchaseOrderItemApplication.getPurchaseOrderItems(bizId);
+        Set<String> collect = purchaseOrderItems.stream().map(SapPurchaseOrderItem::getKnttp).collect(Collectors.toSet());
+        String next = "";
+        if (collect.iterator().hasNext()){
+            next = collect.iterator().next();
+        }
+        map.put("knttp",next);
+        return map;
     }
     /**
      * 流程撤销事件

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

@@ -172,6 +172,9 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
     @Column(name = "send_out")
     private String sendOut;
 
+    @Column(name = "HEAD_TEXT")
+    private String headText;
+
     @Override
     protected String getCodeRuleId() {
         return "sapPurchaseOrder";

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderVo.java

@@ -66,4 +66,7 @@ public class SapPurchaseOrderVo implements Serializable {
     @JsonProperty("LIFNR")
     private String lifnr;
 
+    @JsonProperty("HEAD_TEXT")
+    private String headText;
+
 }

topsun/src/main/resources/config/topsun/base/function.xml

@@ -93,5 +93,11 @@
 			 LEFT JOIN ep_change_form cf ON cf.id = si.ep_change_form_id
 			 WHERE cf.id = ?
 		</sql>
+
+		<!--根据单据ID查询申请人-->
+		<sql name="findPurchaseOrderPersonMember">
+			SELECT o.FULL_ID, o.FULL_NAME
+			FROM sa_oporg o LEFT JOIN sap_purchase_order t ON t.person_member_id = o.id WHERE t.id = ?
+		</sql>
 	</query>
 </query-mappings>
\ No newline at end of file