增加海康扫码

app/src/main/java/com/ygtx/emcs/activity/StockPackageActivity.java

@@ -96,9 +96,9 @@ public class StockPackageActivity extends BaseActivity {
             }
             return false;
         });
-//        binding.tvScanTips.setOnClickListener(view->{
-//            receiverTask("CK_20250304002");
-//        });
+        binding.tvScanTips.setOnClickListener(view->{
+            receiverTask("CK_20250327007");
+        });
 //        binding.tvOutCode.setOnClickListener(view->{
 //            receiverTask("0220013310125");
 //        });

app/src/main/java/com/ygtx/emcs/activity/StockPackageHistoryActivity.java

@@ -76,7 +76,7 @@ public class StockPackageHistoryActivity extends BaseActivity {
 
     private void toPackageLine(WmPackage wmPackage){
         Bundle bundle = new Bundle();
-        bundle.putSerializable("wmPackage", wmPackage);
+        bundle.putSerializable("packageId", wmPackage.getPackageId());
         toActivity(StockPackageHistoryItemActivity.class, bundle);
     }
 

app/src/main/java/com/ygtx/emcs/activity/StockPackageHistoryItemActivity.java

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 
 import com.google.gson.Gson;
@@ -13,11 +14,13 @@ import com.google.gson.reflect.TypeToken;
 import com.ygtx.emcs.R;
 import com.ygtx.emcs.activity.adapter.StockPackingItemViewAdapter;
 import com.ygtx.emcs.activity.adapter.StockPackingListViewAdapter;
+import com.ygtx.emcs.activity.model.EventMessage;
 import com.ygtx.emcs.activity.model.StockLineModel;
 import com.ygtx.emcs.activity.model.StockModel;
 import com.ygtx.emcs.activity.model.WmPackage;
 import com.ygtx.emcs.activity.model.WmPackageLine;
 import com.ygtx.emcs.comm.BaseActivity;
+import com.ygtx.emcs.comm.Res;
 import com.ygtx.emcs.databinding.YgtxStockOutAddBinding;
 import com.ygtx.emcs.databinding.YgtxStockPackingHistoryListBinding;
 import com.ygtx.emcs.util.Constant;
@@ -48,6 +51,7 @@ public class StockPackageHistoryItemActivity extends BaseActivity {
     private final ArrayList<WmPackageLine> wmPackageLines = new ArrayList<>();
     private StockModel stockModel;
     private String packageId;
+    private Button submit;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -123,6 +127,15 @@ public class StockPackageHistoryItemActivity extends BaseActivity {
         back.setOnClickListener(view -> {
             finish();
         });
+
+        submit = findViewById(R.id.c_iv_common_submit);
+        submit.setBackgroundColor(Res.getColor("transparent"));
+        submit.setTextColor(Res.getColor("white"));
+        submit.setVisibility(View.VISIBLE);
+        submit.setText("打印");
+        submit.setOnClickListener(view -> {
+            printItem();
+        });
     }
 
     private void registerReceiver() {
@@ -135,6 +148,58 @@ public class StockPackageHistoryItemActivity extends BaseActivity {
         }
     }
 
+    private void printItem() {
+        if(Constant.user==null || Constant.user.getUserId() == null){
+            return;
+        }
+        if(wmPackageLines.isEmpty()){
+            ToastUtils.showToast(context, "没有可以打印的清单物品");
+            return;
+        }
+        submit.setEnabled(false);
+        MyProgress myProgress = MyProgress.getInstance();
+        myProgress.show(context, "提示", "正在发送数据");
+        RequestParams params = httParams(Constant.PRINTER_PACKAGE);
+        params.addParameter("packageId", packageId);
+        params.addParameter("inspector", Constant.user.getLoginName());
+        params.addParameter("inspectorName", Constant.user.getNickName());
+        x.http().post(params, new Callback.CommonCallback<JSONObject>() {
+            @Override
+            public void onSuccess(JSONObject rs) {
+                mylog.info(rs.toString());
+                try {
+                    if (rs.getInt("code") == 200) {
+                        ToastUtils.showToast(context, "打印成功");
+                    }else if(rs.getInt("code") == 401){
+                        ToastUtils.showToast(context, "会话过期");
+                        logoutAuth(rs.getInt("code"));
+                    }else{
+                        ToastUtils.showToast(context, rs.getString("msg"));
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onError(Throwable ex, boolean isOnCallback) {
+                ex.printStackTrace();
+                HttpsUtil.parserError(StockPackageHistoryItemActivity.this, ex);
+                mylog.error("请求异常：", ex);
+            }
+            @Override
+            public void onFinished() {
+                myProgress.close();
+                submit.setEnabled(true);
+            }
+
+            @Override
+            public void onCancelled(CancelledException arg0) {
+                mylog.error("onRead:", arg0);
+            }
+        });
+    }
+
     @Override
     public void receiverTask(String barcode) {
         System.out.println("扫码：" + barcode);