1.销售订单唛头

2.TODO 三个功能测试，下单新增唛头測試

app/src/main/AndroidManifest.xml

@@ -2391,6 +2391,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.OrderMarkActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="唛头"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -2181,4 +2181,11 @@ public interface ApiService {
      */
     @GET("/mark/one")
     Observable<BaseBean> getTemplate(@QueryMap Map<String,Object> param);
+    /**
+     * 获取订单产品设置的唛头
+     *
+     * @return
+     */
+    @GET("/mark-order-rel/one")
+    Observable<BaseBean> getOrderMark(@QueryMap Map<String,Object> param);
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OrderMarkActivity.java

+package com.wd.workoffice.ui.activity.bat.order;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.MarkBean;
+import com.wd.workoffice.bean.ProductBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 唛头详情
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class OrderMarkActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_company)
+    EditText etCompany;
+    @BindView(R.id.et_factory)
+    EditText etFactory;
+    @BindView(R.id.et_machine)
+    EditText etMachine;
+    @BindView(R.id.et_pro_name)
+    EditText etProName;
+    @BindView(R.id.et_img_code)
+    EditText etImgCode;
+    @BindView(R.id.et_spec)
+    EditText etSpec;
+    @BindView(R.id.et_send_company)
+    EditText etSendCompany;
+    @BindView(R.id.et_code)
+    EditText etCode;
+    @BindView(R.id.et_box)
+    EditText etBox;
+    @BindView(R.id.et_supplies_code)
+    EditText etSuppliesCode;
+    @BindView(R.id.et_contract)
+    EditText etContract;
+    @BindView(R.id.et_country_company)
+    EditText etCountryCompany;
+    @BindView(R.id.et_app_name)
+    EditText etAppName;
+    @BindView(R.id.et_use)
+    EditText etUse;
+    private MarkBean markBean;
+    private ProductBean.RecordsBean product;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        etCompany.setEnabled(false);
+        etFactory.setEnabled(false);
+        etMachine.setEnabled(false);
+        etProName.setEnabled(false);
+        etImgCode.setEnabled(false);
+        etSpec.setEnabled(false);
+        etSendCompany.setEnabled(false);
+        etCode.setEnabled(false);
+        etBox.setEnabled(false);
+        etSuppliesCode.setEnabled(false);
+        etContract.setEnabled(false);
+        etCountryCompany.setEnabled(false);
+        etAppName.setEnabled(false);
+        etUse.setEnabled(false);
+    }
+
+    @Override
+    protected void initData() {
+        getOrderMark();
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+
+    private void getOrderMark() {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("productId", getIntent().getStringExtra("productId"));
+        param.put("customerId", getIntent().getStringExtra("customerId"));
+        param.put("orderId", getIntent().getStringExtra("orderId"));
+        RtfUtils.getRtf().getOrderMark(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                markBean = JSON.parseObject(data.getData().toString(), MarkBean.class);
+                changeView();
+            }
+        });
+    }
+
+    private void changeView() {
+        if (null == markBean) {
+            return;
+        }
+        etCompany.setText(markBean.getReceiveCompany());
+        etFactory.setText(markBean.getCustomerBranchFactory());
+        etMachine.setText(markBean.getContinuousCastingMachine());
+        etProName.setText(markBean.getProductName());
+        etImgCode.setText(markBean.getProductSimpleCode());
+        etSpec.setText(markBean.getProductSpec());
+        etSendCompany.setText(markBean.getShipCompany());
+        etCode.setText(markBean.getMaterialCode());
+        etBox.setText(markBean.getBoxCode());
+        etSuppliesCode.setText(markBean.getMaterialCodeOther());
+        etContract.setText(markBean.getForeignTradeContractNumber());
+        etCountryCompany.setText(markBean.getDomesticShipCompany());
+        etAppName.setText(markBean.getReceiveCompany());
+        etUse.setText(markBean.getProductName());
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_choose_head;
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java

@@ -307,6 +307,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (view.getId()) {
+                    case R.id.tv_mark:
+                            startActivity(OrderMarkActivity.class,
+                                    "productId", proList.get(position).getProductId()+"",
+                                    "orderId",dataBean.getId(),
+                                    "customerId", dataBean.getCustomerId()+"");
+                        break;
                     case R.id.ll_annex:
                         if (!TextUtils.isEmpty(proList.get(position).getAnnex()))
                             startActivity(ImageActivity.class, "url", HwObsUtil.IMG_DOMAIN + proList.get(position).getAnnex());

app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java

@@ -57,6 +57,8 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
         helper.addOnClickListener(R.id.tv_return);
         helper.addOnClickListener(R.id.tv_flow);
         helper.addOnClickListener(R.id.tv_add);
+        helper.addOnClickListener(R.id.tv_mark);
+        helper.setVisible(R.id.tv_mark, true);
         switch (status) {
 //            private String tab[] = {
 //            "全部", "待审核", "待接单", "待生产", "已入库",

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

@@ -192,19 +192,19 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="附件"
                 android:layout_marginRight="3mm"
+                android:text="附件"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/tv_annex"
                 android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:maxLines="3"
-                android:gravity="right"
                 android:ellipsize="end"
-                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:maxLines="3"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -255,12 +255,27 @@
         android:layout_gravity="right"
         android:layout_marginTop="10mm"
         android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_mark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3mm"
+            android:visibility="gone"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="唛头"
+            android:textColor="@color/white" />
+
+
         <FrameLayout
             android:id="@+id/fl_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:layout_marginRight="10mm">
+            android:layout_marginRight="10mm"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/tv_back"
@@ -277,9 +292,9 @@
                 android:id="@+id/view_back"
                 android:layout_width="8mm"
                 android:layout_height="8mm"
-                android:visibility="gone"
                 android:layout_gravity="right"
-                android:background="@drawable/shape_red_circle" />
+                android:background="@drawable/shape_red_circle"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -303,9 +318,9 @@
                 android:id="@+id/view_get"
                 android:layout_width="8mm"
                 android:layout_height="8mm"
-                android:visibility="gone"
                 android:layout_gravity="right"
-                android:background="@drawable/shape_red_circle" />
+                android:background="@drawable/shape_red_circle"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -329,9 +344,9 @@
                 android:id="@+id/view_return"
                 android:layout_width="8mm"
                 android:layout_height="8mm"
-                android:visibility="gone"
                 android:layout_gravity="right"
-                android:background="@drawable/shape_red_circle" />
+                android:background="@drawable/shape_red_circle"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -356,9 +371,9 @@
                 android:id="@+id/view_quality"
                 android:layout_width="8mm"
                 android:layout_height="8mm"
-                android:visibility="gone"
                 android:layout_gravity="right"
-                android:background="@drawable/shape_red_circle" />
+                android:background="@drawable/shape_red_circle"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -382,22 +397,22 @@
                 android:id="@+id/view_add"
                 android:layout_width="8mm"
                 android:layout_height="8mm"
-                android:visibility="gone"
                 android:layout_gravity="right"
-                android:background="@drawable/shape_red_circle" />
+                android:background="@drawable/shape_red_circle"
+                android:visibility="gone" />
         </FrameLayout>
 
 
-            <TextView
-                android:id="@+id/tv_flow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3mm"
-                android:background="@drawable/shape_blue_btn"
-                android:paddingHorizontal="10mm"
-                android:paddingVertical="5mm"
-                android:text="流水"
-                android:textColor="@color/white" />
+        <TextView
+            android:id="@+id/tv_flow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="流水"
+            android:textColor="@color/white" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file