商品详情完成;

.idea/modules.xml

@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/TangKuPos.iml" filepath="$PROJECT_DIR$/.idea/TangKuPos.iml" />
+      <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
       <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
+      <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java

@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivitySsskuBinding;
+import com.xingdata.zzdpos.model.Cor;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
@@ -68,6 +69,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         mManagerFragment.loadSkugrps(sskugrps);
         mSkugrpFragment.loadSkugrps(sskugrps);
+        mDetailFragment.loadSkugrps(sskugrps);
+        mEditorFragment.loadSkugrps(sskugrps);
     }
 
     @Override
@@ -90,6 +93,12 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         mSearchFragment.loadSkus(skus, isRefresh);
     }
 
+    @Override
+    public void loadCors(List<Cor> cors) {
+        mDetailFragment.loadCors(cors);
+        mEditorFragment.loadCors(cors);
+    }
+
     @Override
     public void showSearchFragment(int searchType) {
         if (mSearchFragment.isAdded()) return;
@@ -101,7 +110,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void showEditorFragment(Sssku sku) {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
         mViewBinding.tvTitle.setText(R.string.sssku_update);
-        this.start(mEditorFragment);
+        this.start(mEditorFragment.setSssku(sku));
     }
 
     @Override
@@ -115,7 +124,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     public void showDetailFragment(Sssku sku) {
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_DETAIL);
         mViewBinding.tvTitle.setText(R.string.sssku_detail);
-        this.start(mDetailFragment);
+        this.start(mDetailFragment.setSssku(sku));
     }
 
     @Override
@@ -128,13 +137,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void backToEditFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
-        this.popTo(EditorFragment.class, false);
+        this.pop();
     }
 
     @Override
     public void backToManagerFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
-        this.popTo(ManagerFragment.class, false);
+        this.pop();
         this.resetSearchBar();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.manage.sssku;
 
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Cor;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 
@@ -53,6 +54,13 @@ public interface SsskuContract {
          */
         void loadSearchResult(List<Sssku> skus, boolean isRefresh);
 
+        /**
+         * 加载供应商列表
+         *
+         * @param cors 供应商列表
+         */
+        void loadCors(List<Cor> cors);
+
         /**
          * 显示搜索页面
          */

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -15,6 +15,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void onAttached() {
+        getCor();
     }
 
     @Override
@@ -40,7 +41,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void clickSku(Sssku sssku) {
-        mView.showDetailFragment(sssku);
+        clickSku(sssku, C.TITLE_MODE.SKU);
     }
 
     @Override
@@ -84,7 +85,17 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     public void clickSku(Sssku sssku, int searchType) {
         switch (searchType) {
             case C.TITLE_MODE.SKU:
-                mView.showDetailFragment(sssku);
+                mView.showLoadingDialog();
+                mCompositeDisposable.add(
+                        ApiFactory.Sssku.detailSssku(sssku.getId())
+                                .doFinally(() -> mView.dismissLoadingDialog())
+                                .subscribe(
+                                        sssku1 -> {
+                                            mView.showDetailFragment(sssku1);
+                                        },
+                                        throwable -> {
+                                        })
+                );
                 break;
             case C.TITLE_MODE.PKG:
                 break;
@@ -195,4 +206,13 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()))
         );
     }
+
+    /**
+     * 获取供货商
+     */
+    private void getCor() {
+        mCompositeDisposable.add(
+                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors))
+        );
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/DetailFragment.java

@@ -4,13 +4,20 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSsskuDetailBinding;
+import com.xingdata.zzdpos.model.Cor;
+import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDetailBinding> {
 
     private Sssku mSssku;
+    private List<Sskugrp> mSskugrps;
+    private List<Cor> mCors;
 
     @Override
     public int getLayoutId() {
@@ -19,10 +26,44 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
 
     @Override
     public void initView() {
-//        mViewBinding.tv.setOnClickListener(view -> {
-//            this.pop();
-//            mPresenter.clickEditSku(mSssku);
-//        });
+        mViewBinding.ivPic.setImageURI(mSssku.getSpuImg());
+        mViewBinding.setSku(mSssku);
+
+        for (int i = 0; i < mSskugrps.size(); i++) {
+            if (mSskugrps.get(i).getSkuGrpId().longValue() == mSssku.getSkuGrpId()) {
+                mViewBinding.setSkugrpName(mSskugrps.get(i).getSkuGrpName());
+                break;
+            }
+        }
+
+        for (int i = 0; i < mCors.size(); i++) {
+            if (mCors.get(i).getChannelMapId().longValue() == mSssku.getChannelMapId()) {
+                mViewBinding.setChannelName(mCors.get(i).getChannelName());
+                break;
+            }
+        }
+        if (mSssku.getSkuFlag() == 1) {
+
+        }
+    }
+
+    /**
+     * 加载商品分组
+     *
+     * @param sskugrps 分组信息
+     */
+    public void loadSkugrps(List<Sskugrp> sskugrps) {
+        mSskugrps = new ArrayList<>();
+        mSskugrps.addAll(sskugrps);
+    }
+
+    /**
+     * 加载供应商
+     *
+     * @param cors 供应商
+     */
+    public void loadCors(List<Cor> cors) {
+        this.mCors = cors;
     }
 
     /**
@@ -38,6 +79,6 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
     @Override
     public boolean onBackPressedSupport() {
         ((SsskuActivity) getActivity()).backToManagerFragment();
-         return super.onBackPressedSupport();
+        return super.onBackPressedSupport();
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/EditorFragment.java

@@ -4,14 +4,22 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSsskuEditorBinding;
+import com.xingdata.zzdpos.model.Cor;
+import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEditorBinding> {
 
     private Sssku mSssku;
 
+    private List<Sskugrp> mSskugrps;
+    private List<Cor> mCors;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_sssku_editor;
@@ -23,6 +31,25 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
 
     }
 
+    /**
+     * 加载商品分组
+     *
+     * @param sskugrps 分组信息
+     */
+    public void loadSkugrps(List<Sskugrp> sskugrps) {
+        mSskugrps = new ArrayList<>();
+        mSskugrps.addAll(sskugrps);
+    }
+
+    /**
+     * 加载供应商
+     *
+     * @param cors 供应商
+     */
+    public void loadCors(List<Cor> cors) {
+        this.mCors = cors;
+    }
+
     /**
      * 设置商品
      *

app/src/main/res/layout/activity_sssku.xml

@@ -20,6 +20,7 @@
             android:id="@+id/cl_title"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:animateLayoutChanges="true"
             android:background="@color/white_caocao"
             android:focusable="true"
             android:focusableInTouchMode="true">

app/src/main/res/values/strings.xml

@@ -686,6 +686,23 @@
     <!--商品维护-->
     <string name="sku_size">规格/</string>
     <string name="skugrp_add_hint">请输入分组名称</string>
+    <string name="sku_subtitle_info">基本信息</string>
+    <string name="sku_skugrp">分组</string>
+    <string name="sku_unit">单位</string>
+    <string name="sku_price1">售价</string>
+    <string name="sku_price2">促销价</string>
+    <string name="sku_subtitle_vip">会员信息</string>
+    <string name="sku_vip_dis">会员折扣</string>
+    <string name="sku_point1">消费每满</string>
+    <string name="sku_point2">元等于1积分</string>
+
+    <string name="sku_subtitle_supplier">供货方</string>
+    <string name="sku_supplier">供货商方</string>
+    <string name="sku_cost_on">按此包装进货</string>
+    <string name="sku_cost">进价</string>
+    <string name="sku_stock_low_limit">库存下限</string>
+    <string name="sku_stock_upper_limit">库存上限</string>
+    <string name="sku_min_oder">最小订货</string>
 
 
 </resources>