wangh
/
jingyuan-mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 名称和质检

Browse Source
master
wanghao 3 months ago
parent 9f4dd0f68b
commit cd70e560a0
8 changed files with 88 additions and 61 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/com/example/jingyuan_mes/HomePageActivity.java
Unescape Escape View File

@ -68,9 +68,9 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
map.put("原材料入库", MaterialInActivity.class);
map.put("原材料出库审批", MaterialOutListActivity.class);
map.put("原材料出库", MaterialPassActivity.class);
map.put("组装出库", AssemblyOutActivity.class);
map.put("出库组装", AssemblyOutActivity.class);
map.put("组装返库", AssemblyOutActivity.class);
map.put("生产入库", AssemblyOutActivity.class);
map.put("组装入库", AssemblyOutActivity.class);
map.put("原材料退库审批", StockreturnActivity.class);
map.put("原材料退库", StockreturnConfirmActivity.class);
map.put("成品入库", ProductInActivity.class);
@ -138,7 +138,7 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
if (cls==null) return;
var intent = new Intent(this, cls);
if (menuName.equals("物料质检列表")||menuName.equals("不合格处置")
||menuName.equals("组装出库")||menuName.equals("组装返库")||menuName.equals("生产入库")
||menuName.equals("出库组装")||menuName.equals("组装返库")||menuName.equals("组装入库")
||menuName.equals("人工移库")||menuName.equals("人工合库")){
intent.putExtra("title",menuName);
}

26
app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
Unescape Escape View File

@ -284,18 +284,40 @@ public class DeviceRepairInfoActivity extends BaseActivity {
// 完成维修
public void endRepair(View view) {
OkGo.<MyResult>post(url + "/dms/mobile/completeRepair").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).params("repairInstanceId", deviceRepair.getRepairInstanceId()).params("instanceActivityId", deviceRepair.getInstanceActivityId()).params("designOperations", deviceRepair.getDesignOperations()).params("faultType", deviceRepair.getFaultSourceType()).params("processHandleResolution", deviceRepair.getProcessHandleResolution()).params("repairType", deviceRepair.getRepairType()).params("outsrcId", deviceRepair.getOutsrcId()).params("repairContent", deviceRepair.getRepairContent()).params("protectedMethod", deviceRepair.getProtectedMethod()).params("repairer", SharedPreferencesUtils.getstring("user", "")).params("parts1", gson.toJson(deviceRepair.getParts())).addFileParams("files", submitFileList).execute(new MyRecultCall(dialog, this) {
// try {
// Log.e("TAG", "repairInstanceId" + deviceRepair.getRepairInstanceId());
// Log.e("TAG", "instanceActivityId" + deviceRepair.getInstanceActivityId());
OkGo.<MyResult>post(url + "/dms/mobile/completeRepair")
.headers("Authorization", SharedPreferencesUtils.getstring("access_token", ""))
.params("repairInstanceId", deviceRepair.getRepairInstanceId())
.params("instanceActivityId", deviceRepair.getInstanceActivityId())
.params("designOperations", deviceRepair.getDesignOperations())
.params("faultType", deviceRepair.getFaultSourceType())
.params("processHandleResolution", deviceRepair.getProcessHandleResolution())
.params("repairType", deviceRepair.getRepairType())
.params("outsrcId", deviceRepair.getOutsrcId())
.params("repairContent", deviceRepair.getRepairContent())
.params("protectedMethod", deviceRepair.getProtectedMethod())
.params("repairer", SharedPreferencesUtils.getstring("user", ""))
.params("parts1", gson.toJson(deviceRepair.getParts()))
.addFileParams("files", submitFileList)
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
MyResult body = response.body();
if (body.getCode() == 200) {
submitFileList.forEach(File::delete);
finish();
// finish();
} else {
myToastUitls.show(body.getMsg());
}
}
});
// } catch (Exception e) {
// e.printStackTrace();
// }
}
// 选择故障类别

4
app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java
Unescape Escape View File

@ -226,7 +226,8 @@ public class CheckResultDetal extends BaseObservable {
public String getCheckStatusShow() {
if (checkProjectStatus==null||checkProjectStatus.isEmpty()){
setCheckStatusShow("未检验");
setCheckStatusShow("");
// setCheckStatusShow("未检验");
}else if (checkProjectStatus.equals("1")){
setCheckStatusShow("合格");
} else if (checkProjectStatus.equals("0")) {
@ -254,7 +255,6 @@ public class CheckResultDetal extends BaseObservable {
double result=Double.parseDouble(s.toString());
checkProjectResult=result+"";
if (result>=downDiff && result<= upperDiff){
setCheckProjectStatus("1");
}else {
setCheckProjectStatus("0");

4
app/src/main/java/com/example/jingyuan_mes/store/AssemblyOutActivity.java
Unescape Escape View File

@ -34,13 +34,13 @@ public class AssemblyOutActivity extends BaseActivity {
binding = DataBindingUtil.setContentView(this, R.layout.activity_assembly_out);
title = getIntent().getStringExtra("title");
switch (title){
case "组装出库" :
case "出库组装" :
uri="assembleOutstock";
break;
case "组装返库" :
uri="assembleBack";
break;
case "生产入库" :
case "组装入库" :
uri="produceInstock";
break;

7
app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java
Unescape Escape View File

@ -31,6 +31,7 @@ public class SemiActivity extends BaseActivity {
private List<Semi> list;
public ObservableField<String> locationCode;
public ObservableField<String> proCode;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -79,7 +80,8 @@ public class SemiActivity extends BaseActivity {
myToastUitls.show(body.getCode() == 200 ? "暂无记录" : body.getMsg());
return;
}
list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken<List<Semi>>() {}.getType());
list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken<List<Semi>>() {
}.getType());
adapter.setList(list);
adapter.notifyDataSetChanged();
}
@ -87,6 +89,7 @@ public class SemiActivity extends BaseActivity {
}
public void submit(boolean b) {
Map<String, String> map = new HashMap<>();
map.put("locationCode", locationCode.get());
@ -100,6 +103,8 @@ public class SemiActivity extends BaseActivity {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
locationCode.set(null);
proCode.set(null);
initRequest();
}
myToastUitls.show(body.getMsg());

8
app/src/main/res/layout/activity_check.xml
Unescape Escape View File

@ -187,12 +187,12 @@
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp"
android:background="@color/white"
android:layout_weight="1"
android:adapter="@{adapter}"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
/>
android:background="@color/white"
android:padding="5dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<Button
android:layout_width="match_parent"
android:layout_height="50dp"

5
app/src/main/res/layout/activity_check_select_detal.xml
Unescape Escape View File

@ -37,7 +37,7 @@
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="批次数量:" />
@ -72,7 +72,7 @@
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_width="90dp"
android:layout_height="match_parent"
android:text="检验方式:" />
@ -81,6 +81,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="16sp"
android:text='@{vm.checkMode==null?"":(vm.checkMode+"("+vm.checkSample+"%)")}' />
<TextView

5
app/src/main/res/layout/item_check_2.xml
Unescape Escape View File

@ -40,11 +40,10 @@
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_weight="1"
android:inputType="number"
android:inputType="numberDecimal"
android:enabled="@{enabledState}"
android:afterTextChanged="@{item.textChanged}"
android:text='@={item.checkProjectResult}' />
<!-- android:afterTextChanged="@{item.textChanged}"-->
<TextView
style="@style/item_title"
android:layout_width="50dp"

Write Preview
Loading…
Cancel
Save