风险管理5月6日提交代码-liu.bolan

RMA/app/src/main/AndroidManifest.xml

@@ -222,7 +222,9 @@
 
         <activity android:name=".view.base.home.inventory.inventorymanager.AddInventoryActivity"/>
 
-        <activity android:name=".view.base.home.registration.WarehouseRegistrationActivity"/>
+        <activity android:name=".view.base.home.registration.WarehouseRegistrationActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan"/>
 
         <activity android:name=".view.base.home.inventory.inventorymanager.InventoryDetailsActivity"/>
 
@@ -257,6 +259,8 @@
         <activity android:name=".view.base.home.accountmanager.futureaccount.FutureCreditActivity"/>
 
         <activity android:name=".view.base.home.spotmarket.SpotMarketDetailsActivity"/>
+
+        <activity android:name=".view.base.home.accountmanager.futureaccount.AddTransactionUserActivity"/>
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/business/hedge/HedgePlanInfo.kt

@@ -22,5 +22,7 @@ data class HedgePlanInfo(
     var SpotGoodsDesc : String = "",
     var ConvertFactor : Double = 0.0,
     var PlanTime : String = "",
-    var PlanQty : Double = 0.0
+    var PlanQty : Double = 0.0,
+    var wrsdandid : String = "",//品类id
+    var accountId : String = ""//期货账户id
 )

RMA/app/src/main/java/cn/muchinfo/rma/business/hedge/adapter/HedgeAdapter.kt

@@ -128,6 +128,12 @@ object HedgeAdapter {
             builder.spotGoodsDesc = hedgePlanData.SpotGoodsDesc
             builder.convertFactor = hedgePlanData.ConvertFactor
             builder.planQty = hedgePlanData.PlanQty
+            if (hedgePlanData.wrsdandid.isNotEmpty()){
+                builder.wrStandardID = hedgePlanData.wrsdandid.toLong()
+            }
+            if (hedgePlanData.accountId.isNotEmpty()){
+                builder.accountID = hedgePlanData.accountId.toLong()
+            }
         }
         builder.planTime = TimeUtils.getNowString()
 

RMA/app/src/main/java/cn/muchinfo/rma/business/warehouse/adapter/WarehouseAdapter.kt

@@ -93,13 +93,19 @@ object WarehouseAdapter {
     fun analysisAreaInOutStockApplyRsq(packet50: Packet50) : Triple<Boolean, Error?, ManageServiceMI2.ERMCPAreaInOutStockApplyRsp?> {
 
         return try {
-            val loginRsp = ManageServiceMI2.ERMCPAreaInOutStockApplyRsp.parseFrom(packet50.content)
-            if (loginRsp.retCode == 0) {
+            val resultRsp = ManageServiceMI2.ERMCPAreaInOutStockApplyRsp.parseFrom(packet50.content)
+            if (resultRsp.retCode == 0) {
                 // 操作成功
-                Triple(true, null, loginRsp)
+                Triple(true, null, resultRsp)
             } else {
-                // 操作失败
-                Triple(false, Error(ErrorMessageUtils.getErrorString(loginRsp.retCode)), null)
+                if (resultRsp.retCode == -1){
+                    // 操作失败
+                    Triple(false, Error(resultRsp.retDesc), null)
+                }else{
+                    // 操作失败
+                    Triple(false, Error(ErrorMessageUtils.getErrorString(resultRsp.retCode)), null)
+                }
+
             }
         } catch (e: Exception) {
             // 操作失败
@@ -310,13 +316,18 @@ object WarehouseAdapter {
     fun analysisWarehouseApplyRsq(packet50: Packet50) : Triple<Boolean, Error?, ManageServiceMI2.WarehouseApplyRsp?> {
 
         return try {
-            val loginRsp = ManageServiceMI2.WarehouseApplyRsp.parseFrom(packet50.content)
-            if (loginRsp.retCode == 0) {
+            val resultRsp = ManageServiceMI2.WarehouseApplyRsp.parseFrom(packet50.content)
+            if (resultRsp.retCode == 0) {
                 // 操作成功
-                Triple(true, null, loginRsp)
+                Triple(true, null, resultRsp)
             } else {
-                // 操作失败
-                Triple(false, Error(ErrorMessageUtils.getErrorString(loginRsp.retCode)), null)
+                if (resultRsp.retCode == -1){
+                    // 操作失败
+                    Triple(false, Error(resultRsp.retDesc), null)
+                }else{
+                    // 操作失败
+                    Triple(false, Error(ErrorMessageUtils.getErrorString(resultRsp.retCode)), null)
+                }
             }
         } catch (e: Exception) {
             // 操作失败

RMA/app/src/main/java/cn/muchinfo/rma/protobuf/protoclasses/ManageServiceMI2.java

@@ -71189,7 +71189,7 @@ public final class ManageServiceMI2 {
 
     /**
      * <pre>
-     * int32 ��������-1:����ݸ�2:�ύ����
+     * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
      * </pre>
      *
      * <code>optional int32 OperateType = 16;</code>
@@ -71198,13 +71198,51 @@ public final class ManageServiceMI2 {
     boolean hasOperateType();
     /**
      * <pre>
-     * int32 ��������-1:����ݸ�2:�ύ����
+     * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
      * </pre>
      *
      * <code>optional int32 OperateType = 16;</code>
      * @return The operateType.
      */
     int getOperateType();
+
+    /**
+     * <pre>
+     * uint64 �ڻ��˻�ID
+     * </pre>
+     *
+     * <code>optional uint64 AccountID = 17;</code>
+     * @return Whether the accountID field is set.
+     */
+    boolean hasAccountID();
+    /**
+     * <pre>
+     * uint64 �ڻ��˻�ID
+     * </pre>
+     *
+     * <code>optional uint64 AccountID = 17;</code>
+     * @return The accountID.
+     */
+    long getAccountID();
+
+    /**
+     * <pre>
+     * uint64 �ֻ�Ʒ��ID
+     * </pre>
+     *
+     * <code>optional uint64 WRStandardID = 18;</code>
+     * @return Whether the wRStandardID field is set.
+     */
+    boolean hasWRStandardID();
+    /**
+     * <pre>
+     * uint64 �ֻ�Ʒ��ID
+     * </pre>
+     *
+     * <code>optional uint64 WRStandardID = 18;</code>
+     * @return The wRStandardID.
+     */
+    long getWRStandardID();
   }
   /**
    * <pre>
@@ -71354,6 +71392,16 @@ public final class ManageServiceMI2 {
               operateType_ = input.readInt32();
               break;
             }
+            case 136: {
+              bitField0_ |= 0x00010000;
+              accountID_ = input.readUInt64();
+              break;
+            }
+            case 144: {
+              bitField0_ |= 0x00020000;
+              wRStandardID_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -71972,7 +72020,7 @@ public final class ManageServiceMI2 {
     private int operateType_;
     /**
      * <pre>
-     * int32 ��������-1:����ݸ�2:�ύ����
+     * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
      * </pre>
      *
      * <code>optional int32 OperateType = 16;</code>
@@ -71984,7 +72032,7 @@ public final class ManageServiceMI2 {
     }
     /**
      * <pre>
-     * int32 ��������-1:����ݸ�2:�ύ����
+     * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
      * </pre>
      *
      * <code>optional int32 OperateType = 16;</code>
@@ -71995,6 +72043,60 @@ public final class ManageServiceMI2 {
       return operateType_;
     }
 
+    public static final int ACCOUNTID_FIELD_NUMBER = 17;
+    private long accountID_;
+    /**
+     * <pre>
+     * uint64 �ڻ��˻�ID
+     * </pre>
+     *
+     * <code>optional uint64 AccountID = 17;</code>
+     * @return Whether the accountID field is set.
+     */
+    @java.lang.Override
+    public boolean hasAccountID() {
+      return ((bitField0_ & 0x00010000) != 0);
+    }
+    /**
+     * <pre>
+     * uint64 �ڻ��˻�ID
+     * </pre>
+     *
+     * <code>optional uint64 AccountID = 17;</code>
+     * @return The accountID.
+     */
+    @java.lang.Override
+    public long getAccountID() {
+      return accountID_;
+    }
+
+    public static final int WRSTANDARDID_FIELD_NUMBER = 18;
+    private long wRStandardID_;
+    /**
+     * <pre>
+     * uint64 �ֻ�Ʒ��ID
+     * </pre>
+     *
+     * <code>optional uint64 WRStandardID = 18;</code>
+     * @return Whether the wRStandardID field is set.
+     */
+    @java.lang.Override
+    public boolean hasWRStandardID() {
+      return ((bitField0_ & 0x00020000) != 0);
+    }
+    /**
+     * <pre>
+     * uint64 �ֻ�Ʒ��ID
+     * </pre>
+     *
+     * <code>optional uint64 WRStandardID = 18;</code>
+     * @return The wRStandardID.
+     */
+    @java.lang.Override
+    public long getWRStandardID() {
+      return wRStandardID_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -72057,6 +72159,12 @@ public final class ManageServiceMI2 {
       if (((bitField0_ & 0x00008000) != 0)) {
         output.writeInt32(16, operateType_);
       }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        output.writeUInt64(17, accountID_);
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        output.writeUInt64(18, wRStandardID_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -72125,6 +72233,14 @@ public final class ManageServiceMI2 {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(16, operateType_);
       }
+      if (((bitField0_ & 0x00010000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(17, accountID_);
+      }
+      if (((bitField0_ & 0x00020000) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(18, wRStandardID_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -72222,6 +72338,16 @@ public final class ManageServiceMI2 {
         if (getOperateType()
             != other.getOperateType()) return false;
       }
+      if (hasAccountID() != other.hasAccountID()) return false;
+      if (hasAccountID()) {
+        if (getAccountID()
+            != other.getAccountID()) return false;
+      }
+      if (hasWRStandardID() != other.hasWRStandardID()) return false;
+      if (hasWRStandardID()) {
+        if (getWRStandardID()
+            != other.getWRStandardID()) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -72303,6 +72429,16 @@ public final class ManageServiceMI2 {
         hash = (37 * hash) + OPERATETYPE_FIELD_NUMBER;
         hash = (53 * hash) + getOperateType();
       }
+      if (hasAccountID()) {
+        hash = (37 * hash) + ACCOUNTID_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getAccountID());
+      }
+      if (hasWRStandardID()) {
+        hash = (37 * hash) + WRSTANDARDID_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getWRStandardID());
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -72477,6 +72613,10 @@ public final class ManageServiceMI2 {
         bitField0_ = (bitField0_ & ~0x00004000);
         operateType_ = 0;
         bitField0_ = (bitField0_ & ~0x00008000);
+        accountID_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00010000);
+        wRStandardID_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00020000);
         return this;
       }
 
@@ -72573,6 +72713,14 @@ public final class ManageServiceMI2 {
           result.operateType_ = operateType_;
           to_bitField0_ |= 0x00008000;
         }
+        if (((from_bitField0_ & 0x00010000) != 0)) {
+          result.accountID_ = accountID_;
+          to_bitField0_ |= 0x00010000;
+        }
+        if (((from_bitField0_ & 0x00020000) != 0)) {
+          result.wRStandardID_ = wRStandardID_;
+          to_bitField0_ |= 0x00020000;
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -72680,6 +72828,12 @@ public final class ManageServiceMI2 {
         if (other.hasOperateType()) {
           setOperateType(other.getOperateType());
         }
+        if (other.hasAccountID()) {
+          setAccountID(other.getAccountID());
+        }
+        if (other.hasWRStandardID()) {
+          setWRStandardID(other.getWRStandardID());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -73904,7 +74058,7 @@ public final class ManageServiceMI2 {
       private int operateType_ ;
       /**
        * <pre>
-       * int32 ��������-1:����ݸ�2:�ύ����
+       * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
        * </pre>
        *
        * <code>optional int32 OperateType = 16;</code>
@@ -73916,7 +74070,7 @@ public final class ManageServiceMI2 {
       }
       /**
        * <pre>
-       * int32 ��������-1:����ݸ�2:�ύ����
+       * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
        * </pre>
        *
        * <code>optional int32 OperateType = 16;</code>
@@ -73928,7 +74082,7 @@ public final class ManageServiceMI2 {
       }
       /**
        * <pre>
-       * int32 ��������-1:����ݸ�2:�ύ����
+       * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
        * </pre>
        *
        * <code>optional int32 OperateType = 16;</code>
@@ -73943,7 +74097,7 @@ public final class ManageServiceMI2 {
       }
       /**
        * <pre>
-       * int32 ��������-1:����ݸ�2:�ύ����
+       * int32 ��������-1:����ݸ�2:�ύ����3:ɾ��
        * </pre>
        *
        * <code>optional int32 OperateType = 16;</code>
@@ -73955,6 +74109,116 @@ public final class ManageServiceMI2 {
         onChanged();
         return this;
       }
+
+      private long accountID_ ;
+      /**
+       * <pre>
+       * uint64 �ڻ��˻�ID
+       * </pre>
+       *
+       * <code>optional uint64 AccountID = 17;</code>
+       * @return Whether the accountID field is set.
+       */
+      @java.lang.Override
+      public boolean hasAccountID() {
+        return ((bitField0_ & 0x00010000) != 0);
+      }
+      /**
+       * <pre>
+       * uint64 �ڻ��˻�ID
+       * </pre>
+       *
+       * <code>optional uint64 AccountID = 17;</code>
+       * @return The accountID.
+       */
+      @java.lang.Override
+      public long getAccountID() {
+        return accountID_;
+      }
+      /**
+       * <pre>
+       * uint64 �ڻ��˻�ID
+       * </pre>
+       *
+       * <code>optional uint64 AccountID = 17;</code>
+       * @param value The accountID to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountID(long value) {
+        bitField0_ |= 0x00010000;
+        accountID_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * uint64 �ڻ��˻�ID
+       * </pre>
+       *
+       * <code>optional uint64 AccountID = 17;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAccountID() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        accountID_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private long wRStandardID_ ;
+      /**
+       * <pre>
+       * uint64 �ֻ�Ʒ��ID
+       * </pre>
+       *
+       * <code>optional uint64 WRStandardID = 18;</code>
+       * @return Whether the wRStandardID field is set.
+       */
+      @java.lang.Override
+      public boolean hasWRStandardID() {
+        return ((bitField0_ & 0x00020000) != 0);
+      }
+      /**
+       * <pre>
+       * uint64 �ֻ�Ʒ��ID
+       * </pre>
+       *
+       * <code>optional uint64 WRStandardID = 18;</code>
+       * @return The wRStandardID.
+       */
+      @java.lang.Override
+      public long getWRStandardID() {
+        return wRStandardID_;
+      }
+      /**
+       * <pre>
+       * uint64 �ֻ�Ʒ��ID
+       * </pre>
+       *
+       * <code>optional uint64 WRStandardID = 18;</code>
+       * @param value The wRStandardID to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWRStandardID(long value) {
+        bitField0_ |= 0x00020000;
+        wRStandardID_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * uint64 �ֻ�Ʒ��ID
+       * </pre>
+       *
+       * <code>optional uint64 WRStandardID = 18;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWRStandardID() {
+        bitField0_ = (bitField0_ & ~0x00020000);
+        wRStandardID_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -91786,7 +92050,7 @@ public final class ManageServiceMI2 {
       "(\005\022\021\n\tOperateID\030\t \001(\004\022\023\n\013OperateType\030\n \001" +
       "(\005\"X\n\026ErmcpSpotGoodsPriceRsp\022\034\n\006Header\030\001" +
       " \001(\0132\014.MessageHead\022\017\n\007RetCode\030\002 \001(\005\022\017\n\007R" +
-      "etDesc\030\003 \001(\t\"\337\002\n\021ErmcpHedgePlanReq\022\034\n\006He" +
+      "etDesc\030\003 \001(\t\"\210\003\n\021ErmcpHedgePlanReq\022\034\n\006He" +
       "ader\030\001 \001(\0132\014.MessageHead\022\023\n\013HedgePlanID\030" +
       "\002 \001(\004\022\023\n\013HedgePlanNo\030\003 \001(\t\022\024\n\014ContractTy" +
       "pe\030\004 \001(\005\022\022\n\nAreaUserID\030\005 \001(\004\022\027\n\017Delivery" +
@@ -91795,57 +92059,58 @@ public final class ManageServiceMI2 {
       "nvertFactor\030\n \001(\001\022\020\n\010PlanTime\030\013 \001(\t\022\021\n\tT" +
       "radeDate\030\014 \001(\t\022\020\n\010ApplySrc\030\r \001(\005\022\017\n\007Appl" +
       "yId\030\016 \001(\004\022\016\n\006Remark\030\017 \001(\t\022\023\n\013OperateType" +
-      "\030\020 \001(\005\"S\n\021ErmcpHedgePlanRsp\022\034\n\006Header\030\001 " +
-      "\001(\0132\014.MessageHead\022\017\n\007RetCode\030\002 \001(\005\022\017\n\007Re" +
-      "tDesc\030\003 \001(\t\"\330\005\n\023GldSpotContractInfo\022\021\n\tT" +
-      "radeDate\030\001 \001(\t\022\022\n\nContractNo\030\002 \001(\t\022\024\n\014Co" +
-      "ntractType\030\003 \001(\005\022\016\n\006UserID\030\004 \001(\004\022\021\n\tBuyU" +
-      "serID\030\005 \001(\004\022\022\n\nSellUserID\030\006 \001(\004\022\020\n\010SignD" +
-      "ate\030\007 \001(\t\022\032\n\022ContractAttachment\030\010 \001(\014\022\026\n" +
-      "\016ContractMargin\030\t \001(\001\022\027\n\017DeliveryGoodsID" +
-      "\030\n \001(\004\022\024\n\014WrStandardID\030\013 \001(\004\022\023\n\013ProductT" +
-      "ype\030\014 \001(\r\022\025\n\rConvertFactor\030\r \001(\001\022\025\n\rSpot" +
-      "GoodsDesc\030\016 \001(\t\022\021\n\tPriceType\030\017 \001(\r\022\013\n\003Qt" +
-      "y\030\020 \001(\001\022\r\n\005Price\030\021 \001(\001\022\016\n\006Amount\030\022 \001(\001\022\031" +
-      "\n\021DeliveryStartDate\030\023 \001(\t\022\027\n\017DeliveryEnd" +
-      "Date\030\024 \001(\t\022\017\n\007GoodsID\030\025 \001(\004\022\021\n\tPriceMove" +
-      "\030\026 \001(\001\022\021\n\tStartDate\030\027 \001(\t\022\017\n\007EndDate\030\030 \001" +
-      "(\t\022\021\n\tPointDesc\030\031 \001(\t\022\024\n\014DeliveryDesc\030\032 " +
-      "\001(\t\022\021\n\tMerUserID\030\033 \001(\004\022\023\n\013TradeUserID\030\034 " +
-      "\001(\004\022\021\n\tPricedQty\030\035 \001(\001\022\024\n\014PricedAmount\030\036" +
-      " \001(\001\022\030\n\020SpotGoodsBrandID\030\037 \001(\004\022\016\n\006Remark" +
-      "\030  \001(\t\022\022\n\nSaleUserID\030! \001(\004\022\021\n\tAccountID\030" +
-      "\" \001(\004\022\017\n\007BizType\030# \001(\r\"\352\001\n\036GldErmcpSpotC" +
-      "ontractOperateReq\022\034\n\006Header\030\001 \001(\0132\014.Mess" +
-      "ageHead\022\026\n\016SpotContractID\030\002 \001(\004\022\023\n\013Opera" +
-      "teType\030\003 \001(\r\022\022\n\nOperateSrc\030\004 \001(\r\022\016\n\006User" +
-      "ID\030\005 \001(\004\022\016\n\006Remark\030\006 \001(\t\022\024\n\014ClientTicket" +
-      "\030\007 \001(\t\0223\n\004Info\030\010 \001(\0132%.ManageServiceMI2." +
-      "GldSpotContractInfo\"\267\001\n\036GldErmcpSpotCont" +
-      "ractOperateRsp\022\034\n\006Header\030\001 \001(\0132\014.Message" +
-      "Head\022\017\n\007RetCode\030\002 \001(\005\022\017\n\007RetDesc\030\003 \001(\t\022\026" +
-      "\n\016SpotContractID\030\004 \001(\004\022\023\n\013OperateType\030\005 " +
-      "\001(\r\022\022\n\nOperateSrc\030\006 \001(\r\022\024\n\014ClientTicket\030" +
-      "\007 \001(\t\"s\n\035ErmcpContractOperateApplyInfo\022\030" +
-      "\n\020OperateApplyType\030\001 \001(\r\022\021\n\tRelatedID\030\002 " +
-      "\001(\004\022\022\n\nDetailJson\030\003 \001(\014\022\021\n\tAttachUrl\030\004 \001" +
-      "(\014\"\362\001\n\034ErmcpContractOperateApplyReq\022\034\n\006H" +
-      "eader\030\001 \001(\0132\014.MessageHead\022\026\n\016OperateAppl" +
-      "yID\030\002 \001(\004\022\023\n\013OperateType\030\003 \001(\r\022\022\n\nOperat" +
-      "eSrc\030\004 \001(\r\022\016\n\006UserID\030\005 \001(\004\022\016\n\006Remark\030\006 \001" +
-      "(\t\022\024\n\014ClientTicket\030\007 \001(\t\022=\n\004Info\030\010 \001(\0132/" +
-      ".ManageServiceMI2.ErmcpContractOperateAp" +
-      "plyInfo\"\265\001\n\034ErmcpContractOperateApplyRsp" +
-      "\022\034\n\006Header\030\001 \001(\0132\014.MessageHead\022\017\n\007RetCod" +
-      "e\030\002 \001(\005\022\017\n\007RetDesc\030\003 \001(\t\022\026\n\016OperateApply" +
-      "ID\030\004 \001(\004\022\023\n\013OperateType\030\005 \001(\r\022\022\n\nOperate" +
-      "Src\030\006 \001(\r\022\024\n\014ClientTicket\030\007 \001(\t\"f\n\017GLDWR" +
-      "StandardEx\022\024\n\014wrstandardid\030\001 \001(\004\022\026\n\016wrst" +
-      "andardname\030\002 \001(\t\022\016\n\006unitid\030\003 \001(\004\022\025\n\rconv" +
-      "ertfactor\030\004 \001(\001\"I\n\022GLDDGFactoryItemEx\022\027\n" +
-      "\017dgfactoryitemid\030\001 \001(\004\022\032\n\022dgfactoryitemv" +
-      "alue\030\002 \001(\tB?\n%cn.muchinfo.rma.protobuf.p" +
-      "rotoclassesZ\026com.muchinfo.mtp.proto"
+      "\030\020 \001(\005\022\021\n\tAccountID\030\021 \001(\004\022\024\n\014WRStandardI" +
+      "D\030\022 \001(\004\"S\n\021ErmcpHedgePlanRsp\022\034\n\006Header\030\001" +
+      " \001(\0132\014.MessageHead\022\017\n\007RetCode\030\002 \001(\005\022\017\n\007R" +
+      "etDesc\030\003 \001(\t\"\330\005\n\023GldSpotContractInfo\022\021\n\t" +
+      "TradeDate\030\001 \001(\t\022\022\n\nContractNo\030\002 \001(\t\022\024\n\014C" +
+      "ontractType\030\003 \001(\005\022\016\n\006UserID\030\004 \001(\004\022\021\n\tBuy" +
+      "UserID\030\005 \001(\004\022\022\n\nSellUserID\030\006 \001(\004\022\020\n\010Sign" +
+      "Date\030\007 \001(\t\022\032\n\022ContractAttachment\030\010 \001(\014\022\026" +
+      "\n\016ContractMargin\030\t \001(\001\022\027\n\017DeliveryGoodsI" +
+      "D\030\n \001(\004\022\024\n\014WrStandardID\030\013 \001(\004\022\023\n\013Product" +
+      "Type\030\014 \001(\r\022\025\n\rConvertFactor\030\r \001(\001\022\025\n\rSpo" +
+      "tGoodsDesc\030\016 \001(\t\022\021\n\tPriceType\030\017 \001(\r\022\013\n\003Q" +
+      "ty\030\020 \001(\001\022\r\n\005Price\030\021 \001(\001\022\016\n\006Amount\030\022 \001(\001\022" +
+      "\031\n\021DeliveryStartDate\030\023 \001(\t\022\027\n\017DeliveryEn" +
+      "dDate\030\024 \001(\t\022\017\n\007GoodsID\030\025 \001(\004\022\021\n\tPriceMov" +
+      "e\030\026 \001(\001\022\021\n\tStartDate\030\027 \001(\t\022\017\n\007EndDate\030\030 " +
+      "\001(\t\022\021\n\tPointDesc\030\031 \001(\t\022\024\n\014DeliveryDesc\030\032" +
+      " \001(\t\022\021\n\tMerUserID\030\033 \001(\004\022\023\n\013TradeUserID\030\034" +
+      " \001(\004\022\021\n\tPricedQty\030\035 \001(\001\022\024\n\014PricedAmount\030" +
+      "\036 \001(\001\022\030\n\020SpotGoodsBrandID\030\037 \001(\004\022\016\n\006Remar" +
+      "k\030  \001(\t\022\022\n\nSaleUserID\030! \001(\004\022\021\n\tAccountID" +
+      "\030\" \001(\004\022\017\n\007BizType\030# \001(\r\"\352\001\n\036GldErmcpSpot" +
+      "ContractOperateReq\022\034\n\006Header\030\001 \001(\0132\014.Mes" +
+      "sageHead\022\026\n\016SpotContractID\030\002 \001(\004\022\023\n\013Oper" +
+      "ateType\030\003 \001(\r\022\022\n\nOperateSrc\030\004 \001(\r\022\016\n\006Use" +
+      "rID\030\005 \001(\004\022\016\n\006Remark\030\006 \001(\t\022\024\n\014ClientTicke" +
+      "t\030\007 \001(\t\0223\n\004Info\030\010 \001(\0132%.ManageServiceMI2" +
+      ".GldSpotContractInfo\"\267\001\n\036GldErmcpSpotCon" +
+      "tractOperateRsp\022\034\n\006Header\030\001 \001(\0132\014.Messag" +
+      "eHead\022\017\n\007RetCode\030\002 \001(\005\022\017\n\007RetDesc\030\003 \001(\t\022" +
+      "\026\n\016SpotContractID\030\004 \001(\004\022\023\n\013OperateType\030\005" +
+      " \001(\r\022\022\n\nOperateSrc\030\006 \001(\r\022\024\n\014ClientTicket" +
+      "\030\007 \001(\t\"s\n\035ErmcpContractOperateApplyInfo\022" +
+      "\030\n\020OperateApplyType\030\001 \001(\r\022\021\n\tRelatedID\030\002" +
+      " \001(\004\022\022\n\nDetailJson\030\003 \001(\014\022\021\n\tAttachUrl\030\004 " +
+      "\001(\014\"\362\001\n\034ErmcpContractOperateApplyReq\022\034\n\006" +
+      "Header\030\001 \001(\0132\014.MessageHead\022\026\n\016OperateApp" +
+      "lyID\030\002 \001(\004\022\023\n\013OperateType\030\003 \001(\r\022\022\n\nOpera" +
+      "teSrc\030\004 \001(\r\022\016\n\006UserID\030\005 \001(\004\022\016\n\006Remark\030\006 " +
+      "\001(\t\022\024\n\014ClientTicket\030\007 \001(\t\022=\n\004Info\030\010 \001(\0132" +
+      "/.ManageServiceMI2.ErmcpContractOperateA" +
+      "pplyInfo\"\265\001\n\034ErmcpContractOperateApplyRs" +
+      "p\022\034\n\006Header\030\001 \001(\0132\014.MessageHead\022\017\n\007RetCo" +
+      "de\030\002 \001(\005\022\017\n\007RetDesc\030\003 \001(\t\022\026\n\016OperateAppl" +
+      "yID\030\004 \001(\004\022\023\n\013OperateType\030\005 \001(\r\022\022\n\nOperat" +
+      "eSrc\030\006 \001(\r\022\024\n\014ClientTicket\030\007 \001(\t\"f\n\017GLDW" +
+      "RStandardEx\022\024\n\014wrstandardid\030\001 \001(\004\022\026\n\016wrs" +
+      "tandardname\030\002 \001(\t\022\016\n\006unitid\030\003 \001(\004\022\025\n\rcon" +
+      "vertfactor\030\004 \001(\001\"I\n\022GLDDGFactoryItemEx\022\027" +
+      "\n\017dgfactoryitemid\030\001 \001(\004\022\032\n\022dgfactoryitem" +
+      "value\030\002 \001(\tB?\n%cn.muchinfo.rma.protobuf." +
+      "protoclassesZ\026com.muchinfo.mtp.proto"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -92129,7 +92394,7 @@ public final class ManageServiceMI2 {
     internal_static_ManageServiceMI2_ErmcpHedgePlanReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ManageServiceMI2_ErmcpHedgePlanReq_descriptor,
-        new java.lang.String[] { "Header", "HedgePlanID", "HedgePlanNo", "ContractType", "AreaUserID", "DeliveryGoodsID", "ProductType", "SpotGoodsDesc", "PlanQty", "ConvertFactor", "PlanTime", "TradeDate", "ApplySrc", "ApplyId", "Remark", "OperateType", });
+        new java.lang.String[] { "Header", "HedgePlanID", "HedgePlanNo", "ContractType", "AreaUserID", "DeliveryGoodsID", "ProductType", "SpotGoodsDesc", "PlanQty", "ConvertFactor", "PlanTime", "TradeDate", "ApplySrc", "ApplyId", "Remark", "OperateType", "AccountID", "WRStandardID", });
     internal_static_ManageServiceMI2_ErmcpHedgePlanRsp_descriptor =
       getDescriptor().getMessageTypes().get(46);
     internal_static_ManageServiceMI2_ErmcpHedgePlanRsp_fieldAccessorTable = new

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/accountmanager/futureaccount/AddFutureAccountActivity.kt

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.home.accountmanager.futureaccount
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
@@ -12,6 +13,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.emptyView
+import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.dialog.SelectData
 import mtp.polymer.com.autowidget.dialog.creatBottomSheetDialog
@@ -304,6 +306,53 @@ class AddFutureAccountActivity : BaseActivity<FutureAccountViewModel>(){
                 }
             }.lparams(matchParent, autoSize(132))
 
+            itemView()
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+                onThrottleFirstClick {
+                    creatBottomSheetDialog("请选择指定交易用户", viewModel.getCanSelectFutureCompanyList()) {
+                        viewModel.selectFuturesCompany.postValue(this)
+                    }
+                }
+                textView {
+                    text = "指定交易用户"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent){
+                    marginStart = autoSize(60)
+                }
+
+                textView {
+                    viewModel.selectFuturesCompany.bindOptional(context){
+                        text = it?.value
+                        textColorInt = R.color.rma_black_33
+                    }
+                    text = "请选择指定交易用户"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(wrapContent, wrapContent){
+                    marginStart = autoSize(110)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_more
+                }.lparams(autoSize(43), autoSize(43))
+
+                imageView {
+                    onThrottleFirstClick {
+                        val intent = Intent()
+                        intent.setClass(context,AddTransactionUserActivity::class.java)
+                        ActivityUtils.startActivity(intent)
+                    }
+                    imageResource = R.mipmap.rma_account_add
+                }.lparams(autoSize(43), autoSize(43)) {
+                    marginEnd = autoSize(36)
+                }
+            }.lparams(matchParent, autoSize(132))
 
             view {
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/accountmanager/futureaccount/AddTransactionUserActivity.kt

@@ -0,0 +1,133 @@
+package cn.muchinfo.rma.view.base.home.accountmanager.futureaccount
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import org.jetbrains.anko.*
+
+/**
+ * 创建交易用户
+ */
+class AddTransactionUserActivity : BaseActivity<FutureAccountViewModel>(){
+
+    /** 用户名称 **/
+    lateinit var user_name : EditText
+
+    /** 手机号码 **/
+    lateinit var phone_number : EditText
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            background = resources.getDrawable(R.color.main_hit_bg_color)
+            //页面标题
+            topBar {
+                commonLeftButton()
+                commonTitle {
+                    text = "创建交易用户"
+                }
+            }
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                textView {
+                    visibility = View.INVISIBLE
+                    text = "*"
+                    textColorInt = R.color.rma_star_color
+                    textSizeAuto = 31
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(37)
+                }
+                textView {
+                    text = "用户名称"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(10)
+                }
+
+                editText {
+                    user_name = this
+                    hint = "请输入账户名称"
+                    background = null
+                    inputType = EditorInfo.TYPE_CLASS_TEXT
+//                    setDecimalInputType()
+                    hintColorStr = "#CCCCCC"
+                    textSizeAuto = 31
+                    textColorStr = "#333333"
+                }.lparams(matchParent, autoSize(132)) {
+                    marginStart = autoSize(80)
+                }
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                textView {
+                    visibility = View.INVISIBLE
+                    text = "*"
+                    textColorInt = R.color.rma_star_color
+                    textSizeAuto = 31
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(37)
+                }
+                textView {
+                    text = "手机号码"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(10)
+                }
+
+                editText {
+                    phone_number = this
+                    hint = "请输入期货登录账户"
+                    background = null
+                    inputType = EditorInfo.TYPE_CLASS_TEXT
+//                    setDecimalInputType()
+                    hintColorStr = "#CCCCCC"
+                    textSizeAuto = 31
+                    textColorStr = "#333333"
+                }.lparams(matchParent, autoSize(132)) {
+                    marginStart = autoSize(40)
+                }
+            }.lparams(matchParent, autoSize(132))
+
+
+            view {
+
+            }.lparams(autoSize(1),0,1f)
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                textView {
+                    onThrottleFirstClick {
+
+                    }
+                    gravity = Gravity.CENTER
+                    backgroundResource = R.mipmap.rma_submit_bg
+                    text = "完成"
+                    textSizeAuto = 38
+                    textColorInt = R.color.white
+                }.lparams(matchParent, autoSize(119)) {
+                    marginStart = autoSize(60)
+                    marginEnd = autoSize(60)
+                }
+            }.lparams(matchParent, autoSize(144))
+        }
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/newcommodity/SpotHedgeViewHolder.kt

@@ -50,7 +50,7 @@ class SpotHedgeViewHolder(private val activity : AppCompatActivity,private val v
                 //套保系数
                 textView {
                     data.bindOptional(context){
-                        text = it?.mg?.evaluateratio
+                        text = it?.convertratio
                     }
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/AddContractActivity.kt

@@ -951,7 +951,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectWrStandardData.bindOptional(context) {
+                                selectWrStandModel.bindOptional(context) {
                                     text = it?.enumdicname
                                 }
                                 textSizeAuto = 31

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractDetailsActivity.kt

@@ -5,16 +5,24 @@ import android.view.Gravity
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
+import android.widget.Toast
+import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.business.contract.SpotContractInfo
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ContractData
+import cn.muchinfo.rma.global.isBlankString
+import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
+import com.blankj.utilcode.util.ToastUtils
+import mtp.polymer.com.autowidget.dialog.SelectData
+import mtp.polymer.com.autowidget.dialog.creatBottomSheetDialog
 import mtp.polymer.com.autowidget.dialog.createLoadingDialog
 import mtp.polymer.com.autowidget.utils.bindTaskStatus
 import org.jetbrains.anko.*
 
-class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
+class ContractDetailsActivity : BaseActivity<ContractViewModel>() {
 
     /**
      * 详情内的操作类型 1是单独显示详情 2 可以审核通过，审核拒绝  3是撤销  4是正常完结
@@ -23,22 +31,44 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
         intent.getStringExtra("type")
     }
 
-    private val data : ContractData by lazy {
+    private val data: ContractData by lazy {
         intent.getParcelableExtra<ContractData>("data") as ContractData
     }
 
-    lateinit var remarskText : EditText
+    lateinit var remarskText: EditText
+
+    /** 选择的跟单员 **/
+    val selectMerchandiser : MutableLiveData<SelectData> = MutableLiveData()
+
+    /**
+     * 选择的业务员
+     */
+    val selectSalesman : MutableLiveData<SelectData> = MutableLiveData()
+
+    /** 选择的期货账户 **/
+    val selectFuturesAccount : MutableLiveData<SelectData> = MutableLiveData()
+
+    //对跟单员，业务员，期货账户进行数据初始化
+    fun init(){
+        selectSalesman.postValue(SelectData(id = data.saleuserid ?: "",value = data.saleuserlogincode ?: ""))
+        selectMerchandiser.postValue(SelectData(id = data.meruserid ?: "",value = data.meruserlogincode ?: ""))
+        selectFuturesAccount.postValue(SelectData(id = data.accountid ?: "",value = data.accountid ?: ""))//没有accountname
+    }
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
-            createLoadingDialog("").bindTaskStatus(context,viewModel.loadingDialogStatus)
+            viewModel.queryAccMgrLoginUser()//查询登录账号
+            viewModel.queryAccMgrTaaccount()//查询期货账户
+            init()
+            createLoadingDialog("").bindTaskStatus(context, viewModel.loadingDialogStatus)
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = if (data.contracttype == "1"){
+                    text = if (data.contracttype == "1") {
                         "采购合同详情"
-                    }else{
+                    } else {
                         "销售合同详情"
                     }
                 }
@@ -49,15 +79,17 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                     verticalLayout {
                         linearLayout {
                             gravity = Gravity.CENTER_VERTICAL
-                            if (data.contracctstatus == "3"){
-                                background = resources.getDrawable(R.color.rma_pass_status)//rma_pass_status已通过背景色
-                            }else{
-                                background = resources.getDrawable(R.color.rma_details_status)//rma_pass_status已通过背景色
+                            if (data.contracctstatus == "3") {
+                                background =
+                                    resources.getDrawable(R.color.rma_pass_status)//rma_pass_status已通过背景色
+                            } else {
+                                background =
+                                    resources.getDrawable(R.color.rma_details_status)//rma_pass_status已通过背景色
                             }
                             imageView {
-                                if (data.contracctstatus == "3"){
+                                if (data.contracctstatus == "3") {
                                     imageResource = R.mipmap.rma_pass_status
-                                }else{
+                                } else {
                                     imageResource = R.mipmap.rma_wait_status
                                 }
 
@@ -89,14 +121,229 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
 
                         contractDetailFourView(data = data)
 
+                        viewItemUI()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            onThrottleFirstClick {
+                                if (type != "2"){
+                                    return@onThrottleFirstClick
+                                }
+                                creatBottomSheetDialog(
+                                    "请选择业务员", viewModel.getSelectSalesmanData()
+                                ) {
+                                    selectSalesman.postValue(this)
+                                }
+                            }
+                             textView {
+                                 if (type == "2"){
+                                     visibility = View.VISIBLE
+                                 }else{
+                                     visibility = View.INVISIBLE
+                                 }
+                                text = "*"
+                                textColorInt = R.color.rma_star_color
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(37)
+                            }
+                            textView {
+
+                                text = "业  务  员"
+                                textSizeAuto = 31
+                                textColorInt = R.color.p_normal_summary_txt_color
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(10)
+                            }
+
+                            textView {
+                                selectSalesman.bindOptional(context) {
+                                    if (it?.value.isNullOrEmpty()){
+                                        if (type == "2"){
+                                            text = "请选择业务员"
+                                            textColorInt = R.color.rma_hint_text_color_ccc
+                                        }else{
+                                            text = "--"
+                                            textColorInt = R.color.rma_black_33
+                                        }
+                                    }else{
+                                        text = it?.value
+                                        textColorInt = R.color.rma_black_33
+                                    }
+
+                                }
+                                text = data.saleuserlogincode?.isBlankString()
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(80)
+                            }
+
+                            emptyView()
+
+                            imageView {
+                                if (type == "2"){
+                                    visibility = View.VISIBLE
+                                }else{
+                                    visibility = View.INVISIBLE
+                                }
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(36), autoSize(36)) {
+                                marginEnd = autoSize(25)
+                            }
+                        }.lparams(matchParent, autoSize(132))
+
+                        viewItemUI()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            onThrottleFirstClick {
+                                if (type != "2"){
+                                    return@onThrottleFirstClick
+                                }
+                                creatBottomSheetDialog(
+                                    "请选择跟单员", viewModel.getSelectMerchandiserData()
+                                ) {
+                                    selectMerchandiser.postValue(this)
+                                }
+                            }
+                             textView {
+                                 if (type == "2"){
+                                     visibility = View.VISIBLE
+                                 }else{
+                                     visibility = View.INVISIBLE
+                                 }
+                                text = "*"
+                                textColorInt = R.color.rma_star_color
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(37)
+                            }
+                            textView {
+                                text = "跟  单  员"
+                                textSizeAuto = 31
+                                textColorInt = R.color.p_normal_summary_txt_color
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(10)
+                            }
+
+                            textView {
+                                selectMerchandiser.bindOptional(context) {
+                                    if (it?.value.isNullOrEmpty()){
+                                        if (type == "2"){
+                                            text = "请选择跟单员"
+                                            textColorInt = R.color.rma_hint_text_color_ccc
+                                        }else{
+                                            text = "--"
+                                            textColorInt = R.color.rma_black_33
+                                        }
+                                    }else{
+                                        text = it?.value
+                                        textColorInt = R.color.rma_black_33
+                                    }
+
+                                }
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(80)
+                            }
+
+                            emptyView()
+
+                            imageView {
+                                if (type == "2"){
+                                    visibility = View.VISIBLE
+                                }else{
+                                    visibility = View.INVISIBLE
+                                }
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(36), autoSize(36)) {
+                                marginEnd = autoSize(25)
+                            }
+                        }.lparams(matchParent, autoSize(132))
+
+                        viewItemUI()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            onThrottleFirstClick {
+                                if (type != "2"){
+                                    return@onThrottleFirstClick
+                                }
+                                creatBottomSheetDialog(
+                                    "请选择期货账户", viewModel.getSelectFutureAccount()
+                                ) {
+                                    selectFuturesAccount.postValue(this)
+                                }
+                            }
+                             textView {
+                                text = "*"
+                                 if (type == "2"){
+                                     visibility = View.VISIBLE
+                                 }else{
+                                     visibility = View.INVISIBLE
+                                 }
+                                textColorInt = R.color.rma_star_color
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(37)
+                            }
+                            textView {
+                                text = "期货账户"
+                                textSizeAuto = 31
+                                textColorInt = R.color.p_normal_summary_txt_color
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(10)
+                            }
+
+                            textView {
+                                selectFuturesAccount.bindOptional(context) {
+                                    if (it?.value.isNullOrEmpty()){
+                                        if (type == "2"){
+                                            text = "请选择期货账户"
+                                            textColorInt = R.color.rma_hint_text_color_ccc
+                                        }else{
+                                            text = "--"
+                                            textColorInt = R.color.rma_black_33
+                                        }
+
+                                    }else{
+                                        text = it?.value
+                                        textColorInt = R.color.rma_black_33
+                                    }
+                                }
+                                text = data.tradeuserlogincode?.isBlankString()
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(80)
+                            }
+
+                            emptyView()
+
+                            imageView {
+                                if (type == "2"){
+                                    visibility = View.VISIBLE
+                                }else{
+                                    visibility = View.INVISIBLE
+                                }
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(36), autoSize(36)) {
+                                marginEnd = autoSize(25)
+                            }
+                        }.lparams(matchParent, autoSize(132)) {
+                            bottomMargin = autoSize(200)
+                        }
+
                         view {
                             background = resources.getDrawable(R.color.main_hit_bg_color)
                         }.lparams(matchParent, autoSize(20))
 
                         linearLayout {
-                            if (type == "2"){
+                            if (type == "2") {
                                 visibility = View.VISIBLE
-                            }else{
+                            } else {
                                 visibility = View.GONE
                             }
                             gravity = Gravity.CENTER_VERTICAL
@@ -126,22 +373,30 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                 }
 
                 linearLayout {
-                    if (type == "1"){
+                    if (type == "1") {
                         visibility = View.GONE
-                    }else{
-                        visibility =View.VISIBLE
+                    } else {
+                        visibility = View.VISIBLE
                     }
                     background = resources.getDrawable(R.color.white)
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
                         onThrottleFirstClick {
-                            viewModel.orderOneContract(OperateType = "4",Remark = remarskText.text.toString(),SpotContractID = data.spotcontractid ?: ""){
+                            if (check().not()){
+                                return@onThrottleFirstClick
+                            }
+                            viewModel.orderOneContract(
+                                contractInfo = SpotContractInfo(SaleUserID = selectSalesman.value?.id?.toLong() ?: 0,MerUserID = selectMerchandiser.value?.id?.toLong() ?: 0,AccountID = selectFuturesAccount.value?.id?.toLong() ?: 0),
+                                OperateType = "4",
+                                Remark = remarskText.text.toString(),
+                                SpotContractID = data.spotcontractid ?: ""
+                            ) {
                                 finish()
                             }
                         }
-                        if (type == "2"){
+                        if (type == "2") {
                             visibility = View.VISIBLE
-                        }else{
+                        } else {
                             visibility = View.GONE
                         }
                         gravity = Gravity.CENTER
@@ -149,19 +404,27 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                         text = "审核拒绝"
                         textSizeAuto = 38
                         textColorInt = R.color.rma_star_color
-                    }.lparams(autoSize(419), autoSize(119)){
+                    }.lparams(autoSize(419), autoSize(119)) {
                         marginStart = autoSize(24)
                     }
 
                     textView {
                         onThrottleFirstClick {
-                            viewModel.orderOneContract(OperateType = "3",Remark = remarskText.text.toString(),SpotContractID = data.spotcontractid ?: ""){
+                            if (check().not()){
+                                return@onThrottleFirstClick
+                            }
+                            viewModel.orderOneContract(
+                                contractInfo = SpotContractInfo(SaleUserID = selectSalesman.value?.id?.toLong() ?: 0,MerUserID = selectMerchandiser.value?.id?.toLong() ?: 0,AccountID = selectFuturesAccount.value?.id?.toLong() ?: 0),
+                                OperateType = "3",
+                                Remark = remarskText.text.toString(),
+                                SpotContractID = data.spotcontractid ?: ""
+                            ) {
                                 finish()
                             }
                         }
-                        if (type == "2"){
+                        if (type == "2") {
                             visibility = View.VISIBLE
-                        }else{
+                        } else {
                             visibility = View.GONE
                         }
                         gravity = Gravity.CENTER
@@ -169,19 +432,23 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                         text = "审核通过"
                         textColorInt = R.color.white
                         textSizeAuto = 38
-                    }.lparams(autoSize(419), autoSize(119)){
+                    }.lparams(autoSize(419), autoSize(119)) {
                         marginStart = autoSize(13)
                     }
 
                     textView {
                         onThrottleFirstClick {
-                            viewModel.orderOneContract(OperateType = "5",Remark = remarskText.text.toString(),SpotContractID = data.spotcontractid ?: ""){
+                            viewModel.orderOneContract(
+                                OperateType = "5",
+                                Remark = remarskText.text.toString(),
+                                SpotContractID = data.spotcontractid ?: ""
+                            ) {
                                 finish()
                             }
                         }
-                        visibility = if (type == "3"){
+                        visibility = if (type == "3") {
                             View.VISIBLE
-                        }else{
+                        } else {
                             View.GONE
                         }
                         gravity = Gravity.CENTER
@@ -189,19 +456,23 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                         text = "撤销"
                         textColorInt = R.color.white
                         textSizeAuto = 38
-                    }.lparams(autoSize(780), autoSize(119)){
+                    }.lparams(autoSize(780), autoSize(119)) {
                         marginStart = autoSize(59)
                     }
 
                     textView {
                         onThrottleFirstClick {
-                            viewModel.orderOneContract(OperateType = "6",Remark = remarskText.text.toString(),SpotContractID = data.spotcontractid ?: ""){
+                            viewModel.orderOneContract(
+                                OperateType = "6",
+                                Remark = remarskText.text.toString(),
+                                SpotContractID = data.spotcontractid ?: ""
+                            ) {
                                 finish()
                             }
                         }
-                        visibility = if (type == "4"){
+                        visibility = if (type == "4") {
                             View.VISIBLE
-                        }else{
+                        } else {
                             View.GONE
                         }
                         gravity = Gravity.CENTER
@@ -209,15 +480,33 @@ class ContractDetailsActivity : BaseActivity<ContractViewModel>(){
                         text = "正常完结"
                         textColorInt = R.color.white
                         textSizeAuto = 38
-                    }.lparams(autoSize(780), autoSize(119)){
+                    }.lparams(autoSize(780), autoSize(119)) {
                         marginStart = autoSize(59)
                     }
 
-                }.lparams(matchParent, autoSize(144)){
+                }.lparams(matchParent, autoSize(144)) {
                     gravity = Gravity.BOTTOM
                 }
             }
         }
     }
 
+    //审核前的数据提交的校验
+    fun check() : Boolean{
+        if (selectSalesman.value?.id.isNullOrEmpty()){
+            ToastUtils.showLong("请选择业务员")
+            return false
+        }
+
+        if (selectMerchandiser.value?.id.isNullOrEmpty()){
+            ToastUtils.showLong("请选择跟单员")
+            return false
+        }
+        if (selectFuturesAccount.value?.id.isNullOrEmpty()){
+            ToastUtils.showLong("请选择期货账户")
+            return false
+        }
+        return true
+    }
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractPublicView.kt

@@ -90,6 +90,32 @@ fun _LinearLayout.contractDetailOneView(data: ContractData) {
         linearLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
+                text = "业务类型"
+                textSizeAuto = 31
+                textColorInt = R.color.p_normal_summary_txt_color
+            }.lparams(wrapContent, wrapContent) {
+                marginStart = autoSize(59)
+            }
+
+            textView {
+                //业务类型 1-套保 2-套利
+                if (data.biztype == "1"){
+                    text = "套保"
+                }else{
+                    text = "套利"
+                }
+                textColorInt = R.color.rma_black_33
+                textSizeAuto = 31
+            }.lparams(wrapContent, wrapContent) {
+                marginStart = autoSize(80)
+            }
+        }.lparams(matchParent, autoSize(132))
+
+        viewItemUI()
+
+        linearLayout {
+            gravity = Gravity.CENTER_VERTICAL
+            textView {
                 text = "采购方"
                 textSizeAuto = 31
                 textColorInt = R.color.p_normal_summary_txt_color
@@ -176,7 +202,9 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
 
         viewItemUI()
 
+        //三期好像去掉了这个类型
         linearLayout {
+            visibility = View.GONE
             gravity = Gravity.CENTER_VERTICAL
             textView {
                 text = "产品类型"
@@ -197,10 +225,11 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
 
         viewItemUI()
 
+
         linearLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
-                text = "标仓系数"
+                text = "品        类"
                 textSizeAuto = 31
                 textColorInt = R.color.p_normal_summary_txt_color
             }.lparams(wrapContent, wrapContent) {
@@ -208,7 +237,7 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
             }
 
             textView {
-                text = data.convertfactor
+                text = data.wrstandardname?.isBlankString()
                 textColorInt = R.color.rma_black_33
                 textSizeAuto = 31
             }.lparams(wrapContent, wrapContent) {
@@ -221,7 +250,7 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
         linearLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
-                text = "型        号"
+                text = "标仓系数"
                 textSizeAuto = 31
                 textColorInt = R.color.p_normal_summary_txt_color
             }.lparams(wrapContent, wrapContent) {
@@ -229,7 +258,7 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
             }
 
             textView {
-                text = data.modelname?.isBlankString()
+                text = data.convertfactor
                 textColorInt = R.color.rma_black_33
                 textSizeAuto = 31
             }.lparams(wrapContent, wrapContent) {
@@ -237,6 +266,8 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
             }
         }.lparams(matchParent, autoSize(132))
 
+
+
         viewItemUI()
 
         linearLayout {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractViewModel.kt

@@ -217,7 +217,7 @@ class ContractViewModel : BaseViewModel() {
     fun getSelectWrsandData():List<SelectData>{
         val newSelectData = arrayListOf<SelectData>()
         deliveryGoodsDetailsData.value?.gmlist?.forEach {
-            newSelectData.add(SelectData(id = it.wrstandardid ?: "",value = it.wrstandardname ?: "", convertfactor = it.convertfactor ?: ""))
+            newSelectData.add(SelectData(id = it.wrstandardid ?: "",value = it.wrstandardname ?: "", convertfactor = it.convertfactor ?: "",enumdicname = it.enumdicname ?: ""))
         }
         return newSelectData
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/AddHedgePlanActivity.kt

@@ -12,6 +12,7 @@ import cn.muchinfo.rma.business.hedge.HedgePlanInfo
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.MTPEnums
 import cn.muchinfo.rma.global.ViewEnumUtils
+import cn.muchinfo.rma.global.data.DeliveryGoodsDetailData
 import cn.muchinfo.rma.global.data.HedgePlanData
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
@@ -63,6 +64,11 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
      */
     lateinit var ramask: EditText
 
+    /** 选择的型号类型（型号就是品类） **/
+    val selectWrStandModel: MutableLiveData<SelectData> = MutableLiveData()
+
+    /** 选择的期货账户 ***/
+    val futureAccountSelectData : MutableLiveData<SelectData> = MutableLiveData()
 
     /**
      * 套保计划类型选择列表
@@ -104,6 +110,7 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
 
         verticalLayout {
             viewModel.queryWrStandardList()//需要查询一次现货商品的正常数据列表
+            viewModel.queryAccMgrTaaccount()//用于请求期货账户
             initData()
             dialog.bindTaskStatus(context, viewModel.loadingDialogStatus)
             background = resources.getDrawable(R.color.segtabment_bg_color)
@@ -205,7 +212,7 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
                                     )
                                 ) {
                                     selectWrStandardData.postValue(this)
-
+                                    viewModel.queryWrStandardDetail(this.deliverygoodsid ?: "")
                                 }
                             }
                             textView {
@@ -245,6 +252,59 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
                             }
                         }.lparams(matchParent, autoSize(132))
 
+                        viewItemUI()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            onThrottleFirstClick {
+                                creatBottomSheetDialog(
+                                    "请选择品类",
+                                    viewModel.selectWrStandardModel(
+                                        viewModel.wrStandardDataDetail.value
+                                            ?: DeliveryGoodsDetailData()
+                                    )
+                                ) {
+                                    selectWrStandModel.postValue(this)
+                                }
+                            }
+                            textView {
+                                visibility = View.INVISIBLE
+                                text = "*"
+                                textColorInt = R.color.rma_star_color
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(37)
+                            }
+
+                            textView {
+                                text = "品        类"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(10)
+                            }
+
+                            textView {
+                                selectWrStandModel.bindOptional(context) {
+                                    text = it?.value
+                                    textColorInt = R.color.rma_black_33
+                                }
+                                text = "请选择品类"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_hint_text_color_ccc
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(80)
+                            }
+
+                            emptyView()
+
+                            imageView {
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(36), autoSize(36)) {
+                                marginEnd = autoSize(25)
+                            }
+                        }.lparams(matchParent, autoSize(132))
+
 
                         linearLayout {
                             visibility = View.GONE
@@ -396,6 +456,58 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
 
                         linearLayout {
                             gravity = Gravity.CENTER_VERTICAL
+                            onThrottleFirstClick {
+                                creatBottomSheetDialog(
+                                    "请选择期货账户",
+                                    viewModel.selectAccMgrTaaccount(
+                                        viewModel.futureDataList.value ?: arrayListOf()
+                                    )
+                                ) {
+                                    futureAccountSelectData.postValue(this)
+                                }
+                            }
+                            textView {
+                                visibility = View.INVISIBLE
+                                text = "*"
+                                textColorInt = R.color.rma_star_color
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(37)
+                            }
+
+                            textView {
+                                text = "期货账户"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(10)
+                            }
+
+                            textView {
+                                futureAccountSelectData.bindOptional(context) {
+                                    text = it?.value
+                                    textColorInt = R.color.rma_black_33
+                                }
+                                text = "请选择期货账户"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_hint_text_color_ccc
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(80)
+                            }
+
+                            emptyView()
+
+                            imageView {
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(36), autoSize(36)) {
+                                marginEnd = autoSize(25)
+                            }
+                        }.lparams(matchParent, autoSize(132))
+
+                        viewItemUI()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
                             textView {
                                 text = "备        注"
                                 textSizeAuto = 31
@@ -487,7 +599,14 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
         hedgePlanInfo.WrStandardID = selectWrStandardData.value?.id?.toInt()!!
         hedgePlanInfo.AreaUserID = GlobalDataCollection.instance?.loginRsp?.userID?.toLong() ?: 0
         hedgePlanInfo.ProductType = 1//写死为1产品类型
-        hedgePlanInfo.SpotGoodsDesc = "咳咳咳"
+        hedgePlanInfo.SpotGoodsDesc = ""
+        if (selectWrStandModel.value?.id?.isNotEmpty() == true){//现货品类id
+            hedgePlanInfo.wrsdandid = selectWrStandModel.value?.id ?: ""
+        }
+
+        if (futureAccountSelectData.value?.id?.isNotEmpty() == true){
+            hedgePlanInfo.accountId = futureAccountSelectData.value?.id ?: ""
+        }
 
         if (coefficientWarehouse.text.toString().isNotEmpty()) {
             hedgePlanInfo.ConvertFactor = coefficientWarehouse.text.toString().toDouble()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgeDetailsActivity.kt

@@ -117,7 +117,7 @@ class HedgeDetailsActivity : BaseActivity<HedgePlanViewModel>() {
 
                             creatHedgeItemView(
                                 titleString = "现货品种",
-                                content = data.wrstandardname ?: ""
+                                content = data.deliverygoodsname ?: ""
                             )
 
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgePlanActivity.kt

@@ -409,7 +409,7 @@ fun _LinearLayout.creatHedgeHeadUI() {
                 textSizeAuto = 24
             }.lparams(wrapContent, wrapContent)
             textView {
-                text = "标仓系数"
+                text = "品类"
                 textColorInt = R.color.hint_text_color
                 textSizeAuto = 24
             }.lparams(wrapContent, wrapContent)
@@ -420,6 +420,11 @@ fun _LinearLayout.creatHedgeHeadUI() {
         verticalLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
+                text = "标仓系数/"
+                textColorInt = R.color.hint_text_color
+                textSizeAuto = 24
+            }.lparams(wrapContent, wrapContent)
+            textView {
                 text = "计划量"
                 textColorInt = R.color.hint_text_color
                 textSizeAuto = 24
@@ -430,6 +435,13 @@ fun _LinearLayout.creatHedgeHeadUI() {
         }
 
         verticalLayout {
+
+            textView {
+                text = "期货账户/"
+                textColorInt = R.color.hint_text_color
+                textSizeAuto = 24
+            }.lparams(wrapContent, wrapContent)
+
             textView {
                 text = "状态"
                 textColorInt = R.color.hint_text_color

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgePlanViewHolder.kt

@@ -53,9 +53,8 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
                             topMargin = autoSize(25)
                         }
 
-                        view {
+                        view {}.lparams(0, autoSize(1), 1f)
 
-                        }.lparams(0, autoSize(1), 1f)
                         imageView {
                             data.bindOptional(context) {
                                 if (it?.indexSelect == 0) {
@@ -86,8 +85,9 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
 
                 verticalLayout {
                     textView {
+                        //现货品种
                         data.bindOptional(context){
-                            text = it?.wrstandardname
+                            text = it?.deliverygoodsname
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.rma_black_33
@@ -97,9 +97,10 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
                         topMargin = autoSize(25)
                     }
 
+                    // FIXME 后改为品类
                     textView {
                         data.bindOptional(context){
-                            text = it?.convertfactor
+                            text = "品类"
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.hint_text_color
@@ -113,6 +114,21 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL
+
+                    //标仓系数
+                    textView {
+                        data.bindOptional(context){
+                            text = it?.convertfactor
+                        }
+                        textSizeAuto = 29
+                        textColorInt = R.color.rma_black_33
+                        maxLines = 1
+                        ellipsize = TextUtils.TruncateAt.END
+                    }.lparams(wrapContent, wrapContent) {
+                        gravity = Gravity.RIGHT
+                        topMargin = autoSize(25)
+                    }
+
                     textView {
                         data.bindOptional(context){
                             text = it?.planqty + it?.enumdicname
@@ -121,16 +137,15 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
                         textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
                         gravity = Gravity.RIGHT
-                        marginEnd = autoSize(30)
                     }
                 }.lparams(autoSize(145), autoSize(120))
 
                 verticalLayout {
 
                     textView {
-                        visibility = View.GONE
+                        //FIXME 期货账户
                         data.bindOptional(context){
-                            text = it?.hedgeplanno
+                            text = "期货账户"
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.rma_black_33
@@ -150,7 +165,6 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
                         maxLines = 1
                         ellipsize = TextUtils.TruncateAt.END
                     }.lparams(wrapContent, wrapContent){
-                        topMargin = autoSize(35)
                         marginEnd = autoSize(35)
                         gravity = Gravity.RIGHT
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgePlanViewModel.kt

@@ -3,9 +3,7 @@ package cn.muchinfo.rma.view.base.home.hedge
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.business.hedge.HedgePlanInfo
 import cn.muchinfo.rma.global.GlobalDataCollection
-import cn.muchinfo.rma.global.data.DeliveryGoodsData
-import cn.muchinfo.rma.global.data.HedgePlanData
-import cn.muchinfo.rma.global.data.WrStandardData
+import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.toArrayList
@@ -44,6 +42,15 @@ class HedgePlanViewModel : BaseViewModel() {
      */
     val wrStandardDataList: MutableLiveData<List<DeliveryGoodsData>> = MutableLiveData()
 
+    /**
+     * 现货品种详情
+     */
+    val wrStandardDataDetail: MutableLiveData<DeliveryGoodsDetailData> = MutableLiveData()
+
+    /**
+     * 新增登录账号时，可选择的期货账户列表
+     */
+    val futureDataList : MutableLiveData<List<AccMgrTaaccountSonData>> = MutableLiveData()
 
     /**
      * 对于列表点击展开后的数据处理
@@ -183,6 +190,77 @@ class HedgePlanViewModel : BaseViewModel() {
         return newSpotVarietiesList
     }
 
+    /**
+     * 用来请求选择现货品种后的型号和品牌信息
+     * @param wrstandardid String
+     */
+    fun queryWrStandardDetail(deliverygoodsid: String) {
+        val params = mutableMapOf<String, String>().apply {
+            put("areauserid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("deliverygoodsid", deliverygoodsid)
+        }
+
+        MyApplication.getInstance()?.commodityManager?.queryDeliveryGoodsDetail(params) { isSuccess, respData, _ ->
+            if (isSuccess) {
+                wrStandardDataDetail.postValue(respData?.get(0))
+            }
+        }
+    }
+
+    /**
+     * 根据选择控件进行数据重新组装（型号/品类）
+     * @param data WrStandardDetail
+     * @return ArrayList<SelectData>
+     */
+    fun selectWrStandardModel(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
+        val wrstandardModel = arrayListOf<SelectData>()
+        data.gmlist?.forEach {
+            wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: ""))
+        }
+        return wrstandardModel
+    }
+
+    /**
+     * 查询账户管理/期货账户
+     */
+    fun queryAccMgrTaaccount(){
+        val params = mutableMapOf<String, String>().apply {
+            put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
+        }
+        MyApplication.getInstance()?.accountManager?.queryAccMgrTaaccount(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                resetAccMgrTaaccount(respData ?: arrayListOf())
+            }
+        }
+    }
+
+    /**
+     * 对期货账户的主列表和子列表进行合并
+     */
+    fun resetAccMgrTaaccount(oldList : List<AccMgrTaaccountData>){
+        val newDataList = arrayListOf<AccMgrTaaccountSonData>()
+        oldList.forEach {
+            newDataList.add(it.mainAcc ?: AccMgrTaaccountSonData())
+            it.subacclist?.forEach {
+                newDataList.add(it)
+            }
+        }
+        futureDataList.postValue(newDataList)
+    }
+
+    /**
+     * 可供选择的期货账户的列表
+     * @param list List<AccMgrTaaccountSonData>
+     * @return ArrayList<SelectData>
+     */
+    fun selectAccMgrTaaccount(list : List<AccMgrTaaccountSonData>): ArrayList<SelectData>{
+        val accMgrTaaccount = arrayListOf<SelectData>()
+        list.forEach {
+            accMgrTaaccount.add(SelectData(id = it.accountid ?: "",value = it.accountname ?: ""))
+        }
+        return accMgrTaaccount
+    }
+
 
     /**
      *

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/registration/RegistrationViewModel.kt

@@ -2,10 +2,7 @@ package cn.muchinfo.rma.view.base.home.registration
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
-import cn.muchinfo.rma.global.data.AreaStockApplySumData
-import cn.muchinfo.rma.global.data.UserInfoData
-import cn.muchinfo.rma.global.data.WarehouseInfoData
-import cn.muchinfo.rma.global.data.WrStandardDetail
+import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.ErmcpMI1
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
@@ -38,7 +35,7 @@ class RegistrationViewModel : BaseViewModel(){
     /**
      * 现货品种详情
      */
-    val wrStandardDataDetail: MutableLiveData<WrStandardDetail> = MutableLiveData()
+    val wrStandardDataDetail: MutableLiveData<DeliveryGoodsDetailData> = MutableLiveData()
 
 
     /**
@@ -119,13 +116,13 @@ class RegistrationViewModel : BaseViewModel(){
      * 用来请求选择现货品种后的型号和品牌信息
      * @param wrstandardid String
      */
-    fun queryWrStandardDetail(wrstandardid: String) {
+    fun queryWrStandardDetail(deliverygoodsid: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
-            put("wrstandardid", wrstandardid)
+            put("areauserid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("deliverygoodsid", deliverygoodsid)
         }
 
-        MyApplication.getInstance()?.commodityManager?.queryWrStandardDetail(params) { isSuccess, respData, _ ->
+        MyApplication.getInstance()?.commodityManager?.queryDeliveryGoodsDetail(params) { isSuccess, respData, _ ->
             if (isSuccess) {
                 wrStandardDataDetail.postValue(respData?.get(0))
             }
@@ -137,10 +134,10 @@ class RegistrationViewModel : BaseViewModel(){
      * @param data WrStandardDetail
      * @return ArrayList<SelectData>
      */
-    fun selectWrStandardModel(data: WrStandardDetail): ArrayList<SelectData> {
+    fun selectWrStandardModel(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardModel = arrayListOf<SelectData>()
-        data.gtList.forEach {
-            wrstandardModel.add(SelectData(id = it.modelid, value = it.modelname))
+        data.gmlist?.forEach {
+            wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: ""))
         }
         return wrstandardModel
     }
@@ -150,10 +147,10 @@ class RegistrationViewModel : BaseViewModel(){
      * @param data WrStandardDetail
      * @return ArrayList<SelectData>
      */
-    fun selectWrStandardBrand(data: WrStandardDetail): ArrayList<SelectData> {
+    fun selectWrStandardBrand(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardBrand = arrayListOf<SelectData>()
-        data.gbList.forEach {
-            wrstandardBrand.add(SelectData(id = it.brandid, value = it.brandname))
+        data.gblist?.forEach {
+            wrstandardBrand.add(SelectData(id = it.brandid ?: "", value = it.brandname ?: ""))
         }
         return wrstandardBrand
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/registration/WarehouseRegistrationActivity.kt

@@ -11,6 +11,7 @@ import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.AreaStockApplySumData
 import cn.muchinfo.rma.global.data.ContractData
+import cn.muchinfo.rma.global.data.DeliveryGoodsDetailData
 import cn.muchinfo.rma.global.data.WrStandardDetail
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
@@ -43,7 +44,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
     private val dialog by lazy { createLoadingDialog(hintStr = "请求中...") }
 
     /** 选择的仓库 **/
-    val selectWareHouse : MutableLiveData<SelectData> = MutableLiveData()
+    val selectWareHouse: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的型号类型（型号就是品类） **/
     val selectWrStandModel: MutableLiveData<SelectData> = MutableLiveData()
@@ -59,9 +60,11 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
             dialog.bindTaskStatus(context, viewModel.loadingDialogStatus)
             val margingPadding = autoSize(47)
             background = resources.getDrawable(R.color.main_hit_bg_color)
-            viewModel.queryAreaStockApplySum(spotcontractid = data.spotcontractid ?: "")//查询当前合同已登记信息
+            viewModel.queryAreaStockApplySum(
+                spotcontractid = data.spotcontractid ?: ""
+            )//查询当前合同已登记信息
             viewModel.queryWarehouseInfo()//查询可选择的仓库信息
-            viewModel.queryWrStandardDetail(data.wrstandardid ?: "")
+            viewModel.queryWrStandardDetail(data.deliverygoodsid ?: "")
             topBar {
                 commonLeftButton()
                 commonTitle {
@@ -185,7 +188,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                             text = data.enumdicname
                                             textSizeAuto = 17
                                             textColorInt = R.color.rma_black_33
-                                        }.lparams(wrapContent, wrapContent){
+                                        }.lparams(wrapContent, wrapContent) {
                                             marginEnd = margingPadding
                                         }
                                     }.lparams(matchParent, wrapContent)
@@ -208,7 +211,6 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 } else {
                                     "已登记出库信息"
                                 }
-
                                 textColorInt = R.color.rma_blue_color
                                 textSizeAuto = 34
                             }.lparams(wrapContent, wrapContent) {
@@ -217,12 +219,17 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                             }
 
                             verticalLayout {
-                                viewModel.areaStockApplySumData.bindOptional(context){list ->
+                                viewModel.areaStockApplySumData.bindOptional(context) { list ->
                                     list?.forEach {
-                                        AreaStockApplySumUI(type = type ?: "",index = list.indexOf(it),data = it,enumdicname = data.enumdicname ?: "")
+                                        AreaStockApplySumUI(
+                                            type = type ?: "",
+                                            index = list.indexOf(it),
+                                            data = it,
+                                            enumdicname = data.enumdicname ?: ""
+                                        )
                                     }
                                 }
-                            }.lparams(matchParent, wrapContent){
+                            }.lparams(matchParent, wrapContent) {
                                 bottomMargin = autoSize(30)
                             }
                         }
@@ -263,7 +270,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
 
                                 textView {
-                                     text = if (type == "1") {
+                                    text = if (type == "1") {
                                         "采购入库"
                                     } else {
                                         "销售出库"
@@ -292,7 +299,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                         "请选择品类",
                                         viewModel.selectWrStandardModel(
                                             viewModel.wrStandardDataDetail.value
-                                                ?: WrStandardDetail()
+                                                ?: DeliveryGoodsDetailData()
                                         )
                                     ) {
                                         selectWrStandModel.postValue(this)
@@ -336,7 +343,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                         "请选择品牌",
                                         viewModel.selectWrStandardBrand(
                                             viewModel.wrStandardDataDetail.value
-                                                ?: WrStandardDetail()
+                                                ?: DeliveryGoodsDetailData()
                                         )
                                     ) {
                                         selectWrStandBrand.postValue(this)
@@ -376,9 +383,9 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 background = resources.getDrawable(R.color.white)
                                 gravity = Gravity.CENTER_VERTICAL
                                 onThrottleFirstClick {
-                                    val hintText = if (type == "1"){
+                                    val hintText = if (type == "1") {
                                         "请选择入库仓库"
-                                    }else{
+                                    } else {
                                         "请选择出库仓库"
                                     }
                                     val selectDataList = viewModel.setSelectWarehouseList(
@@ -390,7 +397,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
 
                                 textView {
-                                     text = if (type == "1") {
+                                    text = if (type == "1") {
                                         "入库仓库"
                                     } else {
                                         "出库仓库"
@@ -402,7 +409,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
 
                                 textView {
-                                    selectWareHouse.bindOptional(context){
+                                    selectWareHouse.bindOptional(context) {
                                         text = it?.value
                                         textColorInt = R.color.rma_black_33
                                     }
@@ -491,7 +498,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
 
                     textView {
                         onThrottleFirstClick {
-                            if (checkUpdate().not()){
+                            if (checkUpdate().not()) {
                                 return@onThrottleFirstClick
                             }
                             /**
@@ -507,7 +514,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                              * @param ApplyId Long uint64 申请人
                              * @param ApplyRemark String string 申请备注
                              */
-                            if (type == "1"){
+                            if (type == "1") {
                                 viewModel.areaInOutStockApply(
                                     InOutType = 1,
                                     WRStandardID = data.wrstandardid?.toLong() ?: 0,
@@ -517,29 +524,29 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                     SpotContractID = data.spotcontractid?.toLong() ?: 0,
                                     WarehouseInfo = selectWareHouse.value?.id?.toLong() ?: 0,
                                     Qty = inventory_quantity.text.toString().toDouble()
-                                ){
+                                ) {
                                     finish()
                                 }
-                            }else{
-                                 viewModel.areaInOutStockApply(
+                            } else {
+                                viewModel.areaInOutStockApply(
                                     InOutType = 2,
-                                    WRStandardID = data.wrstandardid?.toLong() ?: 0,
+                                    WRStandardID = data.deliverygoodsid?.toLong() ?: 0,
                                     SpotGoodsModelID = selectWrStandModel.value?.id?.toLong() ?: 0,
                                     SpotGoodsBrandID = selectWrStandBrand.value?.id?.toLong() ?: 0,
                                     DeliveryGoodsID = data.deliverygoodsid?.toLong() ?: 0,
                                     SpotContractID = data.spotcontractid?.toLong() ?: 0,
                                     WarehouseInfo = selectWareHouse.value?.id?.toLong() ?: 0,
                                     Qty = inventory_quantity.text.toString().toDouble()
-                                ){
+                                ) {
                                     finish()
                                 }
                             }
                         }
                         gravity = Gravity.CENTER
                         backgroundResource = R.mipmap.rma_submit_bg
-                        text = if (type == "1"){
+                        text = if (type == "1") {
                             "入库登记"
-                        }else{
+                        } else {
                             "出库登记"
                         }
                         textColorInt = R.color.white
@@ -566,9 +573,9 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
         linearLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
-                text = if (type == "1"){
+                text = if (type == "1") {
                     "已入库量$index"
-                }else{
+                } else {
                     "已出库量$index"
                 }
                 textSizeAuto = 29
@@ -595,25 +602,25 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
      * @return Boolean
      */
     private fun checkUpdate(): Boolean {
-        if (selectWrStandModel.value?.id.isNullOrEmpty()){
+        if (selectWrStandModel.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择品类")
             return false
         }
 
-        if (selectWrStandBrand.value?.id.isNullOrEmpty()){
+        if (selectWrStandBrand.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择型号")
             return false
         }
 
-        if (selectWareHouse.value?.id.isNullOrEmpty()){
+        if (selectWareHouse.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择仓库")
             return false
         }
 
-        if (inventory_quantity.text.toString().isNullOrEmpty()){
-            if (type == "1"){
+        if (inventory_quantity.text.toString().isNullOrEmpty()) {
+            if (type == "1") {
                 ToastUtils.showLong("请选择入库数量")
-            }else{
+            } else {
                 ToastUtils.showLong("请选择出库数量")
             }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/RoleSetActivity.kt

@@ -30,6 +30,12 @@ class RoleSetActivity : BaseActivity<RoleSetViewModel>() {
     private val roleSetAdapter: BaseAdapter<AccMgrRoleData, RoleSetViewHolder> =
         BaseAdapter { _, _ -> RoleSetViewHolder(this, viewModel) }
 
+    //每次回到页面就刷新下数据
+    override fun onResume() {
+        super.onResume()
+        viewModel.queryAccMgrRole()
+    }
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/RoleSetViewHolder.kt

@@ -50,7 +50,7 @@ class RoleSetViewHolder(private val activity : AppCompatActivity,private val vie
                         text = it?.rolename?.isBlankString()
                      }
                      textSizeAuto = 30
-                     textColorInt = R.color.rma_hint_title_text_color
+                     textColorInt = R.color.rma_black_33
                  }.lparams(autoSize(200), autoSize(100))
                  textView {
                      gravity = Gravity.CENTER
@@ -58,7 +58,7 @@ class RoleSetViewHolder(private val activity : AppCompatActivity,private val vie
                          text = it?.modifiername?.isBlankString()
                      }
                      textSizeAuto = 30
-                     textColorInt = R.color.rma_hint_title_text_color
+                     textColorInt = R.color.rma_black_33
                  }.lparams(autoSize(200), autoSize(100))
                  textView {
                      gravity = Gravity.CENTER
@@ -66,7 +66,7 @@ class RoleSetViewHolder(private val activity : AppCompatActivity,private val vie
                          text = it?.modifytime?.isShowTimeString("yyyyMMdd HH:mm")
                      }
                      textSizeAuto = 30
-                     textColorInt = R.color.rma_hint_title_text_color
+                     textColorInt = R.color.rma_black_33
                  }.lparams(autoSize(350), autoSize(100))
                  textView {
                      gravity = Gravity.CENTER
@@ -78,7 +78,7 @@ class RoleSetViewHolder(private val activity : AppCompatActivity,private val vie
                         }
                     }
                      textSizeAuto = 30
-                     textColorInt = R.color.rma_hint_title_text_color
+                     textColorInt = R.color.rma_black_33
                  }.lparams(autoSize(150), autoSize(100))
              }.lparams(matchParent, autoSize(100))
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotmarket/SpotMarketDetailsActivity.kt

@@ -90,14 +90,14 @@ class SpotMarketDetailsActivity : BaseActivity<SpotMarketPriceViewModel>(){
                 statusLayout = this
 //                bindTaskStatus(viewModule.status)
                 setRetryAction {
-                    viewModel.querySpotGoodsPriceLog(data.wrstandardid ?: "")
+                    viewModel.querySpotGoodsPriceLog(data.deliverygoodsid ?: "")
                 }
                 swipeToLoadLayout {
                     swipeToLayout = this
                     setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-                        viewModel.querySpotGoodsPriceLog(data.wrstandardid ?: "")
+                        viewModel.querySpotGoodsPriceLog(data.deliverygoodsid ?: "")
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotmarket/SpotMarketDetailsViewHolder.kt

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.home.spotmarket
 
+import android.annotation.SuppressLint
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
@@ -17,6 +18,7 @@ import org.jetbrains.anko.*
 class SpotMarketDetailsViewHolder(private val activity : AppCompatActivity,private val viewModel : SpotMarketPriceViewModel) : BaseViewHolder<SpotGoodsPriceData>(activity){
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
+    @SuppressLint("SetTextI18n")
     override fun _FrameLayout.createContentView() {
         linearLayout {
             linearLayout {
@@ -36,7 +38,7 @@ class SpotMarketDetailsViewHolder(private val activity : AppCompatActivity,priva
                 //价格
                 textView {
                     data.bindOptional(context){
-                        text = it?.spotgoodsprice?.isBlankString()
+                        text = it?.spotgoodsprice?.isBlankString() + "元/" + it?.enumdicname
                     }
                     textSizeAuto = 29
                     textColorInt = R.color.rma_black_33
@@ -48,7 +50,7 @@ class SpotMarketDetailsViewHolder(private val activity : AppCompatActivity,priva
                 //操作人
                 textView {
                     data.bindOptional(context){
-                        text = it?.operateid?.isBlankString()
+                        text = it?.areauserid?.isBlankString()
                     }
                     textSizeAuto = 29
                     textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotmarket/SpotMarketPriceViewHolder.kt

@@ -29,7 +29,7 @@ class SpotMarketPriceViewHolder(private val activity : AppCompatActivity,private
     override fun _FrameLayout.createContentView() {
         verticalLayout {
             onThrottleFirstClick {
-                viewModel.setOnItemClick(data.value?.deliverygoodsid ?: "")
+                viewModel.setOnItemClick(data.value?.operatetime ?: "")
             }
             linearLayout {
                 //现货品种

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotmarket/SpotMarketPriceViewModel.kt

@@ -76,11 +76,11 @@ class SpotMarketPriceViewModel : BaseViewModel(){
      * viewhodler内的item点击事件
      * @param deliverygoodsid String
      */
-    fun setOnItemClick(deliverygoodsid : String){
+    fun setOnItemClick(operatetime : String){
         val oldList = spotMarketPriceDataList.value
         val newDataList = arrayListOf<SpotGoodsPriceData>()
         oldList?.forEach {
-            if (deliverygoodsid == it.deliverygoodsid){
+            if (operatetime == it.operatetime){
                 if (it.isClick == 0){
                     newDataList.add(it.copy(isClick = 1))
                 }else{

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/warehouse/WarehouseInformationActivity.kt

@@ -97,7 +97,7 @@ class WarehouseInformationActivity : BaseActivity<WarehouseInformationViewModel>
                 commonTitle {
                     text = "仓库信息"
                 }
-                // 新增客户申请
+                // 新增仓库信息
                 commonMenuButton(R.mipmap.add_new) {
                     val intent = Intent()
                     intent.putExtra("type","1")

RMA/app/src/main/java/cn/muchinfo/rma/view/base/procurement/ContentAdapter.java

@@ -132,6 +132,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
                 setPosition(i);
             }
         });
+        //出入库登记
         itemViewHolder.warehouse_register.setOnClickListener(view -> {
             Intent intent = new Intent();
             intent.putExtra("type", this.type);
@@ -174,6 +175,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
         itemViewHolder.details.setOnClickListener(view -> {
             Intent intent = new Intent();
             intent.putExtra("data", datas.get(i));
+            intent.putExtra("type",this.type);
             intent.setClass(context, ContractDetailActivity.class);
             context.startActivity(intent);
         });

RMA/app/src/main/java/cn/muchinfo/rma/view/base/procurement/ContractDetailActivity.kt

@@ -188,7 +188,7 @@ class ContractDetailActivity : BaseActivity<ProcurementViewModel>() {
                         selectedTabIndex = index
                     }
                 })
-                mode = QMUITabSegment.MODE_FIXED
+                mode = QMUITabSegment.MODE_SCROLLABLE
                 setIndicator(
                     QMUITabIndicator(
                         QMUIDisplayHelper.dp2px(context, 2),
@@ -196,7 +196,7 @@ class ContractDetailActivity : BaseActivity<ProcurementViewModel>() {
                         true
                     )
                 )
-                setDefaultTextSize(ConvertUtils.sp2px(14f), ConvertUtils.sp2px(14f))
+                setDefaultTextSize(ConvertUtils.sp2px(14f), ConvertUtils.sp2px(16f))
             }.lparams(matchParent, autoSize(100))
 
             view {