From 599a0ebb6711d123a481a1f9ebf373ab9fd67cfa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 29 十月 2022 17:02:28 +0800
Subject: [PATCH] #异常库存合并

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java      |   30 +++-
 src/main/java/com/zy/asrs/entity/LocDetl.java                    |   20 ---
 src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java |  282 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 301 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 78453a7..04ffd45 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -14,6 +14,7 @@
 import com.core.common.R;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.AbnormalLocDetlParam;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
 import com.zy.asrs.service.MatService;
@@ -294,7 +295,8 @@
                        @RequestParam(required = false) String condition,
                        @RequestParam Map<String, Object> param) {
 
-        List<LocDetl> result = new ArrayList<>();
+//        List<LocDetl> result = new ArrayList<>();
+        List<AbnormalLocDetlParam> result = new ArrayList<>();
 //        excludeTrash(param);
         param.put("curr", curr);
         param.put("limit", limit);
@@ -303,9 +305,6 @@
         for (LocDetl locDetl : groupLocDetl.getRecords()) {
             Mat mat = matService.selectOne(new EntityWrapper<Mat>()
                     .eq("matnr", locDetl.getMatnr()));
-            locDetl.setStoreMax(mat.getStoreMax());
-            locDetl.setStoreMaxDate(mat.getStoreMaxDate());
-            locDetl.setStoreMin(mat.getStoreMin());
             if (Cools.isEmpty(mat)
                     || Cools.isEmpty(mat.getStoreMax())
                     || Cools.isEmpty(mat.getStoreMaxDate())
@@ -316,21 +315,30 @@
             } else if (locDetl.getBatch().length() != 8) {
                 continue;
             }
+            AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
+            abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
+            abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
+            abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
+            abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
+            abnormalLocDetlParam.setMaktx(mat.getMaktx());
+            abnormalLocDetlParam.setMatnr(mat.getMatnr());
+            abnormalLocDetlParam.setSpecs(mat.getSpecs());
+            abnormalLocDetlParam.setBatch(locDetl.getBatch());
             try {
                 SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
                 Date maxDate = simple.parse(locDetl.getBatch());
                 long time = maxDate.getTime();
                 Date now = new Date();
                 long time1 = now.getTime();
-                locDetl.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
+                abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
             if (locDetl.getAnfme() > mat.getStoreMax()) {
-                result.add(locDetl);
+                result.add(abnormalLocDetlParam);
                 continue;
             } else if (locDetl.getAnfme() < mat.getStoreMin()) {
-                result.add(locDetl);
+                result.add(abnormalLocDetlParam);
                 continue;
             }
 
@@ -345,14 +353,14 @@
                 maxDate = calendar.getTime();
                 Date now = new Date();
                 if (now.compareTo(maxDate) > 0) {
-                    result.add(locDetl);
+                    result.add(abnormalLocDetlParam);
                 }
             } catch (Exception e) {
                 continue;
             }
         }
 
-        Page<LocDetl> locDetlPage = new Page<>();
+        Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
         locDetlPage.setRecords(paging(result, curr, limit));
         locDetlPage.setTotal(result.size());
         locDetlPage.setCurrent(curr);
@@ -360,8 +368,8 @@
         return R.ok(locDetlPage);
     }
 
-    private List<LocDetl> paging(List<LocDetl> result, Integer curr, Integer limit) {
-        List<LocDetl> pageRecord = new ArrayList<LocDetl>();
+    private List<AbnormalLocDetlParam> paging(List<AbnormalLocDetlParam> result, Integer curr, Integer limit) {
+        List<AbnormalLocDetlParam> pageRecord = new ArrayList<AbnormalLocDetlParam>();
         int minIndex = (curr - 1) * limit;
         int maxIndex = (curr * limit) - 1;
         if (result.size() < maxIndex) {
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 86354b0..760adbd 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,26 +158,6 @@
     @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
-    /**
-     * 搴撳瓨棰勮鏁伴噺涓婇檺
-     */
-    private Double storeMax;
-
-    /**
-     * 搴撳瓨棰勮鏁伴噺涓嬮檺
-     */
-    private Double storeMin;
-
-    /**
-     * 搴撻緞棰勮涓婇檺
-     */
-    private Integer storeMaxDate;
-
-    /**
-     * 瀹為檯鍦ㄥ簱澶╂暟
-     */
-    private Integer nowTime;
-
 
     public String getLocNo$() {
         LocMastService service = SpringUtils.getBean(LocMastService.class);
diff --git a/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java
new file mode 100644
index 0000000..6063621
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java
@@ -0,0 +1,282 @@
+package com.zy.asrs.entity.param;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.LocMastService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+public class AbnormalLocDetlParam {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "搴撲綅鍙�")
+    @TableField("loc_no")
+    private String locNo;
+
+    @ApiModelProperty(value = "鎵樼洏鏉$爜")
+    private String zpallet;
+
+    @ApiModelProperty(value = "鏁伴噺")
+    @ExcelProperty("鏁伴噺")
+    private Double anfme;
+
+    @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty("鍟嗗搧缂栧彿")
+    private String matnr;
+
+    @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+    @ExcelProperty("鍟嗗搧鍚嶇О")
+    private String maktx;
+
+    @ApiModelProperty(value = "搴忓垪鐮�")
+    @ExcelProperty("搴忓垪鐮�")
+    private String batch;
+
+    @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+    @ExcelProperty("鍗曟嵁缂栧彿")
+    @TableField("order_no")
+    private String orderNo;
+
+    @ApiModelProperty(value = "c")
+    @ExcelProperty("瑙勬牸")
+    private String specs;
+
+    @ApiModelProperty(value = "鍨嬪彿")
+    private String model;
+
+    @ApiModelProperty(value = "棰滆壊")
+    private String color;
+
+    @ApiModelProperty(value = "鍝佺墝")
+    private String brand;
+
+    @ApiModelProperty(value = "鍗曚綅")
+    private String unit;
+
+    @ApiModelProperty(value = "鍗曚环")
+    private Double price;
+
+    @ApiModelProperty(value = "sku")
+    private String sku;
+
+    @ApiModelProperty(value = "鍗曚綅閲�")
+    private Double units;
+
+    @ApiModelProperty(value = "鏉$爜")
+    private String barcode;
+
+    @ApiModelProperty(value = "浜у湴")
+    private String origin;
+
+    @ApiModelProperty(value = "鍘傚")
+    private String manu;
+
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+    @TableField("manu_date")
+    private String manuDate;
+
+    @ApiModelProperty(value = "鍝侀」鏁�")
+    @TableField("item_num")
+    private String itemNum;
+
+    @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+    @TableField("safe_qty")
+    private Double safeQty;
+
+    @ApiModelProperty(value = "閲嶉噺")
+    private Double weight;
+
+    @ApiModelProperty(value = "闀垮害")
+    private Double length;
+
+    @ApiModelProperty(value = "浣撶Н")
+    private Double volume;
+
+    @ApiModelProperty(value = "涓夋柟缂栫爜")
+    @TableField("three_code")
+    private String threeCode;
+
+    @ApiModelProperty(value = "渚涘簲鍟�")
+    private String supp;
+
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+    @TableField("supp_code")
+    private String suppCode;
+
+    @ApiModelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @TableField("be_batch")
+    private Integer beBatch;
+
+    @ApiModelProperty(value = "淇濊川鏈�")
+    @TableField("dead_time")
+    private String deadTime;
+
+    @ApiModelProperty(value = "棰勮澶╂暟")
+    @TableField("dead_warn")
+    private Integer deadWarn;
+
+    @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    private Integer source;
+
+    @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    private Integer inspect;
+
+    @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    private Integer danger;
+
+    @ApiModelProperty(value = "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    @ApiModelProperty(value = "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    @ApiModelProperty(value = "澶囨敞")
+    private String memo;
+
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓婇檺
+     */
+    private Double storeMax;
+
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓嬮檺
+     */
+    private Double storeMin;
+
+    /**
+     * 搴撻緞棰勮涓婇檺
+     */
+    private Integer storeMaxDate;
+
+    /**
+     * 瀹為檯鍦ㄥ簱澶╂暟
+     */
+    private Integer nowTime;
+
+
+    public String getLocNo$() {
+        LocMastService service = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = service.selectById(this.locNo);
+        if (!Cools.isEmpty(locMast)) {
+            return String.valueOf(locMast.getLocNo());
+        }
+        return null;
+    }
+
+    public String getBeBatch$() {
+        if (null == this.beBatch) {
+            return null;
+        }
+        switch (this.beBatch) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.beBatch);
+        }
+    }
+
+    public String getSource$() {
+        if (null == this.source) {
+            return null;
+        }
+        switch (this.source) {
+            case 1:
+                return "鍒堕��";
+            case 2:
+                return "閲囪喘";
+            case 3:
+                return "澶栧崗";
+            default:
+                return String.valueOf(this.source);
+        }
+    }
+
+    public String getInspect$() {
+        if (null == this.inspect) {
+            return null;
+        }
+        switch (this.inspect) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.inspect);
+        }
+    }
+
+    public String getDanger$() {
+        if (null == this.danger) {
+            return null;
+        }
+        switch (this.danger) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.danger);
+        }
+    }
+
+    public String getModiUser$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.modiUser);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+    }
+
+    public String getAppeUser$() {
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.appeUser);
+        if (!Cools.isEmpty(user)) {
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
+
+}

--
Gitblit v1.9.1