增加打卡记录页面，机台操作历史页面

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="RawUseOfParameterizedType" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

app/src/main/java/com/uas/hystorage/activity/IndexActivity.java

@@ -111,6 +111,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private String ifneedmj;
     private EditText ct_indexgangwei;
     private String ifinput;
+    private String de_location;
 
     @Override
     protected void onDestroy() {
@@ -456,11 +457,12 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
             SharedPreUtil.saveString(this,Constants.FLAG.GANG_WEI_SOURCE_CODE,sc_code);
             String sc_name = dataObject.getString("SC_NAME");
-            if (sc_name.length() == 0 || sc_name == "") {
-                sc_name = "-";
+            de_location = dataObject.getString("DE_LOCATION");
+            if (de_location.length() == 0 || de_location == "") {
+                de_location = "-";
             }
-            sc_name = "(" + sc_name + ")";
-            mScName.setText(sc_name);
+            de_location = "(" + de_location + ")";
+            mScName.setText(de_location);
             SharedPreUtil.saveString(this,Constants.FLAG.GANG_WEI_SOURCE_NAME,sc_name);
             sl_namelist = new ArrayList<>();
             JSONArray dataArrayone = FastjsonUtil.getJSONArray(dataObject,"TAG");
@@ -838,7 +840,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         sc_code=SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_CODE,"");
         sc_name=SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_NAME,"");
         ct_indexgangwei.setText(sc_code);
-        mScName.setText(sc_name);
+        mScName.setText(de_location);
 //        if (!StringUtil.isEmpty(sc_code)) {
 //            handleCode(sc_code, true);
 //        }

app/src/main/java/com/uas/hystorage/adapter/HistoryAdapter.java

@@ -0,0 +1,40 @@
+package com.uas.hystorage.adapter;
+
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.hystorage.R;
+import com.uas.hystorage.bean.HistoryListBean;
+
+public class HistoryAdapter extends BaseQuickAdapter<HistoryListBean, BaseViewHolder> {
+    public HistoryAdapter() {
+        super(R.layout.item_history_detail, null);
+    }
+    @Override
+    protected void convert(BaseViewHolder helper, HistoryListBean item) {
+        TextView tv_pcd_type=helper.getView(R.id.tv_pcd_type);
+        TextView tv_pcd_qty=helper.getView(R.id.tv_pcd_qty);
+        TextView tv_pcd_cardcode=helper.getView(R.id.tv_pcd_cardcode);
+        TextView tv_pcd_emname=helper.getView(R.id.tv_pcd_emname);
+        TextView tv_pcd_sccode_name=helper.getView(R.id.tv_pcd_sccode_name);
+        TextView tv_pcd_date=helper.getView(R.id.tv_pcd_date);
+        TextView tv_pcd_indate=helper.getView(R.id.tv_pcd_indate);
+
+        if (item.getPCD_TYPE().equals("签到")){
+            tv_pcd_type.setTextColor(mContext.getResources().getColor(R.color.blue));
+        }else {
+            tv_pcd_type.setTextColor(mContext.getResources().getColor(R.color.red));
+        }
+        tv_pcd_type.setText(item.getPCD_TYPE());
+        tv_pcd_qty.setText(item.getPCD_QTY());
+        tv_pcd_cardcode.setText(item.getPCD_CARDCODE());
+        tv_pcd_emname.setText(item.getPCD_EMNAME());
+        tv_pcd_sccode_name.setText(item.getPCD_SCCODE()+"--"+item.getPCD_SCNAME());
+        tv_pcd_date.setText(item.getPCD_DATE());
+        tv_pcd_indate.setText(item.getPCD_INDATE());
+
+
+
+    }
+}

app/src/main/java/com/uas/hystorage/adapter/StartAdapter.java

@@ -0,0 +1,38 @@
+package com.uas.hystorage.adapter;
+
+import android.annotation.SuppressLint;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.hystorage.R;
+import com.uas.hystorage.bean.StartsListBean;
+
+public class StartAdapter extends BaseQuickAdapter<StartsListBean, BaseViewHolder> {
+    public StartAdapter() {
+        super(R.layout.item_starts_detail, null);
+    }
+    @SuppressLint("SetTextI18n")
+    @Override
+    protected void convert(BaseViewHolder helper, StartsListBean item) {
+        TextView tv_dl_opr=helper.getView(R.id.tv_dl_opr);
+        TextView tv_dl_devcode=helper.getView(R.id.tv_dl_devcode);
+        TextView tv_dl_indate=helper.getView(R.id.tv_dl_indate);
+        TextView tv_dl_inman=helper.getView(R.id.tv_dl_inman);
+
+
+        if (item.getDL_OPR().equals("启动")){
+            tv_dl_opr.setTextColor(mContext.getResources().getColor(R.color.blue));
+        }else {
+            tv_dl_opr.setTextColor(mContext.getResources().getColor(R.color.red));
+        }
+        tv_dl_opr.setText(item.getDL_OPR());
+
+        tv_dl_devcode.setText(item.getDL_DEVCODE()+"-"+item.getDL_DEVNAME()+"-"+item.getDL_DELOCATION());
+        tv_dl_indate.setText(item.getDL_INDATE());
+        tv_dl_inman.setText(item.getDL_INMAN());
+
+
+
+    }
+}

app/src/main/java/com/uas/hystorage/bean/Fuzzysearbean.java

@@ -0,0 +1,29 @@
+package com.uas.hystorage.bean;
+
+/**
+ * Created by cjh-sail on 2024-03-27
+ */
+public class Fuzzysearbean {
+    private String DE_CODE;
+    private String DE_NAME;
+
+    public Fuzzysearbean(String DE_CODE) {
+        this.DE_CODE = DE_CODE;
+    }
+
+    public String getDE_CODE() {
+        return DE_CODE;
+    }
+
+    public void setDE_CODE(String DE_CODE) {
+        this.DE_CODE = DE_CODE;
+    }
+
+    public String getDE_NAME() {
+        return DE_NAME;
+    }
+
+    public void setDE_NAME(String DE_NAME) {
+        this.DE_NAME = DE_NAME;
+    }
+}

app/src/main/java/com/uas/hystorage/bean/GrouponlineBean.java

@@ -11,7 +11,9 @@ public class GrouponlineBean {
         this.LOTNO = LOTNO;
         this.QTY = QTY;
     }
-
+    public GrouponlineBean(String LOTNO) {
+        this.LOTNO = LOTNO;
+    }
     public String getLOTNO() {
         return LOTNO;
     }

app/src/main/java/com/uas/hystorage/bean/HistoryListBean.java

@@ -0,0 +1,90 @@
+package com.uas.hystorage.bean;
+
+import java.io.Serializable;
+
+public class HistoryListBean implements Serializable {
+
+    private String PCD_TYPE;
+    private String PCD_CARDCODE;
+    private String PCD_EMNAME;
+    private String PCD_QTY;
+    private String PCD_SCCODE;
+    private String PCD_SCNAME;
+    private String PCD_DATE;
+    private String PCD_INDATE;
+    public HistoryListBean(){}
+    public HistoryListBean(String PCD_TYPE, String PCD_CARDCODE, String PCD_EMNAME, String PCD_QTY, String PCD_SCCODE, String PCD_SCNAME, String PCD_DATE, String PCD_INDATE) {
+        this.PCD_TYPE = PCD_TYPE;
+        this.PCD_CARDCODE = PCD_CARDCODE;
+        this.PCD_EMNAME = PCD_EMNAME;
+        this.PCD_QTY = PCD_QTY;
+        this.PCD_SCCODE = PCD_SCCODE;
+        this.PCD_SCNAME = PCD_SCNAME;
+        this.PCD_DATE = PCD_DATE;
+        this.PCD_INDATE = PCD_INDATE;
+    }
+
+    public String getPCD_TYPE() {
+        return PCD_TYPE;
+    }
+
+    public void setPCD_TYPE(String PCD_TYPE) {
+        this.PCD_TYPE = PCD_TYPE;
+    }
+
+    public String getPCD_CARDCODE() {
+        return PCD_CARDCODE;
+    }
+
+    public void setPCD_CARDCODE(String PCD_CARDCODE) {
+        this.PCD_CARDCODE = PCD_CARDCODE;
+    }
+
+    public String getPCD_EMNAME() {
+        return PCD_EMNAME;
+    }
+
+    public void setPCD_EMNAME(String PCD_EMNAME) {
+        this.PCD_EMNAME = PCD_EMNAME;
+    }
+
+    public String getPCD_QTY() {
+        return PCD_QTY;
+    }
+
+    public void setPCD_QTY(String PCD_QTY) {
+        this.PCD_QTY = PCD_QTY;
+    }
+
+    public String getPCD_SCCODE() {
+        return PCD_SCCODE;
+    }
+
+    public void setPCD_SCCODE(String PCD_SCCODE) {
+        this.PCD_SCCODE = PCD_SCCODE;
+    }
+
+    public String getPCD_SCNAME() {
+        return PCD_SCNAME;
+    }
+
+    public void setPCD_SCNAME(String PCD_SCNAME) {
+        this.PCD_SCNAME = PCD_SCNAME;
+    }
+
+    public String getPCD_DATE() {
+        return PCD_DATE;
+    }
+
+    public void setPCD_DATE(String PCD_DATE) {
+        this.PCD_DATE = PCD_DATE;
+    }
+
+    public String getPCD_INDATE() {
+        return PCD_INDATE;
+    }
+
+    public void setPCD_INDATE(String PCD_INDATE) {
+        this.PCD_INDATE = PCD_INDATE;
+    }
+}

app/src/main/java/com/uas/hystorage/bean/StartsListBean.java

@@ -0,0 +1,62 @@
+package com.uas.hystorage.bean;
+
+import java.io.Serializable;
+
+public class StartsListBean implements Serializable {
+
+    private String DL_OPR;
+    private String DL_DEVCODE;
+    private String DL_DEVNAME;
+    private String DL_DELOCATION;
+    private String DL_INDATE;
+    private String DL_INMAN;
+    public StartsListBean(){}
+
+    public String getDL_OPR() {
+        return DL_OPR;
+    }
+
+    public void setDL_OPR(String DL_OPR) {
+        this.DL_OPR = DL_OPR;
+    }
+
+    public String getDL_DEVCODE() {
+        return DL_DEVCODE;
+    }
+
+    public void setDL_DEVCODE(String DL_DEVCODE) {
+        this.DL_DEVCODE = DL_DEVCODE;
+    }
+
+    public String getDL_DEVNAME() {
+        return DL_DEVNAME;
+    }
+
+    public void setDL_DEVNAME(String DL_DEVNAME) {
+        this.DL_DEVNAME = DL_DEVNAME;
+    }
+
+    public String getDL_DELOCATION() {
+        return DL_DELOCATION;
+    }
+
+    public void setDL_DELOCATION(String DL_DELOCATION) {
+        this.DL_DELOCATION = DL_DELOCATION;
+    }
+
+    public String getDL_INDATE() {
+        return DL_INDATE;
+    }
+
+    public void setDL_INDATE(String DL_INDATE) {
+        this.DL_INDATE = DL_INDATE;
+    }
+
+    public String getDL_INMAN() {
+        return DL_INMAN;
+    }
+
+    public void setDL_INMAN(String DL_INMAN) {
+        this.DL_INMAN = DL_INMAN;
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/GdWorkSwitchFragment.java

@@ -12,6 +12,7 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -94,6 +95,10 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     private ClearableEditText ce_moju;
     private TextView tv_mju;
     private LinearLayout line_mju;
+    private boolean chentrueorflase;
+    private TextView text_moju;
+    private LinearLayout line_moju;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_gd_work_switch;
@@ -124,7 +129,8 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         mOlNextEt = root.findViewById(R.id.ol_next_et);
         ce_moju = root.findViewById(R.id.ce_moju);
         tv_mju = root.findViewById(R.id.tv_mju);
-
+        text_moju = root.findViewById(R.id.text_moju);
+        line_moju = root.findViewById(R.id.line_moju);
         root.findViewById(R.id.scan_code_im).setOnClickListener(this);
         root.findViewById(R.id.ol_next_im).setOnClickListener(this);
         tv_gangwei=root.findViewById(R.id.tv_gangwei);
@@ -188,14 +194,62 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                 }
             }
         });
+
+
+
+        //----------模具模糊搜索------------------------
+        ce_moju.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = ce_moju.getText().toString().trim();
+                    fuzzySearchMould(data);
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        ce_moju.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() >= 3) {
+                    String mSearchStr = s.toString().trim();
+                    LogUtil.i("mSearchStr",mSearchStr);
+                    fuzzySearchMould(mSearchStr);
+                } else {
+                    fuzzyBeans.clear();
+                    setfuzzyAdapter(fuzzyBeans);
+                    return;
+                }
+            }
+        });
+        
+        
         fuzzyAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 FuzzyBean bean = fuzzyAdapter.getBeanByPositon(position);
                 String macode = bean.getMA_CODE();
-                if (macode.length() > 0){
-                    getLastBean(macode);
-                    mSearch.setText("");
+                if (chentrueorflase){
+                    if (macode.length() > 0){
+                        line_moju.setVisibility(View.VISIBLE);
+                        text_moju.setText(macode);
+                        mSearch.requestFocus();
+                        mSearch.setSelection(mSearch.getText().length());
+                        ce_moju.setText("");
+                    }
+                }else {
+                    if (macode.length() > 0){
+                        getLastBean(macode);
+                        mSearch.setText("");
+                    }
                 }
 
             }
@@ -327,6 +381,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
 //                        progressDialog.dismiss();
+                        chentrueorflase = false;
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
                         if (isSuccess){
                             JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
@@ -365,6 +420,58 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
 
     }
 
+
+
+    //查询模具
+    private void fuzzySearchMould(String code){
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_FUZZYSEARCHMOULD)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "fuzzySearchMa")
+                        .flag(0)
+                        .addParam("mouldcode", code)
+                        .addParam("sc_code", sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        chentrueorflase = true;
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            if (dataArray == null || dataArray.size() == 0){
+                                CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                setfuzzyAdapter(fuzzyBeans);
+                                return;
+                            }
+                            FuzzyBean bean = null;
+                            if (fuzzyBeans.size() > 0) fuzzyBeans.clear();
+                            for (Object index : dataArray){
+                                JSONObject data = (JSONObject) index;
+                                bean = new FuzzyBean(data.getString("DE_CODE"),data.getString("DE_NAME"));
+                                fuzzyBeans.add(bean);
+                            }
+                            setfuzzyAdapter(fuzzyBeans);
+                            startLlS.setVisibility(View.GONE);
+                            fuzzyRv.setVisibility(View.VISIBLE);
+
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+
+    }
+
     private void upDateUnitNumber() {
         if (StringUtil.isEmpty(unitSelctStr)) {
             unitSelctStr = "PCS";
@@ -388,7 +495,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     private void doExChangeClick() {
         if (!StringUtil.isEmpty(ifneedmj)){
             if(!ifneedmj.equals("0")){
-                if (ce_moju.getText().toString().trim().isEmpty()){
+                if (text_moju.getText().toString().trim().isEmpty()){
                     CommonUtil.toastNoRepeat(mActivity, "请输入模具编号");
                     return;
                 }
@@ -405,6 +512,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                         .addParam("ma_code", mOlIdTv.getText().toString())
                         .addParam("sc_code", sc_code)
                         .addParam("next_macode", gongdanhaoTv.getText().toString())
+                        .addParam("mouldcode",text_moju.getText().toString().trim())
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -433,6 +541,7 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         if (!StringUtil.isEmpty(ifneedmj)){
             if (!ifneedmj.equals("0")){
                 line_mju.setVisibility(View.VISIBLE);
+                text_moju.setVisibility(View.VISIBLE);
                 tv_mju.setTextColor(getResources().getColor(R.color.red));
                 ce_moju.requestFocus();
             }else {
@@ -615,7 +724,11 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         }
         @Override
         protected void convert(BaseViewHolder helper,FuzzyBean item) {
-            helper.setText(R.id.macode_Tv,item.getMA_CODE());
+            if (StringUtil.isEmpty(item.getDE_NAME())){
+                helper.setText(R.id.macode_Tv,item.getMA_CODE());
+            }else {
+                helper.setText(R.id.macode_Tv,item.getMA_CODE()+"-"+item.getDE_NAME());
+            }
         }
     }
 
@@ -624,11 +737,18 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
 
     private class FuzzyBean{
         String MA_CODE = null;
-
+        String DE_NAME = null;
         public FuzzyBean(String MA_CODE) {
             this.MA_CODE = MA_CODE;
         }
+        public FuzzyBean(String MA_CODE, String DE_NAME) {
+            this.MA_CODE = MA_CODE;
+            this.DE_NAME = DE_NAME;
+        }
 
+        public String getDE_NAME() {
+            return DE_NAME;
+        }
         public String getMA_CODE() {
             return MA_CODE;
         }

app/src/main/java/com/uas/hystorage/fragment/GoodOrBadAddDetailFragment.java

@@ -43,6 +43,8 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.util.Objects;
+
 /**
  * @author RaoMeng
  * @describe 入库条码采集页面
@@ -168,6 +170,7 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
                         .addParam("piid", pi_id)//必填单据类型
                         .addParam("lotno",text)//必填 仓库
                         .build(), new HttpCallback() {
+                    @SuppressLint("SetTextI18n")
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
@@ -198,14 +201,16 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
                             }
                         }
                     }
+                    @SuppressLint("SetTextI18n")
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         storage_in_add_detail_result_tv.setVisibility(View.VISIBLE);
                         line_gongvisbie.setVisibility(View.VISIBLE);
                         storage_in_add_detail_result_tv.setTextColor(Color.RED);
-                        storage_in_add_detail_result_tv.setText("采集失败！"+"\n生产批号:"+storage_in_add_detail_barcode_et.getText().toString().trim()
-                        +"\n失败原因"+failStr);
+                        storage_in_add_detail_result_tv.setText("采集失败！"
+                                +"\n生产批号:"+storage_in_add_detail_barcode_et.getText().toString().trim()
+                                +"\n失败原因"+failStr);
 //                        CommonUtil.toastNoRepeat(mActivity, failStr);
                         line_gongvisbie.setVisibility(View.GONE);
                         storage_in_add_detail_barcode_et.setText("");
@@ -520,7 +525,7 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
                 closeMenuPopupWindow();
             }
         });
-        CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
+        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
         mMenuPopupWindow.showAsDropDown(mMoreBtn);
     }
 

app/src/main/java/com/uas/hystorage/fragment/HistoryListFragment.java

@@ -0,0 +1,131 @@
+package com.uas.hystorage.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.KeyEvent;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.adapter.HistoryAdapter;
+import com.uas.hystorage.bean.HistoryListBean;
+import com.uas.hystorage.global.GloableParams;
+import com.uas.hystorage.util.CommonUtil;
+import com.uas.hystorage.util.Constants;
+import com.uas.hystorage.util.FastjsonUtil;
+import com.uas.hystorage.util.HttpCallback;
+import com.uas.hystorage.util.HttpParams;
+import com.uas.hystorage.util.VollyRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HistoryListFragment extends BaseFragment {
+    private StringRequest mStringRequest;
+    private Boolean canReturn = true;
+    private String sc_code;
+    private String ma_code;
+    private RecyclerView rv_content;
+    private HistoryAdapter historyAdapter;
+    private List<HistoryListBean> mList;
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_report_detail;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) getActivity()).setTitle("打卡记录");
+        rv_content=root.findViewById(R.id.rv_content);
+        mList = new ArrayList<>();
+        rv_content.setLayoutManager(new LinearLayoutManager(mActivity));
+        historyAdapter=new HistoryAdapter();
+        rv_content.setAdapter(historyAdapter);
+    }
+    @Override
+    protected void initEvents() {
+//        mActivity.findViewById(R.id.btn_actionbar_withback).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if(canReturn){
+//                    getActivity().finish();
+//                }
+//                progressDialog.dismiss();
+//            }
+//        });
+
+    }
+
+    @Override
+    protected void initDatas() {
+        Bundle bundle = getArguments();//从activity传过来的Bundle
+        if(bundle!=null){
+            sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            ma_code = bundle.getString(Constants.FLAG.MA_CODE);
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GETPUNCHINGDATA)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getReportData")
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        mList.clear();
+                        try {
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                            if (isSuccess) {
+                                JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                                for(Object index:dataArray){
+                                    JSONObject data = (JSONObject) index;
+                                    HistoryListBean bean = new HistoryListBean();
+                                    String PCD_TYPE = data.getString("PCD_TYPE") == null ? "(-)" : data.getString("PCD_TYPE");
+                                    String PCD_CARDCODE = data.getString("PCD_CARDCODE") == null ? "(-)" : data.getString("PCD_CARDCODE");
+                                    String PCD_EMNAME = data.getString("PCD_EMNAME") == null ? "(-)" : data.getString("PCD_EMNAME");
+                                    String PCD_QTY = data.getString("PCD_QTY") == null ? "(-)" : data.getString("PCD_QTY");
+                                    String PCD_SCCODE = data.getString("PCD_SCCODE") == null ? "(-)" : data.getString("PCD_SCCODE");
+                                    String PCD_SCNAME = data.getString("PCD_SCNAME") == null ? "(-)" : data.getString("PCD_SCNAME");
+                                    String PCD_DATE = data.getString("PCD_DATE") == null ? "(-)" : data.getString("PCD_DATE");
+                                    String PCD_INDATE = data.getString("PCD_INDATE") == null ? "(-)" : data.getString("PCD_INDATE");
+                                    bean.setPCD_TYPE(PCD_TYPE);
+                                    bean.setPCD_CARDCODE(PCD_CARDCODE);
+                                    bean.setPCD_EMNAME(PCD_EMNAME);
+                                    bean.setPCD_QTY(PCD_QTY);
+                                    bean.setPCD_SCCODE(PCD_SCCODE);
+                                    bean.setPCD_SCNAME(PCD_SCNAME);
+                                    bean.setPCD_DATE(PCD_DATE);
+                                    bean.setPCD_INDATE(PCD_INDATE);
+                                    mList.add(bean);
+                                }
+                                historyAdapter.setNewData(mList);
+                            }
+                        } catch (Exception e) {
+
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/PostPunchFragment.java

@@ -43,6 +43,7 @@ import com.uas.hystorage.global.GloableParams;
 import com.uas.hystorage.util.CameraUtil;
 import com.uas.hystorage.util.CommonUtil;
 import com.uas.hystorage.util.FastjsonUtil;
+import com.uas.hystorage.util.FragmentUtils;
 import com.uas.hystorage.util.HttpCallback;
 import com.uas.hystorage.util.HttpParams;
 import com.uas.hystorage.util.LogUtil;
@@ -57,6 +58,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import razerdp.basepopup.BasePopupWindow;
 
@@ -97,7 +99,8 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     private TextView tv_pc_nnt;
     private LinearLayout line_text;
     private TextView tv_pepoer;
-
+    private Button mMoreBtn;
+    private PopupWindow mMenuPopupWindow;
     @Override
     protected int getLayout() {
         return R.layout.fragment_post_punch;
@@ -106,7 +109,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     @Override
     protected void initViews() {
         setTitle("岗位打卡");
-        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
         storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
         jlt_storage_in_barcode_save_btn = mActivity.findViewById(R.id.jlt_storage_in_barcode_save_btn);
@@ -128,7 +131,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         tv_pc_nnt = mActivity.findViewById(R.id.tv_pc_nnt);
         tv_pepoer = mActivity.findViewById(R.id.tv_pepoer);
 
-
+        mMoreBtn = (Button)mActivity.findViewById(R.id.btn_actionbar_more);
 
         rb_changetext="良品";
         String nowTime = getNowTime();
@@ -145,7 +148,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         storage_recharge_collect_ets.setOnClickListener(this);
         iv_sao.setOnClickListener(this);
         iv_ka.setOnClickListener(this);
-
+        mMoreBtn.setOnClickListener(this);
         rg_hui.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @SuppressLint("NonConstantResourceId")
             @Override
@@ -876,7 +879,32 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     }
 
 
+    /**
+     * 展示扩展菜单
+     */
+    private void showMoreMenu() {
+        View view = View.inflate(getActivity(), R.layout.pop_postpunch_add_menu, null);
+        Button addBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_1);
+        addBtn.setOnClickListener(this);
+
+        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMenuPopupWindow();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
+        mMenuPopupWindow.showAsDropDown(mMoreBtn);
+    }
 
+    private void closeMenuPopupWindow() {
+        if (mMenuPopupWindow != null) {
+            mMenuPopupWindow.dismiss();
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
 
 
     @Override
@@ -910,6 +938,14 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.btn_actionbar_more:
+                showMoreMenu();
+                break;
+            case R.id.pop_storage_in_add_menu_1:
+                closeMenuPopupWindow();
+                HistoryListFragment historyListFragment = new HistoryListFragment();
+                FragmentUtils.switchFragment(PostPunchFragment.this, historyListFragment);
+                break;
             case R.id.storage_recharge_scan_ivs:
                 getRepairStep(ct_qty.getText().toString().trim());
 //                Intent intent = new Intent(mActivity, CommonSeclecActivity.class);

app/src/main/java/com/uas/hystorage/fragment/RolloutFragment.java

@@ -90,7 +90,10 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
     private GrouponlineBean grouponlineBeansss;
     private String tvlotno;
     private String stringqty;
-
+    private RadioGroup rg_change;
+    private RadioButton rb_zhuanchu;
+    private RadioButton rb_chexiao;
+    private String rb_changeinter;
     @Override
     protected int getLayout() {
         return R.layout.fragment_rollout;
@@ -110,8 +113,15 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         rb_no = mActivity.findViewById(R.id.rb_no);
         ce_yuanyin = mActivity.findViewById(R.id.ce_yuanyin);
         btn_ceshi = mActivity.findViewById(R.id.btn_ceshi);
+        rg_change = mActivity.findViewById(R.id.rg_change);
+        rb_zhuanchu = mActivity.findViewById(R.id.rb_zhuanchu);
+        rb_chexiao = mActivity.findViewById(R.id.rb_chexiao);
+
         rb_ok.setChecked(true);
         rb_changetext="良品";
+
+        rb_zhuanchu.setChecked(true);
+        rb_changeinter="0";
         storage_recharge_collect_ets.requestFocus();
 
     }
@@ -152,6 +162,27 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
             }
         });
 
+        rg_change.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @SuppressLint("NonConstantResourceId")
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
+                switch (checkid){
+                    case R.id.rb_zhuanchu:
+                        rb_changeinter = "0";
+                        ct_qty.setFocusable(true);
+                        ct_qty.setFocusableInTouchMode(true);
+                        break;
+                    case R.id.rb_chexiao:
+                        rb_changeinter = "1";
+                        ct_qty.setText("");
+                        ct_qty.setFocusable(false);
+                        ct_qty.setFocusableInTouchMode(false);
+                        break;
+                }
+            }
+        });
+
+
         ma_code = SharedPreUtil.getString(mActivity, "MA_CODE", null);
         sc_code = SharedPreUtil.getString(mActivity, "SC_CODE", null);
         ifsplitout = SharedPreUtil.getString(mActivity, Constants.FLAG.GANG_WEI_SOURCE_ifsplitout, null);
@@ -286,6 +317,7 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
                         .addParam("sc_code", sc_code)//岗位资源
                         .addParam("ma_code",ma_code)//工单编号
                         .addParam("lotno",lotno)//生产批次号
+                        .addParam("ifreturn",rb_changeinter)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -347,17 +379,31 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
     }
 
     private void getOKlotnoData(List<GrouponlineBean> fededatalist) {
-
-
-        if (fededatalist == null || fededatalist.size()==0) {
-            GrouponlineBean grouponlineBeans= new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim());
-            mFeededList.add(grouponlineBeans);
+        if (rb_changeinter.equals("0")){
+            if (fededatalist == null || fededatalist.size()==0) {
+                GrouponlineBean grouponlineBeans= new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim());
+                mFeededList.add(grouponlineBeans);
+            }else {
+                for (int i=0;i<fededatalist.size();i++){
+                    mFeededList.add(new GrouponlineBean(fededatalist.get(i).getLOTNO(),fededatalist.get(i).getQTY()));
+                }
+                mFeededList.add(new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim()));
+            }
         }else {
-            for (int i=0;i<fededatalist.size();i++){
-                mFeededList.add(new GrouponlineBean(fededatalist.get(i).getLOTNO(),fededatalist.get(i).getQTY()));
+            if (fededatalist == null || fededatalist.size()==0) {
+                GrouponlineBean grouponlineBeans= new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim());
+                mFeededList.add(grouponlineBeans);
+            }else {
+                for (int i=0;i<fededatalist.size();i++){
+                    mFeededList.add(new GrouponlineBean(fededatalist.get(i).getLOTNO()));
+                }
+                mFeededList.add(new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim()));
             }
-            mFeededList.add(new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim()));
+
         }
+
+
+
         Gson gson = new Gson();
         jsonStrington = gson.toJson(mFeededList);
 
@@ -375,6 +421,7 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
                         .addParam("result",rb_changetext)//良品或者不良
                         .addParam("remark",ce_yuanyin.getText().toString().trim())//备注
                         .addParam("data", jsonStrington)//生产批次号
+                        .addParam("ifreturn",rb_changeinter)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -389,7 +436,12 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
                         tvlotno = "";
                         storage_recharge_collect_ets.setText("");
                         storage_recharge_collect_ets.requestFocus();
-                        CommonUtil.toastNoRepeat(mActivity, "转出成功");
+                        if (rb_changeinter.equals("0")){
+                            CommonUtil.toastNoRepeat(mActivity, "转出成功");
+                        }else {
+                            CommonUtil.toastNoRepeat(mActivity, "撤销转出成功");
+                        }
+
                     }
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
@@ -505,7 +557,7 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
 
 
 
-                if (ifsplitout.equals("0")&&!ifmultiin.equals("0")&&!iforigio.equals("0")){
+                if (ifsplitout.equals("0")&&!ifmultiin.equals("0")&&!iforigio.equals("0")||rb_changeinter.equals("0")){
                     getonLineData();
                 }else {
                     if (storage_recharge_collect_ets.getText().toString().trim().isEmpty()){

app/src/main/java/com/uas/hystorage/fragment/StartsAndStopsFragment.java

@@ -1,11 +1,14 @@
 package com.uas.hystorage.fragment;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -18,6 +21,7 @@ import com.uas.hystorage.tools.SharedPreUtil;
 import com.uas.hystorage.util.CommonUtil;
 import com.uas.hystorage.util.Constants;
 import com.uas.hystorage.util.FastjsonUtil;
+import com.uas.hystorage.util.FragmentUtils;
 import com.uas.hystorage.util.HttpCallback;
 import com.uas.hystorage.util.HttpParams;
 import com.uas.hystorage.util.VollyRequest;
@@ -26,12 +30,13 @@ import com.uas.hystorage.view.ClearableEditText;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * Created by cjh 2024/01/26
- * Desc: 机台启停
+ * Desc: 机台操作
  */
-public class StartsAndStopsFragment extends BaseFragment {
+public class StartsAndStopsFragment extends BaseFragment implements View.OnClickListener{
     private StringRequest mStringRequest;
     private ClearableEditText storage_recharge_collect_ets;
     private TextView tv_hint1;
@@ -44,7 +49,8 @@ public class StartsAndStopsFragment extends BaseFragment {
     private String devcodestartorstop;
     private Button btn_starts;
     private Button btn_stops;
-
+    private Button mMoreBtn;
+    private PopupWindow mMenuPopupWindow;
     @Override
     protected int getLayout() {
         return R.layout.fragment_starts_stops;
@@ -53,7 +59,7 @@ public class StartsAndStopsFragment extends BaseFragment {
     @Override
     protected void initViews() {
         setTitle("机台操作");
-        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
         line_hint = mActivity.findViewById(R.id.line_hint);
         line_vis = mActivity.findViewById(R.id.line_vis);
@@ -63,12 +69,13 @@ public class StartsAndStopsFragment extends BaseFragment {
         text_pepro = mActivity.findViewById(R.id.text_pepro);
         btn_starts = mActivity.findViewById(R.id.btn_starts);
         btn_stops = mActivity.findViewById(R.id.btn_stops);
-
+        mMoreBtn = (Button)mActivity.findViewById(R.id.btn_actionbar_more);
     }
 
 
     @Override
     protected void initEvents() {
+        mMoreBtn.setOnClickListener(this);
         storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -265,6 +272,37 @@ public class StartsAndStopsFragment extends BaseFragment {
         timeString=result+":00";
         return timeString;
     }
+    /**
+     * 展示扩展菜单
+     */
+    private void showMoreMenu() {
+        View view = View.inflate(getActivity(), R.layout.pop_postpunch_add_menu, null);
+        Button addBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_1);
+        addBtn.setText("操作记录");
+        addBtn.setOnClickListener(this);
+
+        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMenuPopupWindow();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
+        mMenuPopupWindow.showAsDropDown(mMoreBtn);
+    }
+
+    private void closeMenuPopupWindow() {
+        if (mMenuPopupWindow != null) {
+            mMenuPopupWindow.dismiss();
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+
+
+
+
 
     @Override
     public void onHiddenChanged(boolean hidden) {
@@ -304,4 +342,18 @@ public class StartsAndStopsFragment extends BaseFragment {
 
     }
 
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btn_actionbar_more:
+                showMoreMenu();
+                break;
+            case R.id.pop_storage_in_add_menu_1:
+                closeMenuPopupWindow();
+                StrrtsListFragment strrtsListFragment = new StrrtsListFragment();
+                FragmentUtils.switchFragment(StartsAndStopsFragment.this, strrtsListFragment);
+                break;
+        }
+    }
 }

app/src/main/java/com/uas/hystorage/fragment/StrrtsListFragment.java

@@ -0,0 +1,127 @@
+package com.uas.hystorage.fragment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.KeyEvent;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.adapter.StartAdapter;
+import com.uas.hystorage.bean.StartsListBean;
+import com.uas.hystorage.global.GloableParams;
+import com.uas.hystorage.util.CommonUtil;
+import com.uas.hystorage.util.Constants;
+import com.uas.hystorage.util.FastjsonUtil;
+import com.uas.hystorage.util.HttpCallback;
+import com.uas.hystorage.util.HttpParams;
+import com.uas.hystorage.util.VollyRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StrrtsListFragment extends BaseFragment {
+    private StringRequest mStringRequest;
+    private Boolean canReturn = true;
+    private String sc_code;
+    private String ma_code;
+    private RecyclerView rv_content;
+    private StartAdapter startAdapter;
+    private List<StartsListBean> mList;
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_report_detail;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) getActivity()).setTitle("操作记录");
+        rv_content=root.findViewById(R.id.rv_content);
+        mList = new ArrayList<>();
+        rv_content.setLayoutManager(new LinearLayoutManager(mActivity));
+        startAdapter=new StartAdapter();
+        rv_content.setAdapter(startAdapter);
+    }
+    @Override
+    protected void initEvents() {
+//        mActivity.findViewById(R.id.btn_actionbar_withback).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if(canReturn){
+//                    getActivity().finish();
+//                }
+//                progressDialog.dismiss();
+//            }
+//        });
+
+    }
+
+    @Override
+    protected void initDatas() {
+        Bundle bundle = getArguments();//从activity传过来的Bundle
+        if(bundle!=null){
+            sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            ma_code = bundle.getString(Constants.FLAG.MA_CODE);
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GETOPRLOG)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getReportData")
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        mList.clear();
+                        try {
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                            if (isSuccess) {
+                                JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                                for(Object index:dataArray){
+                                    JSONObject data = (JSONObject) index;
+                                    StartsListBean bean = new StartsListBean();
+                                    String DL_OPR = data.getString("DL_OPR") == null ? "(-)" : data.getString("DL_OPR");
+                                    String DL_DEVCODE = data.getString("DL_DEVCODE") == null ? "(-)" : data.getString("DL_DEVCODE");
+                                    String DL_DEVNAME = data.getString("DL_DEVNAME") == null ? "(-)" : data.getString("DL_DEVNAME");
+                                    String DL_DELOCATION = data.getString("DL_DELOCATION") == null ? "(-)" : data.getString("DL_DELOCATION");
+                                    String DL_INDATE = data.getString("DL_INDATE") == null ? "(-)" : data.getString("DL_INDATE");
+                                    String DL_INMAN = data.getString("DL_INMAN") == null ? "(-)" : data.getString("DL_INMAN");
+                                    bean.setDL_OPR(DL_OPR);
+                                    bean.setDL_DEVCODE(DL_DEVCODE);
+                                    bean.setDL_DEVNAME(DL_DEVNAME);
+                                    bean.setDL_DELOCATION(DL_DELOCATION);
+                                    bean.setDL_INDATE(DL_INDATE);
+                                    bean.setDL_INMAN(DL_INMAN);
+                                    mList.add(bean);
+                                }
+                                startAdapter.setNewData(mList);
+                            }
+                        } catch (Exception e) {
+
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/WorkOrderSearchFragment.java

@@ -75,6 +75,9 @@ public class WorkOrderSearchFragment extends BaseFragment {
     private ClearableEditText ce_moju;
     private TextView tv_mju;
     private LinearLayout line_mju;
+    private boolean chentrueorflase = true;
+    private TextView text_moju;
+    private LinearLayout line_moju;
 
     @Override
     protected int getLayout() {
@@ -92,7 +95,8 @@ public class WorkOrderSearchFragment extends BaseFragment {
         ce_moju = root.findViewById(R.id.ce_moju);
         tv_mju = root.findViewById(R.id.tv_mju);
         line_mju = root.findViewById(R.id.line_mju);
-
+        text_moju = root.findViewById(R.id.text_moju);
+        line_moju = root.findViewById(R.id.line_moju);
         //模糊查询展示的工单号列表
         fuzzyRv = root.findViewById(R.id.fuzzy_rv);
         fuzzyRv.addItemDecoration(new DividerItemDecoration(mActivity,LinearLayout.VERTICAL));
@@ -172,17 +176,50 @@ public class WorkOrderSearchFragment extends BaseFragment {
                 return false;
             }
         });
+        //----------模具模糊搜索------------------------
+
+
 
+        ce_moju.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() >= 3) {
+                    String mSearchStr = s.toString().trim();
+                    LogUtil.i("mSearchStr",mSearchStr);
+                    fuzzySearchMould(mSearchStr);
+                } else {
+                    fuzzyBeans.clear();
+                    setfuzzyAdapter(fuzzyBeans);
+                    return;
+                }
+
+            }
+        });
         fuzzyAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 FuzzyBean bean = fuzzyAdapter.getBeanByPositon(position);
                 String macode = bean.getMA_CODE();
-                if (macode.length() > 0){
-                    getLastBean(macode);
-                    mSearch.setText("");
+                if (chentrueorflase){
+                    if (macode.length() > 0){
+                        line_moju.setVisibility(View.VISIBLE);
+                        text_moju.setText(macode);
+                        mSearch.requestFocus();
+                        mSearch.setSelection(mSearch.getText().length());
+                        ce_moju.setText("");
+                    }
+                }else {
+                    if (macode.length() > 0){
+                        getLastBean(macode);
+                        mSearch.setText("");
+                    }
                 }
 
+
             }
         });
 
@@ -192,7 +229,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
             public void onClick(View v) {
                 if (!StringUtil.isEmpty(ifneedmj)){
                     if(!ifneedmj.equals("0")){
-                        if (ce_moju.getText().toString().trim().isEmpty()){
+                        if (text_moju.getText().toString().trim().isEmpty()){
                             CommonUtil.toastNoRepeat(mActivity, "请输入模具编号");
                             return;
                         }
@@ -207,7 +244,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
                                 .flag(0)
                                 .addParam("sc_code", sc_code)
                                 .addParam("ma_code", detailOne.getString("MA_CODE"))
-                                .addParam("mouldcode",ce_moju.getText().toString().trim())
+                                .addParam("mouldcode",text_moju.getText().toString().trim())
                                 .build(), new HttpCallback() {
                             @Override
                             public void onSuccess(int flag, Object o) throws Exception {
@@ -371,6 +408,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
+                        chentrueorflase = false;
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
                         if (isSuccess){
                             JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
@@ -405,6 +443,56 @@ public class WorkOrderSearchFragment extends BaseFragment {
 
                 });
 
+    }
+    //查询模具
+    private void fuzzySearchMould(String code){
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_FUZZYSEARCHMOULD)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "fuzzySearchMa")
+                        .flag(0)
+                        .addParam("mouldcode", code)
+                        .addParam("sc_code", sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        chentrueorflase = true;
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            if (dataArray == null || dataArray.size() == 0){
+                                CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                fuzzyBeans.clear();
+                                setfuzzyAdapter(fuzzyBeans);
+                                return;
+                            }
+                            FuzzyBean bean = null;
+                            if (fuzzyBeans.size() > 0) fuzzyBeans.clear();
+                            for (Object index : dataArray){
+                                JSONObject data = (JSONObject) index;
+                                bean = new FuzzyBean(data.getString("DE_CODE"),data.getString("DE_NAME"));
+                                fuzzyBeans.add(bean);
+                            }
+                            setfuzzyAdapter(fuzzyBeans);
+                            startLlS.setVisibility(View.GONE);
+                            fuzzyRv.setVisibility(View.VISIBLE);
+
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+
     }
 
     private class FuzzySearchAdapter extends BaseQuickAdapter<FuzzyBean, BaseViewHolder>{
@@ -426,17 +514,32 @@ public class WorkOrderSearchFragment extends BaseFragment {
         }
         @Override
         protected void convert(BaseViewHolder helper, FuzzyBean item) {
-            helper.setText(R.id.macode_Tv,item.getMA_CODE());
+            if (StringUtil.isEmpty(item.getDE_NAME())){
+                helper.setText(R.id.macode_Tv,item.getMA_CODE());
+            }else {
+                helper.setText(R.id.macode_Tv,item.getMA_CODE()+"-"+item.getDE_NAME());
+            }
+
         }
     }
 
     private class FuzzyBean{
         String MA_CODE = null;
+        String DE_NAME = null;
 
         public FuzzyBean(String MA_CODE) {
             this.MA_CODE = MA_CODE;
         }
 
+        public FuzzyBean(String MA_CODE, String DE_NAME) {
+            this.MA_CODE = MA_CODE;
+            this.DE_NAME = DE_NAME;
+        }
+
+        public String getDE_NAME() {
+            return DE_NAME;
+        }
+
         public String getMA_CODE() {
             return MA_CODE;
         }

app/src/main/java/com/uas/hystorage/global/GloableParams.java

@@ -340,6 +340,9 @@ public class GloableParams {
     public static String ADDRESS_CONFIRMREPAIRSTEP;
     public static String ADDRESS_GETSPLITNEWLOTNO;
     public static String ADDRESS_GETBADSPLITLOTNO;
+    public static String ADDRESS_FUZZYSEARCHMOULD;
+    public static String ADDRESS_GETPUNCHINGDATA;
+    public static String ADDRESS_GETOPRLOG;
     /**
      * 高登
      */
@@ -972,12 +975,14 @@ public class GloableParams {
     private static final String ADDRESSTAIL_COUNTING_GETSOURCEPUNCHINFO = "/api/pdashop/source/getSourcePunchInfo.action";
     private static final String ADDRESSTAIL_COUNTING_CARDPUNCHING = "/api/pdashop/source/cardPunching.action";
     private static final String ADDRESSTAIL_COUNTING_NNTPUNCHING = "/api/pdashop/source/nntPunching.action";
+    private static final String ADDRESSTAIL_COUNTING_GETPUNCHINGDATA = "/api/pdashop/source/getPunchingData.action";
     /**
      * 机台操作
      */
     private static final String ADDRESSTAIL_COUNTING_GETINFO = "/api/pdashop/device/getInfo.action";
     private static final String ADDRESSTAIL_COUNTING_START = "/api/pdashop/device/start.action";
     private static final String ADDRESSTAIL_COUNTING_STOP = "/api/pdashop/device/stop.action";
+    private static final String ADDRESSTAIL_GETOPRLOG = "/api/pdashop/device/getOprLog.action";
     /**
      * 返工判定
      */
@@ -993,6 +998,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_GETBADSPLITLOTNO = "/api/pdashop/special/badSplitLotno.action";
 
 
+    private static final String ADDRESSTAIL_FUZZYSEARCHMOULD = "/api/pdashop/start/fuzzySearchMould.action";
 
 
 
@@ -1562,5 +1568,8 @@ public class GloableParams {
         GloableParams.ADDRESS_CONFIRMREPAIRSTEP = uriHead + GloableParams.ADDRESSTAIL_CONFIRMREPAIRSTEP;
         GloableParams.ADDRESS_GETSPLITNEWLOTNO = uriHead + GloableParams.ADDRESSTAIL_GETSPLITNEWLOTNO;
         GloableParams.ADDRESS_GETBADSPLITLOTNO = uriHead + GloableParams.ADDRESSTAIL_GETBADSPLITLOTNO;
+        GloableParams.ADDRESS_FUZZYSEARCHMOULD = uriHead + GloableParams.ADDRESSTAIL_FUZZYSEARCHMOULD;
+        GloableParams.ADDRESS_GETPUNCHINGDATA = uriHead + GloableParams.ADDRESSTAIL_COUNTING_GETPUNCHINGDATA;
+        GloableParams.ADDRESS_GETOPRLOG = uriHead + GloableParams.ADDRESSTAIL_GETOPRLOG;
     }
 }

app/src/main/res/layout/dialog_recharge_modify.xml

@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_line_edittext"
-        android:inputType="numberDecimal"
+        android:inputType="number"
         android:padding="10dp"
         />
 </LinearLayout>

app/src/main/res/layout/fragment_gd_work_switch.xml

@@ -46,6 +46,29 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/line_moju"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="模具："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/text_moju"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingLeft="6dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="" />
+    </LinearLayout>
+
     <!--GONE-->
     <LinearLayout
         android:layout_width="match_parent"
@@ -284,6 +307,7 @@
                 android:gravity="left"
                 />
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/fragment_rollout.xml

@@ -8,6 +8,31 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+        <RadioGroup
+            android:id="@+id/rg_change"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center">
+            <RadioButton
+                android:id="@+id/rb_zhuanchu"
+                android:text="转出"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="50dp">
+            </RadioButton>
+            <RadioButton
+                android:id="@+id/rb_chexiao"
+                android:text="撤销转出"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="50dp">
+            </RadioButton>
+        </RadioGroup>
         <LinearLayout
             android:padding="@dimen/sp_16"
             android:orientation="horizontal"

app/src/main/res/layout/item_history_detail.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--主菜单griditem布局-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="5dp"
+    android:paddingLeft="15dp"
+    android:paddingRight="10dp"
+    >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="操作类型："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="签退" />
+        <TextView
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="打卡数量："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_qty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="128" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="人员卡号："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_cardcode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="HY006" />
+        <TextView
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="人员名称:"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_pcd_emname"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:ellipsize="end"
+            android:paddingLeft="6dp"
+            android:singleLine="true"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="YS1506002" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="岗位资源："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_sccode_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="CX0001-成型0001" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="打卡时间："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="2024-03-27 15:03:00" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="操作时间："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_pcd_indate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="2024-03-27 15:03:00" />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="5dp"
+        android:background="@color/me_menu_item_press"/>
+
+</LinearLayout>
+

app/src/main/res/layout/item_starts_detail.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--主菜单griditem布局-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="5dp"
+    android:paddingLeft="15dp"
+    android:paddingRight="10dp"
+    >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="操作类型："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_dl_opr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="签退" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="设备："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_dl_devcode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="CX0001-成型0001" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="操作时间："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_dl_indate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="2024-03-27 15:03:00" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="操作人："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_dl_inman"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="80dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="2024-03-27 15:03:00" />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="5dp"
+        android:background="@color/me_menu_item_press"/>
+
+</LinearLayout>
+

app/src/main/res/layout/pop_postpunch_add_menu.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/white"
+              android:gravity="center"
+              android:orientation="vertical">
+
+    <Button
+        android:id="@+id/pop_storage_in_add_menu_1"
+        style="@style/action_more_menu"
+        android:text="打卡记录"
+        />
+
+</LinearLayout>

app/src/main/res/layout/work_order_search_fragment.xml

@@ -92,6 +92,27 @@
                     android:gravity="left"
                     />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/line_moju"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:text="模具编号:">
+                </TextView>
+                <TextView
+                    android:id="@+id/text_moju"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:text="">
+                </TextView>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="match_parent"

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.0.1"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 10;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.0.1";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="10"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="10"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.0.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]