固定资产转移附件不显示问题；采购订单字段对应修改；质量信息记录增加供应商名称

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

@@ -11,7 +11,7 @@ function initialize(){
         borderTopWidth : 0
     });
     $('#sapAssessMoveList').fileList({
-        bizId : $("#attbizId").val()
+        bizId : $("#id").val()
     });
     UICtrl.layout("#layout", {leftWidth: 3});
 }

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

@@ -32,7 +32,7 @@
     <div id="maingrid" style="margin: 2px;">
     </div>
     <div style="padding-top: 15px;">
-        <x:fileList bizCode="sapAssessMove" bizId="attbizId" id="sapAssessMoveList" title="相关资料" />
+        <x:fileList bizCode="sapAssessMove" bizId="id" id="sapAssessMoveList" title="相关资料" />
     </div>
 </form>
 </body>

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

@@ -46,9 +46,10 @@ function getGridColumns() {
         {display: "库存地点", name: "lgort", width: "100", align: "left", type: "string"},
         {display: "库存地点的描述", name: "lgobe", width: "200", align: "left", type: "string"},
         {display: "含税单价", name: "netpr", width: "100", align: "left", type: "string"},
-        {display: "价格单位", name: "peinh", width: "100", align: "left", type: "string"},
-        {display: "税码", name: "mwskz", width: "100", align: "left", type: "string"},
-        {display: "含税总价", name: "netwr", width: "100", align: "left", type: "string"},
+        {display: "价格基数", name: "peinh", width: "100", align: "left", type: "string"},
+        //{display: "税码", name: "mwskz", width: "100", align: "left", type: "string"},
+        {display: "进项税率(%)", name: "kbetr", width: "100", align: "left", type: "string"},
+        {display: "含税总额", name: "netwr", width: "100", align: "left", type: "string"},
         {display: "退货项目", name: "retpo", width: "100", align: "left", type: "string"},
         {display: "总账科目", name: "sakto", width: "100", align: "left", type: "string"},
         {display: "成本中心", name: "kostl", width: "200", align: "left", type: "string"},

topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js

@@ -126,6 +126,9 @@ function getGridColumns() {
             //     },
             // }
         },
+        {display: "供应商名称", name: "lifnrName", width: "200", align: "left", type: "string",
+            editor: {required: false, type: "text"}
+        },
         {display: "物料编码", name: "matnr", width: "200", align: "left", type: "string",
             editor: {
                 required: false, type: "select",

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

@@ -147,6 +147,12 @@ public class SapPurchaseOrderItem extends AbstractEntity {
     @Column(name = "MWSKZ")
     private String mwskz;
 
+    /**
+     * 税率
+     */
+    @Column(name = "KBETR")
+    private String kbetr;
+
 
     /**
      * 总价

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

@@ -71,6 +71,9 @@ public class SapPurchaseOrderItemVo {
     @JsonProperty("MWSKZ")
     private String mwskz;
 
+    @JsonProperty("KBETR")
+    private String kbetr;
+
     @JsonProperty("NETWR")
     private Double netwr;
 

topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/domain/vo/SapQualityInfoRecordItemVo.java

@@ -45,6 +45,12 @@ public class SapQualityInfoRecordItemVo implements Serializable {
     @JsonProperty("LIEFERANT")
     private String lieferant;
 
+    /**
+     * 供应商名称
+     */
+    @JsonProperty("ZMMVENNAME")
+    private String lifnrName;
+
     /**
      * 合格准入验证节点1
      */