非资产消耗性采购取科目分配类别是F；采购订单增加明细的备注字段

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.jsp

@@ -29,7 +29,7 @@
         <div class="hg-form-cols">
             <div class="hg-form-row">
                 <x:selectC name="bsart" label="pr类型" disabled="true" labelCol="1" fieldCol="2" required="true"/>
-                <x:inputC name="knttp" label="科目分配类别" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+                <x:inputC name="knttp" label="科目分配类别" labelCol="1" fieldCol="2" required="true" readonly="true"/>
                 <x:inputC name="banfn" label="采购申请编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>
             </div>
         </div>

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.js

@@ -220,9 +220,8 @@ function loadSuppliersItemPeriodListGrid() {
                 {
                     // 行号加一
                     sequence: (sapSuppliersItemPeriodGridManager.getData().length + 1)*10,
+                    ltsnr: (sapSuppliersItemPeriodGridManager.getData().length + 1)*10,
                     webre:"X",
-                    waers:"CNY",
-                    waersTextView:"CNY-人民币",
                     kalsk:"Z1",
                     telf1: $("#buGroup").val() == "Z005" ? $("#mobNumber").val():""
 
@@ -265,6 +264,9 @@ function loadSuppliersItemPeriodListGrid() {
             if (c.name == 'telf1' && $("#buGroup").val() == "Z005") {
                 $("#mobNumber").val(data.telf1)
             }
+            if (c.name == 'waersTextView' ) {
+                sapSuppliersItemPeriodGridManager.updateRow(data,{ltsbz:data.ltsnr+"-"+ data.waersTextView});
+            }
         },
     });
     UICtrl.setSearchAreaToggle(sapSuppliersItemPeriodGridManager);
@@ -276,13 +278,26 @@ function getItemPeriodColumns(){
         display: "行号", name: "sequence", width: 80, minWidth: 60, type: "String", align: "left",
         //editor: {type: 'spinner', min: 1, max: 100, mask: 'nnn'}
     },)
+    columns.push({
+        display: "采购组织", name: "ekorgTextView", width: 200, minWidth: 60, type: "String", align: "left",
+        editor: {
+            type: 'dictionary',
+            data: {name: 'ekorg'},
+            textField: 'ekorgTextView',
+            valueField: 'ekorg',
+            required: true,
+            render: function (item) {
+                return item.ekorgTextView;
+            }
+        },
+    },)
     columns.push({
         display: "供应商子范围", name: "ltsnr", width: 100, minWidth: 60, type: "String", align: "left",
-        editor: {type: 'text', required: true}
+        //editor: {type: 'text', required: true}
     },)
     columns.push({
         display: "供应商子范围描述", name: "ltsbz", width: 120, minWidth: 60, type: "String", align: "left",
-        editor: {type: 'text', required: true}
+        //editor: {type: 'text', required: true}
     },)
     // columns.push({
     //     display: "工厂", name: "werks", width: 100, minWidth: 60, type: "String", align: "left",

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -97,7 +97,7 @@ public class ResourceSearchController {
                     mapList.add(map);
                 }
             } else if ("ZNE2".equals(filterValue)) {
-                if ("F".equals(key) || "K".equals(key)) {
+                if ("K".equals(key)) {
                     mapList.add(map);
                 }
             }

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

@@ -187,14 +187,13 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
             String execute = httpClient.execute(sapPurchaseVo, url);
             List<SapResult> resultList = JSONObject.parseArray(execute, SapResult.class);
             SapResult sapResult = resultList.get(0);
+            resultMap.put("TYPE", sapResult.getTYPE());
+            resultMap.put("MESSAGE", sapResult.getMESSAGE());
             if (!"S".equals(sapResult.getTYPE())){
                 List<String> messages = resultList
                         .stream()
                         .map(SapResult::getMESSAGE).collect(Collectors.toList());
                 throw new RuntimeException("数据传输失败，"+ String.join("；",messages));
-            } else {
-                resultMap.put("TYPE", sapResult.getTYPE());
-                resultMap.put("MESSAGE", sapResult.getMESSAGE());
             }
             sapPurchase.setBanfn(sapResult.getMESSAGE_V1());//SAP采购申请编号
             sapPurchaseRepository.save(sapPurchase);

topsun/src/main/java/com/huigou/topsun/sap/purchase/controller/SapPurchaseController.java

@@ -89,6 +89,7 @@ public class SapPurchaseController extends CommonController {
             case "ZFW"://服务类采购申请
                 return forward("sapPurchaseDetail",sapPurchase);
             case "ZNE2"://非资产类消耗性采购申请
+                sapPurchase.setKnttp("K");
                 return forward("sapZNE2PurchaseDetail",sapPurchase);
         }
         return null;

topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/vo/SapPurchaseVo.java

@@ -30,4 +30,12 @@ public class SapPurchaseVo implements Serializable {
     public void setItemVos(List<SapPurchaseItemVo> itemVos) {
         this.itemVos = itemVos;
     }
+
+    public String getBsart() {
+        return bsart;
+    }
+
+    public List<SapPurchaseItemVo> getItemVos() {
+        return itemVos;
+    }
 }

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

@@ -495,6 +495,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 String zpacknum = purchaseOrderItem.getZpackrequnum();
                 String zpackunit = purchaseOrderItem.getZpackunit();
                 String zlosspack = purchaseOrderItem.getZlosspack();
+                String ltext = purchaseOrderItem.getLtext();
                 if (StringUtil.isNotBlank(zpackrequ)){
                     strList.add(zpackrequ);
                 }
@@ -507,6 +508,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 if (StringUtil.isNotBlank(zlosspack)){
                     strList.add(zlosspack);
                 }
+                if (StringUtil.isNotBlank(ltext)){
+                    strList.add(ltext);
+                }
                 if (StringUtil.isNotBlank(vbeln)){
                     headText2 = headText2 + vbeln + "："+ String.join(";", strList);
                 }

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

@@ -280,4 +280,9 @@ public class SapPurchaseOrderItem extends AbstractEntity {
     @Column(name="ZLOSSPACK")
     private String  zlosspack;
 
+    /**
+     * 备注
+     */
+    @Column(name = "LTEXT")
+    private String  ltext;
 }
\ No newline at end of file

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

@@ -181,4 +181,10 @@ public class SapPurchaseOrderItemVo {
     @JsonProperty("ZLOSSPACK")
     private String  zlosspack;
 
+    /**
+     * 备注
+     */
+    @JsonProperty("LTEXT")
+    private String  ltext;
+
 }
\ No newline at end of file