完成 半成品出库

master
wangh 11 months ago
parent e183334d63
commit 0d72d4cdc2

1
.gitignore vendored

@ -13,3 +13,4 @@
.externalNativeBuild .externalNativeBuild
.cxx .cxx
local.properties local.properties
/release

@ -17,6 +17,9 @@
android:theme="@style/Theme.Jingyuanmes" android:theme="@style/Theme.Jingyuanmes"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".check.CheckActivity"
android:exported="false" />
<activity <activity
android:name=".store.SemiActivity" android:name=".store.SemiActivity"
android:exported="false" /> android:exported="false" />
@ -38,9 +41,6 @@
<activity <activity
android:name=".store.ProductOutApplyActivity" android:name=".store.ProductOutApplyActivity"
android:exported="true" /> android:exported="true" />
<activity
android:name=".store.SemiFinishedActivity"
android:exported="false" />
<activity <activity
android:name=".store.ProductInActivity" android:name=".store.ProductInActivity"
android:exported="true" /> android:exported="true" />
@ -59,11 +59,13 @@
<activity <activity
android:name=".HomePageActivity" android:name=".HomePageActivity"
android:exported="true"> android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <!-- <intent-filter> -->
</intent-filter> <!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
</activity> </activity>
<activity <activity
android:name=".store.MaterialOutListActivity" android:name=".store.MaterialOutListActivity"
@ -73,7 +75,13 @@
android:exported="true" /> android:exported="true" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" /> android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application> </application>
</manifest> </manifest>

@ -37,7 +37,7 @@ public class BaseActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Log.e("TAG", this.getLocalClassName() ); Log.e("TAG", this.getLocalClassName() );
gson = new Gson(); gson = new Gson();
SharedPreferencesUtils.putstring("access_token",handle); // SharedPreferencesUtils.putstring("access_token",handle);
this.context=this; this.context=this;
initDialog(); initDialog();
// initSan(); // initSan();

@ -0,0 +1,16 @@
package com.example.jingyuan_mes.check;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import com.example.jingyuan_mes.R;
public class CheckActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_check);
}
}

@ -0,0 +1,128 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".check.CheckActivity">
<include
layout="@layout/toolbar"
app:title='@{title??"物料检验"}' />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_margin="8dp"
android:background="@drawable/san_text_bg"
android:padding="4dp">
<EditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:hint="请输入领用人名称"
android:text="@={vm.searchText}" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:onClick="outPassSearch"
android:src="@mipmap/ic_search" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="扫描物料:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@={vm.instockBatch}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="物料编号:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@={vm.instockBatch}" />
<TextView
style="@style/text_title"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="物料名称:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@={vm.instockBatch}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="检验类型:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@={vm.instockBatch}" />
<TextView
style="@style/text_title"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="检验状态:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@={vm.instockBatch}" />
</LinearLayout>
</LinearLayout>
</layout>
Loading…
Cancel
Save