调试 入库

master
wanghao 4 months ago
parent 2f201846ed
commit 71e1564379

@ -2,6 +2,7 @@
<manifest 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">
<uses-feature
android:name="android.hardware.camera"
android:required="false" />
@ -16,7 +17,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.CAMERA" /> <!-- 相机权限 -->
<uses-permission android:name="android.permission.CAMERA" />
<application
android:name=".base.MyApplication"
android:allowBackup="true"
@ -29,27 +31,30 @@
android:theme="@style/Theme.Haiweimom"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".wms.raw.Return2Activity"
android:exported="false" />
<activity
android:name=".wms.raw.MoveActivity"
android:exported="false" />
<activity
android:name=".wms.raw.SpecialOutActivity"
android:exported="false" />
<activity
android:name=".check.CheckSelectActivity"
android:exported="false" />
<activity
<activity
android:name=".check.CheckActivity"
android:exported="false" />
<activity
<activity
android:name=".check.Check2Activity"
android:exported="false" />
<activity
<activity
android:name=".check.CheckSelect2Activity"
android:exported="false" />
<activity
<activity
android:name=".wms.semi.BindingActivity"
android:exported="false" />
<activity
android:name=".wms.semi.SeimMoveActivity"
android:exported="false" />
@ -104,7 +109,6 @@
<activity
android:name=".HomePageActivity"
android:exported="false" />
<activity
android:name=".device.DeviceRepairInfoActivity"
android:exported="false" />
@ -117,12 +121,9 @@
<activity
android:name=".device.MaintainActivity"
android:exported="false" />
<activity
<activity
android:name=".device.MaintainInfoActivity"
android:exported="false" />
<activity
android:name=".device.DeviceCheckInfoActivity"
android:exported="false" />
@ -132,14 +133,12 @@
<activity
android:name=".device.BxActivity"
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
@ -153,7 +152,6 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

@ -2,6 +2,7 @@ package com.example.haiwei_mom;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.databinding.DataBindingUtil;
@ -24,9 +25,12 @@ import com.example.haiwei_mom.ipc.FeedingMaterialsActivity;
import com.example.haiwei_mom.qm.LtCheckActivity;
import com.example.haiwei_mom.wms.product.BindVehicleActivity;
import com.example.haiwei_mom.wms.product.ProductInActivity;
import com.example.haiwei_mom.wms.raw.MoveActivity;
import com.example.haiwei_mom.wms.raw.RawInActivity;
import com.example.haiwei_mom.wms.raw.RawOutActivity;
import com.example.haiwei_mom.wms.raw.RawReturnActivity;
import com.example.haiwei_mom.wms.raw.Return2Activity;
import com.example.haiwei_mom.wms.raw.SpecialOutActivity;
import com.example.haiwei_mom.wms.raw.StoreCheckActivity;
import com.example.haiwei_mom.wms.semi.BindingActivity;
import com.example.haiwei_mom.wms.semi.SeimMoveActivity;
@ -45,26 +49,35 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
private List<MenuBeen> menuList;
private HomeMenuAdapter adapter;
private Map<String, Class> map;
private ActivityHomePageBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ActivityHomePageBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_home_page);
binding = DataBindingUtil.setContentView(this, R.layout.activity_home_page);
adapter = new HomeMenuAdapter(this, this);
binding.setAdapter(adapter);
initRequest();
initMenuMap();
}
@Override
protected void onResume() {
super.onResume(); initRequest();
}
private void initMenuMap() {
map = new HashMap<>();
map.put("入库", RawInActivity.class);
map.put("质检入库", RawInActivity.class);
map.put("AGV入库", RawInActivity.class);
map.put("出库", RawOutActivity.class);
map.put("特殊情况出库", SpecialOutActivity.class);
map.put("盘点", StoreCheckActivity.class);
map.put("退库申请", RawReturnActivity.class);
map.put("退库入库", Return2Activity.class);
// map.put("退库", RawReturnActivity.class);
map.put("移库合库", MoveActivity.class);
map.put("半成品入库", SemiInActivity.class);
map.put("半成品出库", SemiOutActivity.class);
map.put("半成品调拨", SeimMoveActivity.class);
@ -74,10 +87,7 @@ protected void onResume() {
map.put("入库工装绑定", BindVehicleActivity.class);
map.put("成品批量入库", ProductInActivity.class);
map.put("成品出库", RawOutActivity.class);
map.put("原材料入库", RawInActivity.class);
map.put("原材料出库", RawOutActivity.class);
map.put("原材料盘点", StoreCheckActivity.class);
map.put("原材料退库", RawReturnActivity.class);
map.put("制品质检", LtCheckActivity.class);
map.put("制品复检", LtCheckActivity.class);
map.put("机台投料", FeedingMaterialsActivity.class);
@ -105,7 +115,9 @@ protected void onResume() {
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
boolean state = body.getCode() == 200;
binding.setState(state);
if (state) {
List<PdaRouters> list = gson.fromJson(body.getDataJson(), new TypeToken<List<PdaRouters>>() {
}.getType());
list.forEach(t -> {
@ -154,4 +166,8 @@ protected void onResume() {
startActivity(intent);
}
public void menuRefalsh(View view) {
initRequest();
}
}

@ -74,6 +74,83 @@ public class RawInstock extends BaseObservable {
private String unitName;
private String inspectionRequest;
private String title;
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Long getInstockPrintId() {
return instockPrintId;
}
public void setInstockPrintId(Long instockPrintId) {
this.instockPrintId = instockPrintId;
}
public void setInstockCode(String instockCode) {
this.instockCode = instockCode;
}
public String getBatchCode() {
return batchCode;
}
public void setBatchCode(String batchCode) {
this.batchCode = batchCode;
}
public Long getApportionQty() {
return apportionQty;
}
public void setApportionQty(Long apportionQty) {
this.apportionQty = apportionQty;
}
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public void setMaterialSpe(String materialSpe) {
this.materialSpe = materialSpe;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getInspectionRequest() {
return inspectionRequest;
}
public void setInspectionRequest(String inspectionRequest) {
this.inspectionRequest = inspectionRequest;
}
public String getMaterialCategories() {
return materialCategories;
}
public void setMaterialCategories(String materialCategories) {
this.materialCategories = materialCategories;
}
public double getMaterialQty() {
return materialQty;
}

@ -41,6 +41,7 @@ public class WmsInventoryVo {
*/
private String locationCode;
private String newLocationCode;
/**
*
@ -78,6 +79,23 @@ public class WmsInventoryVo {
private String materialCode;//字段映射
private String materialName;//字段映射
private String warehouseId;
private String materialUnit;
public String getNewLocationCode() {
return newLocationCode;
}
public void setNewLocationCode(String newLocationCode) {
this.newLocationCode = newLocationCode;
}
public String getMaterialUnit() {
return materialUnit;
}
public void setMaterialUnit(String materialUnit) {
this.materialUnit = materialUnit;
}
public Long getInventoryId() {
return inventoryId;

@ -0,0 +1,353 @@
package com.example.haiwei_mom.data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 退 wms_return_order
*/
public class WmsReturnOrderVo {
/**
*
*/
private Long roId;
/**
* ID
*/
private Long materialId;
/**
*
*/
private String materialCategoryId;
/**
*
*/
private String batchCode;
/**
*
*/
private BigDecimal planAmount;
/**
* ID
*/
private Long warehouseId;
/**
* 退
*/
private String planLocationCode;
/**
* 退
*/
private String orderStatus;
/**
*
*/
private BigDecimal returnAmount;
/**
* 退
*/
private String returnLocationCode;
/**
*
*/
private String auditBy;
/**
*
*/
private Date auditTime;
/**
* (0,1,2)
*/
private String auditStatus;
/**
*
*/
private String auditComments;
/**
* erp
*/
private String erpSynchronousStatus;
/**
* erp
*/
private Long erpSynchronousQty;
/**
* id
*/
private String tenantId;
private String createBy;
/**
*
*/
private Date createTime;
/**
*
*/
private String updateBy;
/**
*
*/
private Date updateTime;
private String warehouseCode;// 字段映射
private String materialCode;
private String materialName;
private String materialUnit;
/**
*
*/
private String materialCategoryName;// 字段映射
public Long getRoId() {
return roId;
}
public void setRoId(Long roId) {
this.roId = roId;
}
public Long getMaterialId() {
return materialId;
}
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
public String getMaterialCategoryId() {
return materialCategoryId;
}
public void setMaterialCategoryId(String materialCategoryId) {
this.materialCategoryId = materialCategoryId;
}
public String getBatchCode() {
return batchCode;
}
public void setBatchCode(String batchCode) {
this.batchCode = batchCode;
}
public BigDecimal getPlanAmount() {
if (planAmount == null) return BigDecimal.valueOf(0);
return planAmount;
}
public void setPlanAmount(BigDecimal planAmount) {
this.planAmount = planAmount;
}
public Long getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(Long warehouseId) {
this.warehouseId = warehouseId;
}
public String getPlanLocationCode() {
return planLocationCode;
}
public void setPlanLocationCode(String planLocationCode) {
this.planLocationCode = planLocationCode;
}
public String getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
public BigDecimal getReturnAmount() {
return returnAmount;
}
public void setReturnAmount(BigDecimal returnAmount) {
this.returnAmount = returnAmount;
}
public String getReturnLocationCode() {
return returnLocationCode;
}
public void setReturnLocationCode(String returnLocationCode) {
this.returnLocationCode = returnLocationCode;
}
public String getAuditBy() {
return auditBy;
}
public void setAuditBy(String auditBy) {
this.auditBy = auditBy;
}
public Date getAuditTime() {
return auditTime;
}
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
public String getAuditStatus() {
return auditStatus;
}
public void setAuditStatus(String auditStatus) {
this.auditStatus = auditStatus;
}
public String getAuditComments() {
return auditComments;
}
public void setAuditComments(String auditComments) {
this.auditComments = auditComments;
}
public String getErpSynchronousStatus() {
return erpSynchronousStatus;
}
public void setErpSynchronousStatus(String erpSynchronousStatus) {
this.erpSynchronousStatus = erpSynchronousStatus;
}
public Long getErpSynchronousQty() {
return erpSynchronousQty;
}
public void setErpSynchronousQty(Long erpSynchronousQty) {
this.erpSynchronousQty = erpSynchronousQty;
}
public String getTenantId() {
return tenantId;
}
public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWarehouseCode() {
return warehouseCode;
}
public void setWarehouseCode(String warehouseCode) {
this.warehouseCode = warehouseCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialUnit() {
return materialUnit;
}
public void setMaterialUnit(String materialUnit) {
this.materialUnit = materialUnit;
}
public String getMaterialCategoryName() {
return materialCategoryName;
}
public void setMaterialCategoryName(String materialCategoryName) {
this.materialCategoryName = materialCategoryName;
}
}

@ -0,0 +1,51 @@
package com.example.haiwei_mom.wms.raw;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
import androidx.databinding.DataBindingUtil;
import com.example.haiwei_mom.R;
import com.example.haiwei_mom.base.BaseActivity;
import com.example.haiwei_mom.base.MyRecultCall;
import com.example.haiwei_mom.base.MyResult;
import com.example.haiwei_mom.data.WmsInventoryVo;
import com.example.haiwei_mom.databinding.ActivityMoveBinding;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.Response;
import java.math.BigDecimal;
public class MoveActivity extends BaseActivity {
private ActivityMoveBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
WmsInventoryVo wmsInventoryVo=new WmsInventoryVo();
wmsInventoryVo.setInventoryQty(BigDecimal.valueOf(0));
binding = DataBindingUtil.setContentView(this, R.layout.activity_move);
binding.setData(wmsInventoryVo);
}
public void moveSelect(View view) {
OkGo.<MyResult>get(url + "/wms/pda/ledgerSelect")
.params("batchCode", binding.materialInGoods.getText().toString())
.params("locationCode", binding.materialOldLocation.getText().toString())
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
MyResult body = response.body();
if (body.getCode()==200){
WmsInventoryVo wmsInventoryVo=gson.fromJson(body.getDataJson(),WmsInventoryVo.class);
binding.setData(wmsInventoryVo);
return;
}
Toast.makeText(MoveActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
}
});
}
}

@ -3,6 +3,7 @@ package com.example.haiwei_mom.wms.raw;
import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.EditText;
@ -23,13 +24,20 @@ public class RawInActivity extends BaseActivity implements View.OnFocusChangeLis
private RawInstock rawInstock;
private ActivityRawInBinding binding;
private EditText editTextView;
private String title;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_raw_in);
title = getIntent().getStringExtra("title");
binding.setTitle(title);
binding.materialInLocation.setOnFocusChangeListener(this);
binding.materialInGoods.setOnFocusChangeListener(this);
binding.materialInGoods.setOnEditorActionListener((v, actionId, event) -> {
selectGoods( binding.materialInGoods.getText().toString());
return true;
});
}
@Override
@ -40,25 +48,31 @@ public class RawInActivity extends BaseActivity implements View.OnFocusChangeLis
} else if (editTextView == binding.materialInGoods || rawInstock == null) {
binding.materialInGoods.setText(data);
OkGo.<MyResult>post(url + "/wms/pda/raw/inSelectCode").params("code", data).execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
rawInstock = gson.fromJson(body.getDataJson(), RawInstock.class);
binding.setData(rawInstock);
return;
}
myToastUitls.show(body.getMsg());
}
});
selectGoods(data);
}
}
private void selectGoods(String data){
OkGo.<MyResult>post(url + "/wms/pda/raw/inSelectCode")
.params("code", data)
.params("type", title)
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
rawInstock = gson.fromJson(body.getDataJson(), RawInstock.class);
binding.setData(rawInstock);
return;
}
myToastUitls.show(body.getMsg());
}
});
}
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (hasFocus) {
@ -78,6 +92,7 @@ public class RawInActivity extends BaseActivity implements View.OnFocusChangeLis
myToastUitls.show("输入数量不能超过条码数量");
return;
}
rawInstock.setTitle(title);
OkGo.<MyResult>post(url + "/wms/pda/raw/inSubmit").upRequestBody(RequestBody.create(JSON, gson.toJson(rawInstock))).execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {

@ -58,7 +58,6 @@ public class RawOutActivity extends BaseActivity implements View.OnFocusChangeLi
rawOutLocationView.setOnFocusChangeListener(this);
rawOutGoodsView = binding.rawOutGoods;
rawOutGoodsView.setOnFocusChangeListener(this);
rawOutDetailAdapter = new RawOutDetailAdapter(this);
binding.setDetailAdapter(rawOutDetailAdapter);
submitBeen = new RawOutSubmitBeen();

@ -0,0 +1,50 @@
package com.example.haiwei_mom.wms.raw;
import android.os.Bundle;
import android.view.View;
import androidx.databinding.DataBindingUtil;
import com.example.haiwei_mom.R;
import com.example.haiwei_mom.base.BaseActivity;
import com.example.haiwei_mom.base.MyRecultCall;
import com.example.haiwei_mom.base.MyResult;
import com.example.haiwei_mom.data.WmsReturnOrderVo;
import com.example.haiwei_mom.databinding.ActivityReturn2Binding;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.Response;
public class Return2Activity extends BaseActivity {
private ActivityReturn2Binding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_return2);
}
public void returnStoreSearch(View view) {
searchOrder(binding.materialReturnCode.getText().toString());
}
private void searchOrder(String code) {
OkGo.<MyResult>post(url + "/wms/pda/returnStore/selectByCode")
.params("code", code)
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
WmsReturnOrderVo params = gson.fromJson(body.getDataJson(), WmsReturnOrderVo.class);
binding.setData(params);
return;
}
myToastUitls.show(body.getMsg());
}
});
}
}

@ -0,0 +1,47 @@
package com.example.haiwei_mom.wms.raw;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.view.View;
import androidx.databinding.DataBindingUtil;
import com.example.haiwei_mom.R;
import com.example.haiwei_mom.base.BaseActivity;
import com.example.haiwei_mom.base.MyRecultCall;
import com.example.haiwei_mom.base.MyResult;
import com.example.haiwei_mom.data.RawOutSubmitBeen;
import com.example.haiwei_mom.databinding.ActivitySpecialOutBinding;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.model.Response;
import okhttp3.RequestBody;
public class SpecialOutActivity extends BaseActivity {
private RawOutSubmitBeen submitBeen;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ActivitySpecialOutBinding binding=DataBindingUtil.setContentView(this, R.layout.activity_special_out);
submitBeen=new RawOutSubmitBeen();
binding.setSubBeen(submitBeen);
}
public void speOutSubmit(View view) {
OkGo.<MyResult>post(url + "/wms/pda/raw/specialOutSubmit")
.upRequestBody(RequestBody.create(JSON, gson.toJson(submitBeen)))
.execute(new MyRecultCall(dialog, this) {
@SuppressLint("NotifyDataSetChanged")
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 200) {
return;
}
myToastUitls.show(body.getMsg());
}
});
}
}

@ -6,6 +6,11 @@
<variable
name="adapter"
type="com.example.haiwei_mom.adapter.HomeMenuAdapter" />
<import type="android.view.View"/>
<variable
name="state"
type="Boolean" />
</data>
<LinearLayout
android:layout_width="match_parent"
@ -29,6 +34,15 @@
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:adapter="@{adapter}"
android:layout_weight="1"
android:padding="10dp"/>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/button_submit"
android:visibility="@{state?View.VISIBLE:View.GONE}"
android:onClick="menuRefalsh"
android:text="刷新"/>
</LinearLayout>
</layout>

@ -0,0 +1,157 @@
<?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>
<variable
name="title"
type="String" />
<variable
name="data"
type="com.example.haiwei_mom.data.WmsInventoryVo" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".wms.raw.MoveActivity">
<include
layout="@layout/toolbar"
app:title='@{title??"移库合库"}' />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="原库位:" />
<!-- -->
<EditText
android:id="@+id/material_old_location"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={data.locationCode}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="扫描物料:" />
<EditText
android:id="@+id/material_in_goods"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="物料编码:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@{data.materialCode}" />
<!-- android:text="@{vo.materialName}"-->
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="批次数量:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:text='@{String.valueOf(data.inventoryQty)??"0"}' />
<TextView
style="@style/text_info"
android:layout_width="60dp"
android:layout_height="match_parent"
android:text="@{data.materialUnit}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="目标库位:" />
<!-- -->
<EditText
android:id="@+id/material_in_location"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={data.locationCode}" />
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/button_submit"
android:onClick="moveSelect"
android:text="查询" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/button_submit"
android:onClick="moveSubmit"
android:text="提交" />
</LinearLayout>
</layout>

@ -8,9 +8,12 @@
<variable
name="title"
type="String" />
<variable
name="data"
type="com.example.haiwei_mom.data.RawInstock" />
<import type="android.view.View" />
</data>
<LinearLayout
@ -21,7 +24,7 @@
<include
layout="@layout/toolbar"
app:title='@{title??"原材料入库"}' />
app:title='@{title??"料入库"}' />
<LinearLayout
android:layout_width="match_parent"
@ -39,7 +42,8 @@
android:id="@+id/material_in_goods"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:imeOptions="actionSearch" />
</LinearLayout>
@ -108,10 +112,51 @@
style="@style/text_info"
android:layout_width="60dp"
android:layout_height="match_parent"
android:text="@{data.unitName}"/>
android:text="@{data.unitName}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="质检要求:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text='@{data.inspectionRequest.equals("0")?"必检":"免检"}' />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="质检结果:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@{data.materialSpe}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -130,8 +175,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={data.locationCode}"
/>
android:text="@={data.locationCode}" />
</LinearLayout>
@ -153,7 +197,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="numberDecimal"
android:text="@={data.instockQty}"/>
android:text="@={data.instockQty}" />
</LinearLayout>
@ -163,6 +207,27 @@
android:layout_height="55dp"
android:layout_margin="20dp"
android:onClick="rawinSubmit"
android:text="提交" />
android:text="入库提交"
android:visibility='@{title.equals("入库")?View.VISIBLE:View.GONE}' />
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_margin="20dp"
android:onClick="rawinSubmit"
android:text="质检提交"
android:visibility='@{title.equals("质检入库")?View.VISIBLE:View.GONE}' />
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_margin="20dp"
android:onClick="rawinSubmit"
android:text="AGV任务发起"
android:visibility='@{title.equals("AGV入库")?View.VISIBLE:View.GONE}' />
</LinearLayout>
</layout>

@ -0,0 +1,155 @@
<?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>
<variable
name="title"
type="String" />
<variable
name="data"
type="com.example.haiwei_mom.data.WmsReturnOrderVo" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".wms.raw.Return2Activity">
<include
layout="@layout/toolbar"
app:title='@{title??"退库入库"}' />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="扫描条码:" />
<EditText
android:id="@+id/material_return_code"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="物料名称:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@{data.materialName}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="入库数量:" />
<TextView
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:text='@{String.valueOf(data.planAmount)??"0"}' />
<TextView
style="@style/text_info"
android:layout_width="60dp"
android:layout_height="match_parent"
android:text="@{data.materialUnit}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="原出库库位:" />
<!-- -->
<EditText
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={data.planLocationCode}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="扫描库位:" />
<!-- -->
<EditText
android:id="@+id/material_return_location"
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={data.returnLocationCode}" />
</LinearLayout>
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_margin="20dp"
android:onClick="returnStoreSearch"
android:text="查询" />
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_margin="20dp"
android:onClick="rawinSubmit"
android:text="提交" />
</LinearLayout>
</layout>

@ -0,0 +1,96 @@
<?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>
<variable
name="title"
type="String" />
<variable
name="subBeen"
type="com.example.haiwei_mom.data.RawOutSubmitBeen" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".wms.raw.SpecialOutActivity">
<include
layout="@layout/toolbar"
app:title='@{title??"特殊情况出库"}' />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp">
<TextView
style="@style/text_title"
android:layout_width="110dp"
android:layout_height="match_parent"
android:text="目标库位:" />
<!-- -->
<EditText
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:text="@={subBeen.locationCode}" />
</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="110dp"
android:layout_height="match_parent"
android:text="扫描物料:" />
<EditText
style="@style/text_san"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@={subBeen.batchCode}" />
</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="110dp"
android:layout_height="match_parent"
android:text="出库数量:" />
<EditText
style="@style/text_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="numberDecimal"
android:text="@={subBeen.outstockQty}" />
</LinearLayout>
<Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_margin="12dp"
android:onClick="speOutSubmit"
android:text="提交" />
</LinearLayout>
</layout>
Loading…
Cancel
Save