1.用户选择添加新增预览

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1857,6 +1857,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.user.MesUserDataDetailAddActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="提交"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java

@@ -245,7 +245,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
     private boolean checkParam() {
         boolean dataHasNull = false;
         for (FactoryDetailBean.SteelFurnListBean steelFurnListBean : data1List) {
-            if (TextUtils.isEmpty(steelFurnListBean.getCapacity()) || TextUtils.isEmpty(steelFurnListBean.getSteelmakingFurnaceCode())
+            if (TextUtils.isEmpty(steelFurnListBean.getCapacity())
                     || TextUtils.isEmpty(steelFurnListBean.getType())) {
                 dataHasNull = true;
             }
@@ -255,7 +255,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
             return false;
         }
         for (FactoryDetailBean.SteelRefFurnListBean steelRefFurnListBean : data2List) {
-            if (TextUtils.isEmpty(steelRefFurnListBean.getRefiningFurnaceCode()) || TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
+            if ( TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
                     || TextUtils.isEmpty(steelRefFurnListBean.getCalciumTreatmentSituation())) {
                 dataHasNull = true;
             }
@@ -266,7 +266,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
         }
         for (FactoryDetailBean.SteelLadleListBean steelLadleListBean : data3List) {
             if (TextUtils.isEmpty(steelLadleListBean.getCapacity()) || steelLadleListBean.getCastingDateTime() == null
-                    || TextUtils.isEmpty(steelLadleListBean.getTemperatureRange()) || TextUtils.isEmpty(steelLadleListBean.getLadleCode())) {
+                    || TextUtils.isEmpty(steelLadleListBean.getTemperatureRange())) {
                 dataHasNull = true;
             }
         }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java

@@ -256,8 +256,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         castInfo.setFractureSurface(tvSection.getText().toString());
         castInfo.setSteelGrade(tvSteelType.getText().toString());
         castInfo.setCastingSpeed(tvSpeed.getText().toString());
-        castInfo.setContinuousCasterCode(data.getContinuousCasterCode());
-        castInfo.setContinuousCasterName(data.getContinuousCasterName());
         castInfo.setSteelmakingWorksCode(data.getSteelmakingWorksCode());
         castInfo.setSteelmakingWorksName(data.getSteelmakingWorksName());
 
@@ -345,9 +343,11 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         }
     }
 
-    @OnClick({R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.tv_next,R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.tv_next:
+                break;
             case R.id.rl_cover4:
                 startActivityForResult(MesChooseClientActivity.class,
                         10001, "from", "1");
@@ -546,7 +546,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
                 } else {
                     submitMachine();
                 }
-
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -570,30 +569,34 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         for (Map.Entry<String, Object> machineEntry : machineMap.entrySet()) {
             param.put(machineEntry.getKey(), machineEntry.getValue());
         }
-        showLoading();
-        RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
-            @Override
-            public void doOnSubscribe(Disposable d) {
-            }
 
-            @Override
-            public void onFail(String errorMsg) {
-                hideLoading();
-                toast(errorMsg);
-            }
-
-            @Override
-            public void onSuccess(BaseMesBean data) {
-                hideLoading();
-                if (!data.isSuccess()) {
-                    toast(data.getMessage());
-                    return;
-                }
-                toast("添加成功");
-                EventBus.getDefault().post(new AddUserDataEvent());
-                finish();
-            }
-        });
+        startActivity(MesUserDataDetailAddActivity.class,"from","1"
+                ,"data",JSON.toJSONString(param));
+
+//        showLoading();
+//        RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+//            @Override
+//            public void doOnSubscribe(Disposable d) {
+//            }
+//
+//            @Override
+//            public void onFail(String errorMsg) {
+//                hideLoading();
+//                toast(errorMsg);
+//            }
+//
+//            @Override
+//            public void onSuccess(BaseMesBean data) {
+//                hideLoading();
+//                if (!data.isSuccess()) {
+//                    toast(data.getMessage());
+//                    return;
+//                }
+//                toast("添加成功");
+//                EventBus.getDefault().post(new AddUserDataEvent());
+//                finish();
+//            }
+//        });
     }
 
     private void submitMachine() {
@@ -656,4 +659,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
                 break;
         }
     }
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
+    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java

@@ -200,6 +200,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
                 machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
                 MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
                 if (castInfo != null) {
+                    tvMachineName.setText(castInfo.getContinuousCasterName());
                     tvMachineType.setText(castInfo.getContinuousCasterType());
                     tvSection.setText(castInfo.getFractureSurface());
                     tvSteelType.setText(castInfo.getSteelGrade());
@@ -330,9 +331,19 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.tv_next,R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.tv_next:
+                Map<String, Object> param = WorkUtils.simpleParam();
+                param.put("mainInfo", data);
+                JSONObject steelInfo = new JSONObject();
+                steelInfo.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
+                steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
+                param.put("steelInfo", steelInfo);
+                startActivity(MesUserDataDetailAddActivity.class,"form","0"
+                ,"data",JSON.toJSONString(param));
+                break;
             case R.id.tv_add1:
                 startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
@@ -395,19 +406,23 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
         getData();
     }
 
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_machine_finish, menu);
+        getMenuInflater().inflate(R.menu.menu_modify, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.finish:
-                submit();
-                break;
+//            case R.id.finish:
+//                submit();
+//                break;
             case R.id.modify:
                 startActivity(MesChooseMachineModifyActivity.class,
                         "data",JSON.toJSONString(data));

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java

@@ -511,7 +511,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree, R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree,
+            R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_add1:
@@ -567,6 +568,27 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             case R.id.btn_refuse:
                 openCheck(2);
                 break;
+            case R.id.rl_middle:
+                if (llMiddle.getVisibility() == View.VISIBLE) {
+                    llMiddle.setVisibility(View.GONE);
+                } else {
+                    llMiddle.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_cover:
+                if (llCover.getVisibility() == View.VISIBLE) {
+                    llCover.setVisibility(View.GONE);
+                } else {
+                    llCover.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_protection:
+                if (llProtection.getVisibility() == View.VISIBLE) {
+                    llProtection.setVisibility(View.GONE);
+                } else {
+                    llProtection.setVisibility(View.VISIBLE);
+                }
+                break;
         }
     }
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java

@@ -551,7 +551,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
 
     @OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3, R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client, R.id.iv_modify_machine, R.id.iv_modify_steel,
             R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
-            R.id.tv_add4})
+            R.id.tv_add4,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_factory_add1:

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

@@ -130,7 +130,7 @@
             android:id="@+id/rv_data3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10mm" />
+           />
 
         <TextView
             android:id="@+id/tv_add3"

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

@@ -926,6 +926,15 @@
             </LinearLayout>
         </RelativeLayout>
 
+        <TextView
+            android:visibility="gone"
+            android:id="@+id/tv_next"
+            android:layout_width="match_parent"
+            android:background="@color/blue_btn"
+            android:text="下一步"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:layout_height="40mm" />
         <RelativeLayout
             android:id="@+id/rl_add"
             android:layout_width="match_parent"

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

@@ -917,5 +917,14 @@
                 android:text="+添加"
                 android:textSize="14sp" />
         </RelativeLayout>
+
+        <TextView
+            android:id="@+id/tv_next"
+            android:layout_width="match_parent"
+            android:background="@color/blue_btn"
+            android:text="下一步"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:layout_height="40mm" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file

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

@@ -126,7 +126,7 @@
                 android:textSize="14sp" />
 
 
-            <EditText
+            <TextView
                 android:id="@+id/et_content3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -134,8 +134,6 @@
                 android:layout_marginRight="3mm"
                 android:background="@null"
                 android:hint="请输入"
-                android:clickable="false"
-                android:focusable="false"
                 android:textSize="14sp" />
         </RelativeLayout>
     </LinearLayout>