Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
30b3e0ac
Commit
30b3e0ac
authored
Jan 11, 2018
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
库存清点
parent
d4c1ac23
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
438 additions
and
144 deletions
+438
-144
app/src/main/java/com/xingdata/zzdpos/model/Cs.java
app/src/main/java/com/xingdata/zzdpos/model/Cs.java
+2
-1
app/src/main/java/com/xingdata/zzdpos/model/CsDetail.java
app/src/main/java/com/xingdata/zzdpos/model/CsDetail.java
+2
-1
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
...ingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
+9
-5
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryDetailAdapter.java
...os/ui/manage/inventory/adpter/InventoryDetailAdapter.java
+50
-45
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/InventoryDetailDialog.java
...pos/ui/manage/inventory/dialog/InventoryDetailDialog.java
+0
-87
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
...os/ui/manage/inventory/fragment/InventoryAddFragment.java
+3
-5
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
...ngdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
+48
-0
app/src/main/res/drawable/yellow_radius_bg.xml
app/src/main/res/drawable/yellow_radius_bg.xml
+12
-0
app/src/main/res/layout/activity_statistics_detail.xml
app/src/main/res/layout/activity_statistics_detail.xml
+6
-0
app/src/main/res/layout/item_inventory.xml
app/src/main/res/layout/item_inventory.xml
+2
-0
app/src/main/res/layout/item_inventory_left.xml
app/src/main/res/layout/item_inventory_left.xml
+63
-0
app/src/main/res/layout/view_inventory_detail.xml
app/src/main/res/layout/view_inventory_detail.xml
+240
-0
app/src/main/res/mipmap-xhdpi/icon_mark_equal.png
app/src/main/res/mipmap-xhdpi/icon_mark_equal.png
+0
-0
app/src/main/res/mipmap-xhdpi/icon_mark_offer_less.png
app/src/main/res/mipmap-xhdpi/icon_mark_offer_less.png
+0
-0
app/src/main/res/mipmap-xhdpi/icon_mark_offer_more.png
app/src/main/res/mipmap-xhdpi/icon_mark_offer_more.png
+0
-0
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/model/Cs.java
View file @
30b3e0ac
...
...
@@ -5,6 +5,7 @@ import com.xingdata.api.print.entity.BaseOrderPrint;
import
com.xingdata.zzdpos.db.DB
;
import
com.xingdata.zzdpos.ui.login.LoginPresenter
;
import
com.xingdata.zzdpos.ui.main.MainPresenter
;
import
com.xingdata.zzdpos.ui.marketing.ms.model.BaseBean
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -14,7 +15,7 @@ import java.util.List;
* 盘库记录类
*/
public
class
Cs
implements
BaseOrderPrint
{
public
class
Cs
implements
BaseOrderPrint
,
com
.
xingdata
.
zzdpos
.
base
.
BaseBean
{
/**
* channelMapId : 0
...
...
app/src/main/java/com/xingdata/zzdpos/model/CsDetail.java
View file @
30b3e0ac
package
com
.
xingdata
.
zzdpos
.
model
;
import
com.xingdata.api.print.entity.BaseGoodPrint
;
import
com.xingdata.zzdpos.base.BaseBean
;
/**
* Created by Administrator on 2017/12/1.
*/
public
class
CsDetail
implements
BaseGoodPrint
{
public
class
CsDetail
implements
BaseGoodPrint
,
BaseBean
{
/**
...
...
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @
30b3e0ac
package
com
.
xingdata
.
zzdpos
.
ui
.
manage
.
inventory
;
import
android.content.Intent
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.blankj.utilcode.util.FragmentUtils
;
import
com.blankj.utilcode.util.KeyboardUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
...
...
@@ -9,13 +11,15 @@ import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
import
com.xingdata.zzdpos.model.Cs
;
import
com.xingdata.zzdpos.model.CsDetail
;
import
com.xingdata.zzdpos.model.Pager
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Sssku
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment
;
import
com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment
;
import
com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment
;
import
com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment
;
import
com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity
;
import
java.util.List
;
...
...
@@ -24,7 +28,6 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
private
InventoryFragment
mInventoryFragment
=
new
InventoryFragment
();
private
ManageDateFragment
mManageDateFragment
=
new
ManageDateFragment
();
private
InventoryAddFragment
mInventoryAddFragment
=
new
InventoryAddFragment
();
// private InventoryDetailDialog mInventoryDetailDialog = new InventoryDetailDialog();
LoadingDialog
mLoadingDialog
=
new
LoadingDialog
();
@Override
...
...
@@ -61,8 +64,9 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public
void
showInventoryDetailDialog
(
Cs
cs
)
{
// mInventoryDetailDialog.setData(cs).show(this);
Intent
intent
=
new
Intent
(
InventoryActivity
.
this
,
StatisticsDetailActivity
.
class
);
intent
.
putExtra
(
Cs
.
class
.
getName
(),
cs
);
ActivityUtils
.
startActivity
(
intent
);
}
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryDetailAdapter.java
View file @
30b3e0ac
//package com.xingdata.zzdpos.ui.manage.inventory.adpter;
//
//
//import android.support.annotation.Nullable;
//import android.view.View;
//import android.view.ViewGroup;
//
//
//import java.util.List;
//
//public class InventoryDetailAdapter extends BaseAdapter<CsDetail, ItemInventoryLeftBinding> {
// private int count = 1;
//
// public InventoryDetailAdapter(@Nullable List<CsDetail> data) {
// super(R.layout.item_inventory_left, data);
//
// }
//
//
// @Override
// protected void convert(ItemInventoryLeftBinding mViewBinding, CsDetail item) {
//
// mViewBinding.tvName.setText(item.getSpuName());
// mViewBinding.tvStockCount.setText(item.getSkuCnt() + "");
// mViewBinding.tvResultCount.setText(item.getCsCnt() + "");
// switch (item.getCsResultFlag()) {
// case 0://相等
// mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_equal);
// break;
// case 1://盘多
// mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_more);
// break;
// case 2://盘少
// mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_less);
// break;
// }
// }
//
// @Override
// protected View getItemView(int layoutResId, ViewGroup parent) {
// return super.getItemView(layoutResId, parent);
// }
//
//
//}
package
com
.
xingdata
.
zzdpos
.
ui
.
manage
.
inventory
.
adpter
;
import
android.support.annotation.Nullable
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseAdapter
;
import
com.xingdata.zzdpos.databinding.ItemInventoryLeftBinding
;
import
com.xingdata.zzdpos.model.CsDetail
;
import
java.util.List
;
public
class
InventoryDetailAdapter
extends
BaseAdapter
<
CsDetail
,
ItemInventoryLeftBinding
>
{
private
int
count
=
1
;
public
InventoryDetailAdapter
(
@Nullable
List
<
CsDetail
>
data
)
{
super
(
R
.
layout
.
item_inventory_left
,
data
);
}
@Override
protected
void
convert
(
ItemInventoryLeftBinding
mViewBinding
,
CsDetail
item
)
{
mViewBinding
.
tvName
.
setText
(
item
.
getSpuName
());
mViewBinding
.
tvStockCount
.
setText
(
item
.
getSkuCnt
()
+
""
);
mViewBinding
.
tvResultCount
.
setText
(
item
.
getCsCnt
()
+
""
);
switch
(
item
.
getCsResultFlag
())
{
case
0
:
//相等
mViewBinding
.
imgResult
.
setImageResource
(
R
.
mipmap
.
icon_mark_equal
);
break
;
case
1
:
//盘多
mViewBinding
.
imgResult
.
setImageResource
(
R
.
mipmap
.
icon_mark_offer_more
);
break
;
case
2
:
//盘少
mViewBinding
.
imgResult
.
setImageResource
(
R
.
mipmap
.
icon_mark_offer_less
);
break
;
}
}
@Override
protected
View
getItemView
(
int
layoutResId
,
ViewGroup
parent
)
{
return
super
.
getItemView
(
layoutResId
,
parent
);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/InventoryDetailDialog.java
deleted
100644 → 0
View file @
d4c1ac23
//package com.xingdata.zzdpos.ui.manage.inventory.dialog;
//
//import android.support.v7.widget.LinearLayoutManager;
//import android.view.View;
//
//import com.blankj.utilcode.util.TimeUtils;
//import com.blankj.utilcode.util.ToastUtils;
//import com.xingdata.api.print.ZX_PrintPOS;
//import com.xingdata.zzdhd.R;
//import com.xingdata.zzdhd.base.BaseDialog;
//import com.xingdata.zzdhd.databinding.DialogInventoryDetailBinding;
//import com.xingdata.zzdhd.model.Cs;
//import com.xingdata.zzdhd.model.CsDetail;
//import com.xingdata.zzdhd.ui.manager.inventory.InventoryPresenter;
//import com.xingdata.zzdhd.ui.manager.inventory.adpter.InventoryDetailAdapter;
//
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * Created by Administrator on 2017/12/4.
// */
//
//public class InventoryDetailDialog extends BaseDialog<InventoryPresenter, DialogInventoryDetailBinding> {
// private InventoryDetailAdapter mInventoryDetailAdapter;
// private List<CsDetail> csDetails = new ArrayList<>();
// private Cs cs;
// private long mExitTime=0;
//
//
// @Override
// public int getLayoutId() {
// return R.layout.dialog_inventory_detail;
// }
//
// @Override
// public void initView() {
// initLeftRecycler();
// if (cs == null) {
// ToastUtils.showShort("未获取到相关数据");
// return;
// }
// setBtnName("取消", "打印清单");
// mViewBinding.setOperName(cs.getOperName());
// mViewBinding.setDate(TimeUtils.millis2String(cs.getCreateTime()));
// mViewBinding.setSumNum(cs.getCount() + "");
// switch (cs.getCsResultFlag()) {
// case 0:
// mViewBinding.setFinallyResult("相符");
// break;
// case 1:
// mViewBinding.setFinallyResult("不相符");
// break;
// }
// csDetails.clear();
// csDetails.addAll(cs.getCsdetailList());
// mInventoryDetailAdapter.notifyDataSetChanged();
// getDialog().setCanceledOnTouchOutside(false);
//
// }
//
// @Override
// protected boolean isShowTitle() {
// return false;
// }
//
// public InventoryDetailDialog setData(Cs csDetailList) {
// this.cs = csDetailList;
// return this;
// }
//
// private void initLeftRecycler() {
// mViewBinding.replenishmentLeftRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// mInventoryDetailAdapter = new InventoryDetailAdapter(csDetails);
// mViewBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
// }
//
// @Override
// public void onConfirmClick(View view) {
// if ((System.currentTimeMillis() - mExitTime) > 2000) {
// ZX_PrintPOS.getInstance(mContext).printInventory(1,cs);
// } else {
//
// }
// super.onConfirmClick(view);
// }
//}
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
View file @
30b3e0ac
...
...
@@ -6,17 +6,15 @@ import android.view.View;
import
android.view.inputmethod.EditorInfo
;
import
android.widget.TextView
;
import
com.blankj.utilcode.util.KeyboardUtils
;
import
com.blankj.utilcode.util.TimeUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.api.print.ZX_PrintPOS
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.FragmentInventoryAddBinding
;
import
com.xingdata.zzdpos.model.Cs
;
import
com.xingdata.zzdpos.model.CsDetail
;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.model.Sssku
;
import
com.xingdata.zzdpos.ui.dialog.PromptDialog
;
import
com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter
;
...
...
@@ -56,7 +54,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
initRecycler
();
mViewBinding
.
setCartCount
(
0
);
mViewBinding
.
icTitle
.
edTitle
.
setHint
(
R
.
string
.
inventory_add_et_hint
);
mViewBinding
.
icTitle
.
edTitle
.
setOnEditorActionListener
(
new
TextView
.
OnEditorActionListener
()
{
@Override
public
boolean
onEditorAction
(
TextView
textView
,
int
i
,
KeyEvent
keyEvent
)
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @
30b3e0ac
...
...
@@ -5,6 +5,7 @@ import android.app.AlertDialog;
import
android.content.DialogInterface
;
import
android.databinding.DataBindingUtil
;
import
android.graphics.Paint
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.util.TimeUtils
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -13,19 +14,23 @@ import com.alibaba.fastjson.JSON;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.google.gson.Gson
;
import
com.xingdata.api.print.ZX_PrintPOS
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseActivity
;
import
com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding
;
import
com.xingdata.zzdpos.databinding.ItemSettleSaledetailBinding
;
import
com.xingdata.zzdpos.databinding.ViewInventoryDetailBinding
;
import
com.xingdata.zzdpos.databinding.ViewOrderDetailBinding
;
import
com.xingdata.zzdpos.databinding.ViewTicketBinding
;
import
com.xingdata.zzdpos.databinding.ViewVipRechargeBinding
;
import
com.xingdata.zzdpos.model.Cs
;
import
com.xingdata.zzdpos.model.Saledetail
;
import
com.xingdata.zzdpos.model.Saleorder
;
import
com.xingdata.zzdpos.model.Ticket
;
import
com.xingdata.zzdpos.model.VipRechargeOrder
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.main.MainActivity
;
import
com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter
;
import
com.xingdata.zzdpos.util.ConvertUtil
;
import
com.xingdata.zzdpos.util.OnClickListener
;
...
...
@@ -57,6 +62,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
Long
data
=
getIntent
().
getLongExtra
(
Saleorder
.
class
.
getName
(),
-
1
);
VipRechargeOrder
vipRechargeOrder
=
(
VipRechargeOrder
)
getIntent
().
getSerializableExtra
(
VipRechargeOrder
.
class
.
getName
());
Ticket
ticket
=
(
Ticket
)
getIntent
().
getSerializableExtra
(
Ticket
.
class
.
getName
());
Cs
cs
=
(
Cs
)
getIntent
().
getSerializableExtra
(
Cs
.
class
.
getName
());
if
(
data
>
0
)
{
mPresenter
.
getOrderDetail
(
String
.
valueOf
(
data
));
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
R
.
string
.
statistics_order_detail_hint
);
...
...
@@ -69,6 +75,10 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
R
.
string
.
statistics_used_ticket_hint
);
getTicketSuss
(
ticket
);
}
if
(
cs
!=
null
)
{
mViewBinding
.
icTitle
.
tvTitle
.
setText
(
R
.
string
.
statistics_inventory_detail_hint
);
getCsSuss
(
cs
);
}
}
}
...
...
@@ -88,6 +98,44 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
}
private
void
getCsSuss
(
Cs
cs
)
{
mViewBinding
.
viewCs
.
getViewStub
().
inflate
();
ViewInventoryDetailBinding
viewInventoryDetailBinding
=
DataBindingUtil
.
bind
(
mViewBinding
.
viewCs
.
getRoot
());
viewInventoryDetailBinding
.
replenishmentLeftRecycler
.
setLayoutManager
(
new
LinearLayoutManager
(
this
));
InventoryDetailAdapter
mInventoryDetailAdapter
=
new
InventoryDetailAdapter
(
cs
.
getCsdetailList
());
viewInventoryDetailBinding
.
replenishmentLeftRecycler
.
setAdapter
(
mInventoryDetailAdapter
);
mViewBinding
.
btnPrint
.
setText
(
"取消"
);
mViewBinding
.
btnReturn
.
setText
(
"打印清单"
);
viewInventoryDetailBinding
.
setOperName
(
cs
.
getOperName
());
viewInventoryDetailBinding
.
setDate
(
com
.
blankj
.
utilcode
.
util
.
TimeUtils
.
millis2String
(
cs
.
getCreateTime
()));
viewInventoryDetailBinding
.
setSumNum
(
cs
.
getCount
()
+
""
);
switch
(
cs
.
getCsResultFlag
())
{
case
0
:
viewInventoryDetailBinding
.
setFinallyResult
(
"相符"
);
break
;
case
1
:
viewInventoryDetailBinding
.
setFinallyResult
(
"不相符"
);
break
;
}
mViewBinding
.
btnReturn
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
ZX_PrintPOS
.
getInstance
(
MainActivity
.
mainActivity
).
print
(
1
,
cs
);
mViewBinding
.
btnReturn
.
setEnabled
(
false
);
mViewBinding
.
btnReturn
.
setText
(
"已打印"
);
}
});
mViewBinding
.
btnPrint
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
finish
();
}
});
}
private
void
getVipRechargeOrderSuss
(
VipRechargeOrder
vipRechargeOrder
)
{
mViewBinding
.
btnReturn
.
setVisibility
(
View
.
GONE
);
mViewBinding
.
viewVipRecharge
.
getViewStub
().
inflate
();
...
...
app/src/main/res/drawable/yellow_radius_bg.xml
0 → 100644
View file @
30b3e0ac
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<corners
android:radius=
"20dp"
/>
<stroke
android:width=
"1dp"
android:color=
"@color/yellow_bg"
/>
<solid
android:color=
"@color/yellow_bg"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_statistics_detail.xml
View file @
30b3e0ac
...
...
@@ -40,6 +40,12 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_ticket"
/>
<ViewStub
android:id=
"@+id/view_cs"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/view_inventory_detail"
/>
</FrameLayout>
<LinearLayout
...
...
app/src/main/res/layout/item_inventory.xml
View file @
30b3e0ac
...
...
@@ -12,6 +12,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_padding_left_right"
android:foreground=
"?attr/selectableItemBackground"
android:background=
"@color/white_caocao"
android:padding=
"@dimen/all_padding_left_right"
>
...
...
@@ -71,6 +72,7 @@
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/singleline_white_gray"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
android:textStyle=
"bold"
...
...
app/src/main/res/layout/item_inventory_left.xml
0 → 100644
View file @
30b3e0ac
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
</data>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingBottom=
"@dimen/all_padding"
android:paddingEnd=
"@dimen/dp_4"
android:paddingStart=
"@dimen/dp_4"
android:paddingTop=
"@dimen/all_padding"
android:weightSum=
"5"
>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:gravity=
"left"
android:paddingStart=
"@dimen/all_padding"
android:text=
""
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_small"
/>
<TextView
android:id=
"@+id/tv_stock_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
""
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_small"
/>
<TextView
android:id=
"@+id/tv_result_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
""
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_small"
/>
<ImageView
android:id=
"@+id/img_result"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:src=
"@mipmap/icon_mark_equal"
/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_inventory_detail.xml
0 → 100644
View file @
30b3e0ac
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<variable
name=
"operName"
type=
"String"
/>
<variable
name=
"date"
type=
"String"
/>
<variable
name=
"sumNum"
type=
"String"
/>
<variable
name=
"finallyResult"
type=
"String"
/>
</data>
<FrameLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<android.support.v7.widget.CardView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_padding_left_right"
android:layout_marginStart=
"@dimen/all_padding_left_right"
android:layout_marginTop=
"@dimen/all_margin"
android:padding=
"@dimen/dp_4"
>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:focusable=
"true"
android:focusableInTouchMode=
"true"
>
<ImageView
android:id=
"@+id/img_user"
android:layout_width=
"50dp"
android:layout_height=
"50dp"
android:layout_margin=
"@dimen/all_margin"
android:src=
"@mipmap/img_boss"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin"
android:orientation=
"vertical"
app:layout_constraintBottom_toBottomOf=
"@id/img_user"
app:layout_constraintStart_toEndOf=
"@id/img_user"
app:layout_constraintTop_toTopOf=
"@id/img_user"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@{operName}"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@{date}"
android:textSize=
"@dimen/all_text_size_small"
/>
</LinearLayout>
<View
android:id=
"@+id/view_line_left"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/view_line_L1"
android:layout_marginTop=
"@dimen/all_margin"
android:background=
"@color/lyt_main_bg"
android:elevation=
"@dimen/view_line_L050"
app:layout_constraintTop_toBottomOf=
"@id/img_user"
/>
<LinearLayout
android:id=
"@+id/ll_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/view_line_height"
android:background=
"@color/lyt_main_bg"
android:elevation=
"@dimen/view_line_L050"
android:orientation=
"horizontal"
android:weightSum=
"5"
app:layout_constraintTop_toBottomOf=
"@id/view_line_left"
>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:gravity=
"left|center_vertical"
android:padding=
"@dimen/dp_4"
android:paddingStart=
"@dimen/all_padding"
android:text=
"商品"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:padding=
"@dimen/dp_4"
android:text=
"系统"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:padding=
"@dimen/dp_4"
android:text=
"盘点"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:padding=
"@dimen/dp_4"
android:text=
"结果"
android:textColor=
"@color/black"
android:textSize=
"@dimen/all_text_size_low"
/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/replenishment_left_recycler"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:minHeight=
"150dp"
app:layout_constraintBottom_toTopOf=
"@id/view_line_left_bottom"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_title"
>
</android.support.v7.widget.RecyclerView>
<LinearLayout
android:id=
"@+id/ll_result"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:orientation=
"horizontal"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_weight=
"1"
app:layout_constraintStart_toEndOf=
"@id/ll_num"
>
<TextView
android:id=
"@+id/tv_result_hint"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin"
android:text=
"盘点结果:"
android:textColor=
"@color/black"
android:textSize=
"@dimen/small_text_size"
app:layout_constraintBottom_toTopOf=
"@id/ll_result"
app:layout_constraintEnd_toEndOf=
"@id/ll_result"
app:layout_constraintStart_toStartOf=
"@id/ll_result"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/yellow_radius_bg"
android:gravity=
"center"
android:paddingBottom=
"@dimen/dp_4"
android:paddingLeft=
"@dimen/all_padding"
android:paddingRight=
"@dimen/all_padding"
android:paddingTop=
"@dimen/dp_4"
android:text=
"@{finallyResult}"
android:textColor=
"@color/white"
android:textSize=
"@dimen/all_text_size_low"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_num"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:orientation=
"horizontal"
app:layout_constraintBottom_toBottomOf=
"@id/ll_result"
app:layout_constraintEnd_toStartOf=
"@id/ll_result"
app:layout_constraintHorizontal_weight=
"1"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/ll_result"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin"
android:text=
"盘点件数:"
android:textColor=
"@color/black"
android:textSize=
"@dimen/small_text_size"
app:layout_constraintBottom_toBottomOf=
"@id/tv_result_hint"
app:layout_constraintEnd_toEndOf=
"@id/ll_num"
app:layout_constraintStart_toStartOf=
"@id/ll_num"
app:layout_constraintTop_toTopOf=
"@id/tv_result_hint"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/dp_4"
android:text=
"@{sumNum}"
android:textColor=
"@color/black"
android:textSize=
"@dimen/big_text_size"
android:textStyle=
"bold"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"件"
android:textColor=
"@color/black"
android:textSize=
"@dimen/small_text_size"
/>
</LinearLayout>
<View
android:id=
"@+id/view_line_left_bottom"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/view_line_L050"
android:background=
"@color/lyt_main_bg"
app:layout_constraintBottom_toTopOf=
"@id/ll_result"
app:layout_constraintTop_toBottomOf=
"@id/replenishment_left_recycler"
/>
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
</layout>
\ No newline at end of file
app/src/main/res/mipmap-xhdpi/icon_mark_equal.png
0 → 100644
View file @
30b3e0ac
2.78 KB
app/src/main/res/mipmap-xhdpi/icon_mark_offer_less.png
0 → 100644
View file @
30b3e0ac
2.81 KB
app/src/main/res/mipmap-xhdpi/icon_mark_offer_more.png
0 → 100644
View file @
30b3e0ac
2.98 KB
app/src/main/res/values/strings.xml
View file @
30b3e0ac
...
...
@@ -660,6 +660,7 @@
<string
name=
"statistics_order_detail_hint"
>
订单详情
</string>
<string
name=
"statistics_vip_recharge_hint"
>
充值记录
</string>
<string
name=
"statistics_used_ticket_hint"
>
充值记录
</string>
<string
name=
"statistics_inventory_detail_hint"
>
盘库结果
</string>
<!--商品详情POS-->
<string
name=
"oder_detail_date"
>
交易时间:
</string>
<string
name=
"oder_detail_no"
>
订单号:
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment