1.修改仓库bug

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

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

@@ -25,8 +25,8 @@ public class WorkWarehouseOrderAdapter extends BaseQuickAdapter<OrderBean, BaseV
 
     @Override
     protected void convert(BaseViewHolder helper, OrderBean item) {
-        helper.setText(R.id.tv_name, item.getOrderTypeName());
-        helper.setText(R.id.tv_type, item.getId());
+        helper.setText(R.id.tv_name, item.getId() );
+        helper.setText(R.id.tv_type, item.getOrderTypeName());
         helper.setText(R.id.tv_dep, item.getLaunchDeptName());
         helper.setText(R.id.tv_receive_dep, item.getReceiveDeptName());
         helper.setText(R.id.tv_time, item.getCreatedTime());

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

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.OrderBean;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class WorkWarehouseOrderDetailAdapter extends BaseQuickAdapter<OrderBean.
         helper.setText(R.id.tv_name, item.getProductName());
         helper.setText(R.id.tv_code, item.getProductSoleCode());
         helper.setText(R.id.tv_img_code, item.getProductSimpleCode());
-        helper.setText(R.id.tv_price, String.valueOf(item.getOuterPrice()));
+        helper.setText(R.id.tv_price, MathUtils.converData(item.getProductCount(),3));
         RecyclerView rvData = helper.getView(R.id.rv_data);
         rvData.setLayoutManager(new LinearLayoutManager(helper.itemView.getContext(), RecyclerView.VERTICAL, false));
         WorkWarehouseOrderStockAdapter workWarehouseOrderStockAdapter = new WorkWarehouseOrderStockAdapter(R.layout.item_warehoust_order_stock, item.getStockQuantityDetailMaps());

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

@@ -25,8 +25,8 @@ public class WorkWarehouseOrderStockAdapter extends BaseQuickAdapter<OrderBean.O
     protected void convert(BaseViewHolder helper, OrderBean.OrderItemsBean.StockQuantityDetailMapsBean item) {
         helper.setText(R.id.tv_name, item.getStockName());
         helper.setText(R.id.tv_type, item.getStockName());
-        helper.setText(R.id.tv_num, MathUtils.converData(item.getQuantity(), 3));
-        helper.setText(R.id.tv_out_num, MathUtils.converData(item.getApplyOut(), 3));
+        helper.setText(R.id.tv_num, "库存数量"+MathUtils.converData(item.getQuantity(), 3));
+        helper.setText(R.id.tv_out_num,"出库申请中"+ MathUtils.converData(item.getApplyOut(), 3));
 
     }
 }

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

@@ -308,7 +308,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10mm"
-                    android:text="活品库存信息"
+                    android:text="货品库存信息"
                     android:textSize="16sp" />
             </LinearLayout>