1.添加非空验证

2.TODO 单独菜单

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java

@@ -255,10 +255,12 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
             }
             if (TextUtils.equals(getIntent().getStringExtra("code"),
                     PermissionType.PROCESS_SALE.getCode())) {
-                recordsBean.getMarkOrderRel().setReceiveCompany(etCompany.getText().toString());
-                recordsBean.getMarkOrderRel().setContinuousCastingMachine(etMachine.getText().toString());
-                recordsBean.getMarkOrderRel().setShipCompany(etSendCompany.getText().toString());
-                recordsBean.getMarkOrderRel().setDomesticShipCompany(etCountryCompany.getText().toString());
+                if (null!= recordsBean.getMarkOrderRel()){
+                    recordsBean.getMarkOrderRel().setReceiveCompany(etCompany.getText().toString());
+                    recordsBean.getMarkOrderRel().setContinuousCastingMachine(etMachine.getText().toString());
+                    recordsBean.getMarkOrderRel().setShipCompany(etSendCompany.getText().toString());
+                    recordsBean.getMarkOrderRel().setDomesticShipCompany(etCountryCompany.getText().toString());
+                }
                 data.put("markOrderRel", recordsBean.getMarkOrderRel());
             }
 //            data.put("tranFromStockId", recordsBean.getCarPrice());