@ -92,6 +92,8 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
RecyclerView rvUi ; RecyclerView rvUi ;
@BindView ( R . id . llflowOrderDetail )
LinearLayout llflowOrderDetail ;
@BindView ( R . id . btn_flowOrderDetail ) @BindView ( R . id . btn_flowOrderDetail )
Button btnFlowOrderDetail ; Button btnFlowOrderDetail ;
@BindView ( R . id . btn_detail ) @BindView ( R . id . btn_detail )
@ -101,7 +103,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
@BindView ( R . id . ll_bottom ) @BindView ( R . id . ll_bottom )
LinearLayout llBottom ; LinearLayout llBottom ;
QBadgeView qTask BadgeView , qDetailBadgeView ;
QBadgeView qFlowOrderDetail BadgeView , qDetailBadgeView ;
private DynamicFormAdapter dynamicFormAdapter ; private DynamicFormAdapter dynamicFormAdapter ;
private List < DynamicFormBean > dynamicFormBeans ; private List < DynamicFormBean > dynamicFormBeans ;
@ -135,17 +137,22 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} else { } else {
scanBarcodeListMap . remove ( removeKey ) ; scanBarcodeListMap . remove ( removeKey ) ;
} }
showDetailBadgeNum ( ) ;
} else if ( eventMsg . getCode ( ) = = 1001 ) {
showOrderDetailBadgeNum ( ) ;
} }
} ) ; } ) ;
RxBus . getInstance ( ) . addSubscription ( this , register ) ; RxBus . getInstance ( ) . addSubscription ( this , register ) ;
qTaskBadgeView = new QBadgeView ( context ) ;
qFlowOrderDetailBadgeView = new QBadgeView ( context ) ;
qFlowOrderDetailBadgeView . bindTarget ( btnFlowOrderDetail ) ;
qDetailBadgeView = new QBadgeView ( context ) ; qDetailBadgeView = new QBadgeView ( context ) ;
qDetailBadgeView . bindTarget ( btnDetail ) ;
initTopBar ( ) ; initTopBar ( ) ;
initListeners ( ) ; initListeners ( ) ;
initRvData ( ) ; initRvData ( ) ;
rvUi . postDelayed ( ( ) - > { rvUi . postDelayed ( ( ) - > {
setNextFocus ( "FlowOrder " ) ;
} , 3 00) ;
setNextFocus ( "AUFNR " ) ;
} , 1 00) ;
} }
@ -168,29 +175,32 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
* 重新刷新ui * 重新刷新ui
* / * /
@SuppressLint ( "SetTextI18n" ) @SuppressLint ( "SetTextI18n" )
private void reInitUI ( boolean isReportWork ) {
private void reInitUI ( boolean isReportWork , String scanRule ) {
runOnUiThread ( ( ) - > { runOnUiThread ( ( ) - > {
SoundUtils . playSound ( this , R . raw . ok ) ; SoundUtils . playSound ( this , R . raw . ok ) ;
if ( KeyboardUtils . isSoftInputVisible ( context ) ) { if ( KeyboardUtils . isSoftInputVisible ( context ) ) {
KeyboardUtils . hideSoftInput ( context ) ; KeyboardUtils . hideSoftInput ( context ) ;
} }
String ScanRuleValue = "" ;
for ( int i = 0 ; i < dynamicFormBeans . size ( ) ; i + + ) { for ( int i = 0 ; i < dynamicFormBeans . size ( ) ; i + + ) {
DynamicFormBean dynamicFormBean = dynamicFormBeans . get ( i ) ; DynamicFormBean dynamicFormBean = dynamicFormBeans . get ( i ) ;
if ( dynamicFormBean . getFieldName ( ) . equals ( "ScanRule" ) ) {
ScanRuleValue = dynamicFormBean . getValue ( ) ;
if ( dynamicFormBean . getFieldName ( ) . equals ( "AUFNR" ) | |
dynamicFormBean . getFieldName ( ) . equals ( "ScanRule" ) | |
dynamicFormBean . getFieldName ( ) . equals ( "VORNR" ) ) {
continue ; continue ;
} else if ( dynamicFormBean . getFieldName ( ) . equals ( "FlowOrder" ) ) { } else if ( dynamicFormBean . getFieldName ( ) . equals ( "FlowOrder" ) ) {
if ( ! TextUtils . isEmpty ( ScanRuleValue ) ) {
if ( ScanRuleValue . equals ( items [ 0 ] ) ) {
if ( ! TextUtils . isEmpty ( scanRule ) & & scanRule . equals ( items [ 0 ] ) ) {
continue ; continue ;
} }
} }
}
dynamicFormBean . setValue ( "" ) ; dynamicFormBean . setValue ( "" ) ;
} }
showDetailBadgeNum ( ) ;
if ( isReportWork ) { if ( isReportWork ) {
if ( scanRule . equals ( items [ 1 ] ) ) {
setNextFocus ( "FlowOrder" ) ;
} else {
setNextFocus ( "PacketBarcode" ) ; setNextFocus ( "PacketBarcode" ) ;
}
} else { } else {
setNextFocus ( "XMNGA" ) ; setNextFocus ( "XMNGA" ) ;
} }
@ -198,6 +208,31 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} ) ; } ) ;
} }
@Override
protected void onResume ( ) {
super . onResume ( ) ;
showDetailBadgeNum ( ) ;
showOrderDetailBadgeNum ( ) ;
}
/ * *
* 显示明细角标
* /
private void showDetailBadgeNum ( ) {
int count = LitePal . count ( FlowReportWorkDetailBean . class ) ;
qDetailBadgeView . setBadgeNumber ( count ) ;
}
/ * *
* 显示流转单明细角标
* /
private void showOrderDetailBadgeNum ( ) {
int orderDetailCount = LitePal . count ( FlowOrderDetailBean . class ) ;
qFlowOrderDetailBadgeView . setBadgeNumber ( orderDetailCount ) ;
}
/ * * / * *
* 初始化动态列表数据 * 初始化动态列表数据
* / * /
@ -250,34 +285,51 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} }
} }
QMUIDialog . CheckableDialogBuilder menuDialogBuilder = new QMUIDialog . CheckableDialogBuilder ( this ) ; QMUIDialog . CheckableDialogBuilder menuDialogBuilder = new QMUIDialog . CheckableDialogBuilder ( this ) ;
menuDialogBuilder . setTitle ( dynamicFormBean . getName ( ) ) ;
menuDialogBuilder . setTitle ( dynamicFormAdapter . getCurrentLanguage ( dynamicFormBean ) ) ;
int finalSelectIndex = selectIndex ; int finalSelectIndex = selectIndex ;
menuDialogBuilder . addItems ( items , new DialogInterface . OnClickListener ( ) { menuDialogBuilder . addItems ( items , new DialogInterface . OnClickListener ( ) {
@Override @Override
public void onClick ( DialogInterface dialog , int which ) { public void onClick ( DialogInterface dialog , int which ) {
if ( finalSelectIndex ! = - 1 & & which ! = finalSelectIndex ) { if ( finalSelectIndex ! = - 1 & & which ! = finalSelectIndex ) {
dialog . dismiss ( ) ; dialog . dismiss ( ) ;
int count = LitePal . count ( FlowOrderDetailBean . class ) ;
int detailCount = LitePal . count ( FlowReportWorkDetailBean . class ) ;
if ( rvUiHaveData ( ) | | count > 0 | | detailCount > 0 ) {
new QMUIDialog . MessageDialogBuilder ( context ) . setTitle ( getResources ( ) . getString ( R . string . tips_title ) ) new QMUIDialog . MessageDialogBuilder ( context ) . setTitle ( getResources ( ) . getString ( R . string . tips_title ) )
. setCancelable ( false ) . setCancelable ( false )
. setMessage ( "是否切换扫描规则？（切换规则将清空之前所有扫描明细数据）" )
. setMessage ( "是否切换扫描规则？（切换将清空界面和所有扫描明细内容 ）" )
. addAction ( getResources ( ) . getString ( R . string . cancel_info ) , ( dialog1 , index ) - > dialog1 . dismiss ( ) ) . addAction ( getResources ( ) . getString ( R . string . cancel_info ) , ( dialog1 , index ) - > dialog1 . dismiss ( ) )
. addAction ( getResources ( ) . getString ( R . string . confirm_info ) , ( dialog1 , index ) - > { . addAction ( getResources ( ) . getString ( R . string . confirm_info ) , ( dialog1 , index ) - > {
dialog1 . dismiss ( ) ; dialog1 . dismiss ( ) ;
scanBarcodeListMap = new HashMap < > ( ) ;
initRvData ( ) ; initRvData ( ) ;
scanBarcodeListMap = new HashMap < > ( ) ;
LitePal . deleteAll ( FlowOrderDetailBean . class ) ; LitePal . deleteAll ( FlowOrderDetailBean . class ) ;
LitePal . deleteAll ( FlowReportWorkDetailBean . class ) ; LitePal . deleteAll ( FlowReportWorkDetailBean . class ) ;
showDetailBadgeNum ( ) ;
showOrderDetailBadgeNum ( ) ;
String item = items [ which ] ; String item = items [ which ] ;
dynamicFormBean . setValue ( item ) ; dynamicFormBean . setValue ( item ) ;
dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ; dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ; dynamicFormAdapter . notifyDataSetChanged ( ) ;
if ( item . equals ( items [ 1 ] ) ) { if ( item . equals ( items [ 1 ] ) ) {
btnF lowOrderDetail. setVisibility ( View . VISIBLE ) ;
llf lowOrderDetail . setVisibility ( View . VISIBLE ) ;
} else { } else {
btnF lowOrderDetail. setVisibility ( View . GONE ) ;
llf lowOrderDetail . setVisibility ( View . GONE ) ;
} }
} ) } )
. create ( R . style . QMUI_Dialog ) . show ( ) ; . create ( R . style . QMUI_Dialog ) . show ( ) ;
} else {
String item = items [ which ] ;
dynamicFormBean . setValue ( item ) ;
dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ;
if ( item . equals ( items [ 1 ] ) ) {
llflowOrderDetail . setVisibility ( View . VISIBLE ) ;
} else {
llflowOrderDetail . setVisibility ( View . GONE ) ;
}
}
} else { } else {
dialog . dismiss ( ) ; dialog . dismiss ( ) ;
@ -286,9 +338,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ; dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ; dynamicFormAdapter . notifyDataSetChanged ( ) ;
if ( item . equals ( items [ 1 ] ) ) { if ( item . equals ( items [ 1 ] ) ) {
btnF lowOrderDetail. setVisibility ( View . VISIBLE ) ;
llf lowOrderDetail. setVisibility ( View . VISIBLE ) ;
} else { } else {
btnF lowOrderDetail. setVisibility ( View . GONE ) ;
llf lowOrderDetail. setVisibility ( View . GONE ) ;
} }
} }
} }
@ -299,31 +351,68 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} ) ; } ) ;
dynamicFormAdapter . setOnFormItemViewActionListener ( ( dynamicFormBean , position ) - > { dynamicFormAdapter . setOnFormItemViewActionListener ( ( dynamicFormBean , position ) - > {
String value = dynamicFormBean . getValue ( ) ; String value = dynamicFormBean . getValue ( ) ;
switch ( dynamicFormBean . getFieldName ( ) ) { switch ( dynamicFormBean . getFieldName ( ) ) {
case "FlowOrder " :
case "AUFNR " :
DynamicFormBean scanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ; DynamicFormBean scanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ;
String value1 = scanRuleItem . getValue ( ) ; String value1 = scanRuleItem . getValue ( ) ;
if ( TextUtils . isEmpty ( value1 ) ) { if ( TextUtils . isEmpty ( value1 ) ) {
dynamicFormAdapter . setFocusAndClearValueById ( dynamicFormBean . getId ( ) ) ;
showError ( getString ( R . string . Select_a_scan_rule_first ) ) ;
return ;
}
if ( TextUtils . isEmpty ( value ) ) {
showError ( getString ( R . string . The_work_order_number_cannot_be_empty ) ) ;
return ;
}
dynamicFormBean . setCanChange ( false ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ;
setNextFocus ( "VORNR" ) ;
break ;
case "VORNR" :
if ( TextUtils . isEmpty ( value ) ) {
showError ( getString ( R . string . The_process_number_cannot_be_empty ) ) ;
return ;
}
dynamicFormBean . setCanChange ( false ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ;
setNextFocus ( "FlowOrder" ) ; setNextFocus ( "FlowOrder" ) ;
SoundUtils . playSound ( context , R . raw . warning ) ;
ToastUtil . showShortToast ( FlowReportWorkActivity . this , "请先选择扫描规则" ) ;
break ;
case "FlowOrder" :
DynamicFormBean AUFNRItem = dynamicFormAdapter . getItemByFieldName ( "AUFNR" ) ;
if ( TextUtils . isEmpty ( AUFNRItem . getValue ( ) ) ) {
showError ( getString ( R . string . The_work_order_number_cannot_be_empty ) ) ;
return ; return ;
} }
if ( TextUtils . isEmpty ( value ) ) { if ( TextUtils . isEmpty ( value ) ) {
showError ( getString ( R . string . The_flow_order_number_cannot_be_empty ) ) ;
return ;
}
if ( value . startsWith ( "T" ) & & value . length ( ) > 9 ) {
int t = value . indexOf ( "T" ) ;
String substring = value . substring ( t + 1 , 9 ) ;
String aufnrItemValue = AUFNRItem . getValue ( ) ;
if ( ! substring . equals ( aufnrItemValue ) ) {
ToastUtils . showLong ( R . string . order_number_in_the_flow_order_is_inconsistent ) ;
dynamicFormAdapter . setFocusById ( dynamicFormBean . getId ( ) ) ;
return ;
}
}
scanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ;
if ( TextUtils . isEmpty ( scanRuleItem . getValue ( ) ) ) {
setNextFocus ( dynamicFormBean . getFieldName ( ) ) ; setNextFocus ( dynamicFormBean . getFieldName ( ) ) ;
showError ( getString ( R . string . The_flow_order_number_cannot_be_empty ) ) ; ;
showError ( getString ( R . string . Select_a_scan_rule_first ) ) ;
return ; return ;
} }
if ( value1 . equals ( items [ 1 ] ) ) {
if ( scanRuleItem . getValue ( ) . equals ( items [ 1 ] ) ) {
LitePal LitePal
. where ( "flowOrder = ?" , value ) . where ( "flowOrder = ?" , value )
. findAsync ( FlowOrderDetailBean . class ) . findAsync ( FlowOrderDetailBean . class )
. listen ( reportWorkDetailBean - > { . listen ( reportWorkDetailBean - > {
if ( reportWorkDetailBean . size ( ) > 0 ) { if ( reportWorkDetailBean . size ( ) > 0 ) {
SoundUtils . playSound ( context , R . raw . warning ) ;
dynamicFormAdapter . setFocusById ( dynamicFormBean . getId ( ) ) ;
ToastUtil . showShortToast ( FlowReportWorkActivity . this , getString ( R . string . The_current_flow_order_number_has_been_scanned ) ) ;
dynamicFormAdapter . setFocusAndClearValueById ( dynamicFormBean . getId ( ) ) ;
showError ( getString ( R . string . The_current_flow_order_number_has_been_scanned ) ) ;
return ; return ;
} }
String gid = System . currentTimeMillis ( ) + "" ; String gid = System . currentTimeMillis ( ) + "" ;
@ -331,19 +420,20 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
bean . setGid ( gid ) ; bean . setGid ( gid ) ;
bean . setFlowOrder ( value ) ; bean . setFlowOrder ( value ) ;
bean . save ( ) ; bean . save ( ) ;
showOrderDetailBadgeNum ( ) ;
SoundUtils . playSound ( this , R . raw . ok ) ; SoundUtils . playSound ( this , R . raw . ok ) ;
dynamicFormAdapter . setFocusAndClearValueById ( dynamicFormBean . getId ( ) ) ; dynamicFormAdapter . setFocusAndClearValueById ( dynamicFormBean . getId ( ) ) ;
} ) ; } ) ;
} else { } else {
dynamicFormBean . setCanChange ( false ) ; dynamicFormBean . setCanChange ( false ) ;
dynamicFormAdapter . setItemByFieldName ( dynamicFormBean . getFieldName ( ) , dynamicFormBean ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ;
setNextFocus ( "PacketBarcode" ) ; setNextFocus ( "PacketBarcode" ) ;
} }
break ; break ;
case "PacketBarcode" : case "PacketBarcode" :
if ( TextUtils . isEmpty ( value ) ) { if ( TextUtils . isEmpty ( value ) ) {
setNextFocus ( dynamicFormBean . getFieldName ( ) ) ;
showError ( getString ( R . string . The_packet_barcode_cannot_be_empty ) ) ; ;
setNextFocus ( "PacketBarcode" ) ;
showError ( getString ( R . string . The_packet_barcode_cannot_be_empty ) ) ;
return ; return ;
} }
scanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ; scanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ;
@ -373,8 +463,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} }
//判断条码是否已经被扫描
//判断条码是否已经被扫描
if ( isInBarcodeList ( scanBarcodeListMap , value ) ) { if ( isInBarcodeList ( scanBarcodeListMap , value ) ) {
SoundUtils . playSound ( context , R . raw . warning ) ;
ToastUtil . showShortToastCenter ( context , getString ( R . string . Do_not_scan_the_barcode_again ) ) ;
showError ( getString ( R . string . Do_not_scan_the_barcode_again ) ) ;
dynamicFormAdapter . setFocusById ( dynamicFormBean . getId ( ) ) ; dynamicFormAdapter . setFocusById ( dynamicFormBean . getId ( ) ) ;
return ; return ;
} }
@ -398,13 +487,20 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
private void addDetail ( boolean isReportWork ) { private void addDetail ( boolean isReportWork ) {
DynamicFormBean ScanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ; //扫描规则
DynamicFormBean ScanRuleItem = dynamicFormAdapter . getItemByFieldName ( "ScanRule" ) ; //扫描规则
String gid = System . currentTimeMillis ( ) + "" ; String gid = System . currentTimeMillis ( ) + "" ;
DynamicFormBean aufnrItem = dynamicFormAdapter . getItemByFieldName ( "AUFNR" ) ; //工单
DynamicFormBean vornrItem = dynamicFormAdapter . getItemByFieldName ( "VORNR" ) ; //工序
DynamicFormBean PacketBarcodeItem = dynamicFormAdapter . getItemByFieldName ( "PacketBarcode" ) ; //包条码
DynamicFormBean PacketBarcodeItem = dynamicFormAdapter . getItemByFieldName ( "PacketBarcode" ) ; //包条码
DynamicFormBean flowOrderItem = dynamicFormAdapter . getItemByFieldName ( "FlowOrder" ) ; //流转单
DynamicFormBean flowOrderItem = dynamicFormAdapter . getItemByFieldName ( "FlowOrder" ) ; //流转单
DynamicFormBean gmngaItem = dynamicFormAdapter . getItemByFieldName ( "GMNGA" ) ; //报工数量
DynamicFormBean gmngaItem = dynamicFormAdapter . getItemByFieldName ( "GMNGA" ) ; //报工数量
DynamicFormBean xmngaItem = dynamicFormAdapter . getItemByFieldName ( "XMNGA" ) ; //报废数量
DynamicFormBean xmngaItem = dynamicFormAdapter . getItemByFieldName ( "XMNGA" ) ; //报废数量
DynamicFormBean grundItem = dynamicFormAdapter . getItemByFieldName ( "GRUND" ) ; //原因代码
DynamicFormBean grundItem = dynamicFormAdapter . getItemByFieldName ( "GRUND" ) ; //原因代码
DynamicFormBean ZXTPCItem = dynamicFormAdapter . getItemByFieldName ( "ZXTPC" ) ; //箱号
String barcode = PacketBarcodeItem . getValue ( ) ; String barcode = PacketBarcodeItem . getValue ( ) ;
if ( TextUtils . isEmpty ( aufnrItem . getValue ( ) ) ) {
setNextFocus ( "AUFNR" ) ;
showError ( getString ( R . string . The_work_order_number_cannot_be_empty ) ) ;
return ;
}
if ( isReportWork ) { if ( isReportWork ) {
if ( TextUtils . isEmpty ( gmngaItem . getValue ( ) ) ) { if ( TextUtils . isEmpty ( gmngaItem . getValue ( ) ) ) {
showError ( getString ( R . string . The_number_of_reports_cannot_be_empty ) ) ; showError ( getString ( R . string . The_number_of_reports_cannot_be_empty ) ) ;
@ -468,6 +564,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
//否则是一个流转单多个箱码
//否则是一个流转单多个箱码
FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean ( ) ; FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean ( ) ;
bean . setGid ( gid ) ; bean . setGid ( gid ) ;
bean . setAufnr ( aufnrItem . getValue ( ) ) ;
bean . setVornr ( vornrItem . getValue ( ) ) ;
bean . setZxtpc ( ZXTPCItem . getValue ( ) ) ;
bean . setFlowOrders ( flowOrderItem . getValue ( ) ) ; bean . setFlowOrders ( flowOrderItem . getValue ( ) ) ;
bean . setFlowOrders ( flowOrderSb . substring ( 0 , flowOrderSb . length ( ) - 1 ) ) ; bean . setFlowOrders ( flowOrderSb . substring ( 0 , flowOrderSb . length ( ) - 1 ) ) ;
if ( isReportWork ) { if ( isReportWork ) {
@ -487,12 +586,15 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
boolean save = bean . save ( ) ; boolean save = bean . save ( ) ;
if ( save ) { if ( save ) {
LitePal . deleteAll ( FlowOrderDetailBean . class ) ; LitePal . deleteAll ( FlowOrderDetailBean . class ) ;
showOrderDetailBadgeNum ( ) ;
//将当前条码存入对应的条码扫描明细中
//将当前条码存入对应的条码扫描明细中
List < String > keyBarcodes = new ArrayList < > ( ) ; List < String > keyBarcodes = new ArrayList < > ( ) ;
keyBarcodes . add ( barcode ) ; keyBarcodes . add ( barcode ) ;
scanBarcodeListMap . put ( gid , keyBarcodes ) ; scanBarcodeListMap . put ( gid , keyBarcodes ) ;
reInitUI ( isReportWork ) ;
reInitUI ( isReportWork , ScanRuleItem . getValue ( ) ) ;
} else {
showError ( getString ( R . string . Failed_to_join_details ) ) ;
} }
} ) ; } ) ;
@ -506,6 +608,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
//否则是一个流转单多个箱码
//否则是一个流转单多个箱码
FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean ( ) ; FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean ( ) ;
bean . setGid ( gid ) ; bean . setGid ( gid ) ;
bean . setAufnr ( aufnrItem . getValue ( ) ) ;
bean . setVornr ( vornrItem . getValue ( ) ) ;
bean . setZxtpc ( ZXTPCItem . getValue ( ) ) ;
bean . setFlowOrders ( flowOrderItem . getValue ( ) ) ; bean . setFlowOrders ( flowOrderItem . getValue ( ) ) ;
if ( isReportWork ) { if ( isReportWork ) {
bean . setPacketBarcode ( barcode ) ; bean . setPacketBarcode ( barcode ) ;
@ -528,7 +633,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
keyBarcodes . add ( barcode ) ; keyBarcodes . add ( barcode ) ;
scanBarcodeListMap . put ( gid , keyBarcodes ) ; scanBarcodeListMap . put ( gid , keyBarcodes ) ;
reInitUI ( isReportWork ) ;
reInitUI ( isReportWork , ScanRuleItem . getValue ( ) ) ;
} else {
showError ( getString ( R . string . Failed_to_join_details ) ) ;
} }
} }
@ -554,6 +661,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} }
} }
dynamicFormAdapter . setList ( dynamicFormBeans ) ; dynamicFormAdapter . setList ( dynamicFormBeans ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ;
new Handler ( ) . postDelayed ( new Runnable ( ) { new Handler ( ) . postDelayed ( new Runnable ( ) {
@Override @Override
public void run ( ) { public void run ( ) {
@ -580,7 +688,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} }
} }
dynamicFormAdapter . notifyDataSetChanged ( ) ; dynamicFormAdapter . notifyDataSetChanged ( ) ;
} , 2 00) ;
} , 1 00) ;
} }
@ -667,17 +775,19 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
if ( baseResponseBean . getCode ( ) = = 200 ) { if ( baseResponseBean . getCode ( ) = = 200 ) {
new QMUIDialog . MessageDialogBuilder ( context ) . setTitle ( getResources ( ) . getString ( R . string . tips_title ) ) new QMUIDialog . MessageDialogBuilder ( context ) . setTitle ( getResources ( ) . getString ( R . string . tips_title ) )
. setCancelable ( false ) . setCancelable ( false )
. setMessage ( getString ( R . string . Data_saved_successfully ) )
. setMessage ( baseResponseBean . getData ( ) )
. addAction ( getResources ( ) . getString ( R . string . cancel_info ) , ( dialog , index ) - > dialog . dismiss ( ) ) . addAction ( getResources ( ) . getString ( R . string . cancel_info ) , ( dialog , index ) - > dialog . dismiss ( ) )
. addAction ( getResources ( ) . getString ( R . string . confirm_info ) , ( dialog , index ) - > { . addAction ( getResources ( ) . getString ( R . string . confirm_info ) , ( dialog , index ) - > {
dialog . dismiss ( ) ; dialog . dismiss ( ) ;
} ) } )
. create ( R . style . QMUI_Dialog ) . show ( ) ; . create ( R . style . QMUI_Dialog ) . show ( ) ;
initRvData ( ) ; initRvData ( ) ;
btnFlowOrderDetail . setVisibility ( View . GONE ) ;
clearAllData ( ) ; clearAllData ( ) ;
llflowOrderDetail . setVisibility ( View . GONE ) ;
showDetailBadgeNum ( ) ;
showOrderDetailBadgeNum ( ) ;
scanBarcodeListMap = new HashMap < > ( ) ; scanBarcodeListMap = new HashMap < > ( ) ;
setNextFocus ( "FlowOrder" ) ;
setNextFocus ( "AUFNR " ) ;
} else { } else {
showError ( baseResponseBean . getMsg ( ) ) ; showError ( baseResponseBean . getMsg ( ) ) ;
} }
@ -713,6 +823,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
} }
dynamicFormAdapter . setItemByFieldName ( "GRUND" , GRUNDItem ) ; dynamicFormAdapter . setItemByFieldName ( "GRUND" , GRUNDItem ) ;
dynamicFormAdapter . notifyDataSetChanged ( ) ; dynamicFormAdapter . notifyDataSetChanged ( ) ;
setNextFocus ( "XMNGA" ) ;
} }
} else if ( requestCode = = REQUEST_CODE_SCAN_FOR_GROUP ) { } else if ( requestCode = = REQUEST_CODE_SCAN_FOR_GROUP ) {
@ -785,6 +896,21 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
return super . onKeyDown ( keyCode , event ) ; return super . onKeyDown ( keyCode , event ) ;
} }
private boolean rvUiHaveData ( ) {
boolean isExist = false ;
for ( DynamicFormBean bean : dynamicFormBeans ) {
if ( bean . getFieldName ( ) . equals ( "ScanRule" ) ) {
continue ;
}
if ( ! TextUtils . isEmpty ( bean . getValue ( ) ) ) {
isExist = true ;
}
}
return isExist ;
}
private void finishActivity ( ) { private void finishActivity ( ) {
int count = LitePal . count ( ReportWorkDetailBean . class ) ; int count = LitePal . count ( ReportWorkDetailBean . class ) ;
int flowOrderCount = LitePal . count ( FlowOrderDetailBean . class ) ; int flowOrderCount = LitePal . count ( FlowOrderDetailBean . class ) ;
@ -799,7 +925,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
LitePal . deleteAllAsync ( FlowOrderDetailBean . class ) . listen ( i1 - > finish ( ) ) ; LitePal . deleteAllAsync ( FlowOrderDetailBean . class ) . listen ( i1 - > finish ( ) ) ;
} ) ; } ) ;
} ) } )
. create ( R . style . CUSTOM_ QMUI) ;
. create ( R . style . QMUI_Dialog ) ;
qmuiDialog . show ( ) ; qmuiDialog . show ( ) ;
return ; return ;
} }
ml
2 years ago