Skip to content

W
workoffice
提交 47177290 authored 作者: lgd's avatar lgd
浏览文件
操作

1.生产计划

上级 cf1d254d
显示空白字符变更
内嵌 并排
正在显示 包含 140 行增加 和 13 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 47177290
......@@ -2302,6 +2302,16 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkPlanActivity"
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/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 47177290
......@@ -185,7 +185,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
llCheck.setVisibility(View.GONE);
break;
case 300:
llBottom.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE);// 0721 修改生成坩埚销售订单为不显示
llApply.setVisibility(View.VISIBLE);
flSendApply.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
......@@ -194,18 +194,18 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
llBottom.setVisibility(View.GONE);
break;
case 410:
llBottom.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE); // 0721 修改生成坩埚销售订单为不显示
llApply.setVisibility(View.VISIBLE);
flSendApply.setVisibility(View.GONE);
break;
case 420:
llBottom.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE);// 0721 修改生成坩埚销售订单为不显示
llApply.setVisibility(View.VISIBLE);
flSendApply.setVisibility(View.GONE);
break;
case 500:
if (TextUtils.equals(type, "1")) {//1坩埚生产 2 坩埚销售
llBottom.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE);//0721 修改生成坩埚销售订单为不显示
llApply.setVisibility(View.VISIBLE);
flSendApply.setVisibility(View.GONE);
} else {
......@@ -217,7 +217,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case 600:
break;
default:
llBottom.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE);//0721 修改生成坩埚销售订单为不显示
llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE);
break;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseInfoActivity.java
浏览文件 @ 47177290
......@@ -154,7 +154,9 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
insideParam.put("current", 1);
param.put("current", 1);
param.put("processType", permissionCode);
if (!TextUtils.equals(getIntent().getStringExtra("deptId"), "-1")) {//生产计划-1
param.put("outDeptId", getIntent().getStringExtra("deptId"));
}
stockParam = WorkUtils.simpleParam();
stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkPlanActivity.java 0 → 100644
浏览文件 @ 47177290
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity;
import com.wd.workoffice.ui.activity.bat.store.ChooseInfoActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.CrucibleOrderBuyListFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 销售 - 供应订单
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkPlanActivity extends WorkToolBarActivity {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"全部", "待审核", "待接单", "待生产", "已入库"};
private String order[] = {
"", "100", "200", "300", "500"};
private String identity = "2";
@Override
protected void initView() {
ButterKnife.bind(this);
tlTab.setupWithViewPager(vpData);
tlTab.setTabMode(TabLayout.MODE_FIXED);
}
@Override
protected void initData() {
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) {
CrucibleOrderBuyListFragment saleFragment = new CrucibleOrderBuyListFragment();
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("identity", identity);
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_order;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_START.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add_and_search, menu);
}else {
getMenuInflater().inflate(R.menu.menu_search, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(CrucibleOrderSearchActivity.class, "identity", "2"
,"type","2");
break;
case R.id.add:
startActivity(ChooseInfoActivity.class, "code", PermissionType.CRUCIBLE_SELL.getCode(),
"type", "5", "deptId", "-1");
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java
浏览文件 @ 47177290
......@@ -109,9 +109,9 @@ public class MainFragment extends WorkBaseFg {
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"销售", "外采购", "供应", "财税", "坩埚", "内部交易"};
"销售商店", "外采购商店", "供应商店", "财税商店", "仓单交易"};
private String status[] = {
"1", "2", "3", "4", "5", "6"};
"1", "2", "3", "4", "6"};
private FragmentManager sfm;
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
浏览文件 @ 47177290
......@@ -34,6 +34,7 @@ import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkDepActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkPlanActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
......@@ -76,19 +77,22 @@ public class WorkFragment extends WorkBaseFg {
R.mipmap.work_icon4, R.mipmap.work_icon5, R.mipmap.work_icon6, R.mipmap.work_icon7,
// R.mipmap.work_icon8, R.mipmap.work_icon9,
R.mipmap.work_icon10,
R.mipmap.work_product_plan
// R.mipmap.work_icon11
};
String[] workName = new String[]{"产品", "往来",
// "部门账户",
"仓库", "部门", "财务中心", "设备",
// "流程", "报表",
"库存类别"};
"库存类别","生产计划"};
List<BatLayoutVo> saleList = new ArrayList<>();
List<BatLayoutVo> productList = new ArrayList<>();
int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5, R.mipmap.order_sale6};
String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单", "坩埚订单"};
int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3, R.mipmap.order_product4, R.mipmap.order_product5, R.mipmap.order_product6};
String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单", "坩埚订单"};
int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5
};
String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"};
int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3,
R.mipmap.order_product4, R.mipmap.order_product5};
String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"};
@BindView(R.id.rv_sale)
RecyclerView rvSale;
@BindView(R.id.rv_product)
......@@ -234,7 +238,11 @@ public class WorkFragment extends WorkBaseFg {
startActivity(WorkInStockActivity.class);
break;
case 7:
startActivity(WorkOrderActivity.class);
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkPlanActivity.class);
break;
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论