提交 9bf74860 authored 作者: lgd's avatar lgd

1.去除销售坩埚订单,入库领用显示,新增坩埚发货页面(未处理功能)

2.TODO 三个功能测试,下单新增唛头測試
上级 6d51d129
...@@ -2383,7 +2383,14 @@ ...@@ -2383,7 +2383,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.SendApplyAddCruibleActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="申请发货"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
...@@ -93,7 +93,7 @@ public class OrderDetail { ...@@ -93,7 +93,7 @@ public class OrderDetail {
private String inStockName; private String inStockName;
private String usedStore; private String usedStore;
private String usedStoreName; private String usedStoreName;
private String isCrucible; private String isCrucible;//坩埚销售订单 1 坩埚销售订单
public String getIsCrucible() { public String getIsCrucible() {
return isCrucible; return isCrucible;
......
...@@ -271,6 +271,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -271,6 +271,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
proList.addAll(dataBean.getOrderItems()); proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus()); proAdapter.setStatus(dataBean.getStatus());
proAdapter.setAttr(dataBean.getAttr()); proAdapter.setAttr(dataBean.getAttr());
proAdapter.setIsCrucible(dataBean.getIsCrucible());
proAdapter.notifyDataSetChanged(); proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getCustomerName()); tvName.setText(dataBean.getCustomerName());
tvDep.setText(dataBean.getReceiveDeptName()); tvDep.setText(dataBean.getReceiveDeptName());
...@@ -433,6 +434,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -433,6 +434,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
} }
startActivity(SendApplyActivity.class, startActivity(SendApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"isCrucible", dataBean.getIsCrucible(),
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id")); "orderId", getIntent().getStringExtra("id"));
break; break;
......
...@@ -102,6 +102,12 @@ public class SendApplyActivity extends WorkToolBarActivity { ...@@ -102,6 +102,12 @@ public class SendApplyActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
if (TextUtils.equals("1", getIntent().getStringExtra("isCrucible"))) {
startActivity(SendApplyAddCruibleActivity.class,
"orderType", getIntent().getStringExtra("orderType"),
"id", getIntent().getStringExtra("orderId"));
return super.onOptionsItemSelected(item);
}
startActivity(SendApplyAddActivity.class, startActivity(SendApplyAddActivity.class,
"orderType", getIntent().getStringExtra("orderType"), "orderType", getIntent().getStringExtra("orderType"),
"id", getIntent().getStringExtra("orderId")); "id", getIntent().getStringExtra("orderId"));
......
...@@ -22,7 +22,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -22,7 +22,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
int status; int status;
int attr; int attr;
List<OrderCheckStatusBean.ItemsBean> proStatusList; List<OrderCheckStatusBean.ItemsBean> proStatusList;
String isCrucible;
public OrderDetailProductAdapter(int layoutResId, List data, Integer status) { public OrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data); super(layoutResId, data);
...@@ -49,8 +49,8 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -49,8 +49,8 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(), 3)); helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(), 3));
if (!TextUtils.isEmpty(item.getAnnex())){ if (!TextUtils.isEmpty(item.getAnnex())) {
helper.setText(R.id.tv_annex,item.getAnnex().substring(1)); helper.setText(R.id.tv_annex, item.getAnnex().substring(1));
} }
helper.addOnClickListener(R.id.ll_annex); helper.addOnClickListener(R.id.ll_annex);
helper.addOnClickListener(R.id.tv_get); helper.addOnClickListener(R.id.tv_get);
...@@ -108,12 +108,16 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -108,12 +108,16 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper.setGone(R.id.fl_get, false); helper.setGone(R.id.fl_get, false);
} }
changeStats(helper, item.getProductId()); changeStats(helper, item.getProductId());
if (TextUtils.equals(isCrucible, "1")) {//坩埚销售订单,入库和领用不展示
helper.setGone(R.id.fl_add, false);
helper.setGone(R.id.fl_get, false);
}
} }
private void changeStats(BaseViewHolder helper, int productId) { private void changeStats(BaseViewHolder helper, int productId) {
if (getProStatusList() != null) { if (getProStatusList() != null) {
for (OrderCheckStatusBean.ItemsBean itemsBean : getProStatusList()) { for (OrderCheckStatusBean.ItemsBean itemsBean : getProStatusList()) {
if (productId==itemsBean.getProductId()){ if (productId == itemsBean.getProductId()) {
helper.setGone(R.id.view_add, itemsBean.isInStore()); helper.setGone(R.id.view_add, itemsBean.isInStore());
helper.setGone(R.id.view_get, itemsBean.isUsed()); helper.setGone(R.id.view_get, itemsBean.isUsed());
helper.setGone(R.id.view_quality, itemsBean.isQualityInspection()); helper.setGone(R.id.view_quality, itemsBean.isQualityInspection());
...@@ -140,5 +144,13 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -140,5 +144,13 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
this.proStatusList = proStatusList; this.proStatusList = proStatusList;
notifyDataSetChanged(); notifyDataSetChanged();
} }
public String getIsCrucible() {
return isCrucible;
}
public void setIsCrucible(String isCrucible) {
this.isCrucible = isCrucible;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论