From 9c6613614bfbb500a5c5e9cc11c07a99559e1519 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 8 Dec 2022 20:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instor/service/impl/CheckServiceImpl.java | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
index 0233b8a5..a732c6c1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
@@ -633,53 +633,21 @@ public class CheckServiceImpl implements CheckService {
             JSONObject jo = rows.getJSONObject(i);
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("盘点单号", jo.getString("check_code"));
-            map.put("明细序号", jo.getString("seq_no"));
-            map.put("库区编码", jo.getString("sect_code"));
+            map.put("序号", jo.getString("seq_no"));
             map.put("库区名称", jo.getString("sect_name"));
             map.put("货位编码", jo.getString("struct_code"));
-            map.put("货位名称", jo.getString("struct_name"));
             map.put("载具号", jo.getString("storagevehicle_code"));
             map.put("物料编码", jo.getString("material_code"));
             map.put("物料名称", jo.getString("material_name"));
-            map.put("桶数", jo.getIntValue("base_qty"));
-            map.put("盘点桶数", jo.getIntValue("fac_qty"));
-            map.put("单位", jo.getString("qty_unit_name"));
-            String check_result = jo.getString("check_result");
-            if (check_result.equals("0")) {
-                map.put("盘点结果", "正常");
-            } else if (check_result.equals("1")) {
-                map.put("盘点结果", "盘亏");
-            } else if (check_result.equals("2")) {
-                map.put("盘点结果", "盘盈");
-            }
-            String status = jo.getString("status");
-            if (status.equals("01")) {
-                map.put("状态", "生成");
-            } else if (status.equals("04")) {
-                map.put("状态", "盘点中");
-            } else if (status.equals("05")) {
-                map.put("状态", "已盘点");
-            } else if (status.equals("06")) {
-                map.put("状态", "异常处理中");
-            } else if (status.equals("07")) {
-                map.put("状态", "异常处理完成");
-            } else if (status.equals("99")) {
-                map.put("状态", "确认完成");
-            }
-            map.put("异常处理人", jo.getString("process_optname"));
-            map.put("异常处理时间", jo.getString("process_time"));
-            String process_type = jo.getString("process_type");
-            if (process_type.equals("0")) {
-                map.put("异常处理方式", "账务为准");
-            } else if (process_type.equals("1")) {
-                map.put("异常处理方式", "实物为准");
-            }
             map.put("桶号", jo.getString("bucketunique"));
             if (StrUtil.isNotEmpty(jo.getString("storage_qty"))) {
                 map.put("桶重量",  NumberUtil.round(jo.getString("storage_qty"),3).toString());
             }else{
                 map.put("桶重量",  "");
             }
+            map.put("桶数", jo.getIntValue("base_qty"));
+            map.put("实盘桶数", jo.getIntValue("fac_qty"));
+            map.put("实盘重量", "");
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);