固定资产增加使用情况、取得方式字段

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.jsp

@@ -48,6 +48,8 @@
         <x:hidden name="kostl" />
         <x:inputC name="kostlvName" required="false" label="责任成本中心" labelCol="2" maxLength="64" fieldCol="4"  wrapper="select"/>
         <x:hidden name="kostlv" />
+        <x:selectC name="ord41" required="true" label="使用情况" labelCol="2" dictionary="ord41" fieldCol="4"/>
+        <x:selectC name="ord42" required="true" label="取得方式" labelCol="2" dictionary="ord42" fieldCol="4"/>
     </div>
     <div class="blank_div clearfix"></div>
 </form>

topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js

@@ -40,6 +40,8 @@ function loadCostCenterListGrid() {
             {display: "成本中心名称", name: "kostlName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "责任成本中心", name: "kostlv", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "责任成本中心名称", name: "kostlvName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "使用情况", name: "ord41TextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "取得方式", name: "ord42TextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "流程状态", name: "statusTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "人员名称", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "left"},

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssets.java

@@ -134,6 +134,20 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
     @Column(name = "MESSAGE_V1")
     private String messageV1;
 
+    /**
+     * 使用情况
+     * 1-外购、2-自制、3-合并新增
+     */
+    @Column(name = "ORD41")
+    private String ord41;
+
+    /**
+     * 取得方式
+     * 1-在用、2-闲置、3-在建 、4-停建
+     */
+    @Column(name = "ORD42")
+    private String ord42;
+
     @Override
     protected String getCodeRuleId() {
         return "sapFixedAssets";

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/vo/SapFixedAssetsReturnVo.java

@@ -90,6 +90,36 @@ public class SapFixedAssetsReturnVo implements Serializable {
     @JsonProperty(value = "KOSTLV",required = true)
     private String kostlv;
 
+    /**
+     * 使用情况
+     * 1-外购、2-自制、3-合并新增
+     */
+    @JsonProperty("ORD41")
+    private String ord41;
+
+    /**
+     * 取得方式
+     * 1-在用、2-闲置、3-在建 、4-停建
+     */
+    @JsonProperty("ORD42")
+    private String ord42;
+
+    public String getOrd41() {
+        return ord41;
+    }
+
+    public void setOrd41(String ord41) {
+        this.ord41 = ord41;
+    }
+
+    public String getOrd42() {
+        return ord42;
+    }
+
+    public void setOrd42(String ord42) {
+        this.ord42 = ord42;
+    }
+
     public String getZfibpmnr() {
         return zfibpmnr;
     }

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/vo/SapFixedAssetsVo.java

@@ -115,6 +115,10 @@ public class SapFixedAssetsVo implements Serializable {
 
     private String kostlvName;
 
+    private String ord41;
+
+    private String ord42;
+
     public static SapFixedAssets getSapFixedAssets(SapFixedAssetsVo sapFixedAssetsVo) {
         return JSON.parseObject(JSON.toJSONString(sapFixedAssetsVo), SapFixedAssets.class);
     }

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -509,7 +509,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     public void abortPurchaseApproval(String id,String jobPageId) {
         //先标记终止状态
         SapPurchaseApproval purchaseApproval = sapPurchaseApprovalRepository.findOne(id);
-        if ("E".equals(purchaseApproval.getType()) && purchaseApproval.getMessage().contains("不存在")){
+        if ("E".equals(purchaseApproval.getType())){
             purchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
             //删除待办
             actApplication.deleteRuntimeTaskExtension(jobPageId);