From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案, 如何实现,对现有找库位规则进行整改,数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位,离线设备不分配 3、库位分配要均衡到每一个设备  4、库位高度需要匹配到对应库位信息,低库位能向上兼容  5、空托盘优先放在locType2库位=1的库位,没有这种库位了,允许放到其他库位 6、给入库站点设置有限去那些堆垛机,其次去那些堆垛机,弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置,当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频,如果是高频则从前往后找库位,如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   44 +++++++++++++-------------------------------
 1 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e1bfb4c..4e40c79 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,6 +40,16 @@
     @TableField("order_no")
     private String orderNo;
 
+    @ApiModelProperty(value= "寤鸿鍏ュ簱鍖哄煙锛氬爢鍨涙満鍙�")
+    private String origin;
+
+    @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+    @TableField("freq_type")
+    private Integer freqType;
+
+    @ApiModelProperty(value= "搴撲綅缂栫爜锛岃嫢鏈夛紝鍒欏瓨鍌ㄥ埌鎸囧畾搴撲綅銆備负鍚庣画鍒嗗尯棰勭暀")
+    private String manu;
+
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
@@ -70,12 +76,6 @@
 
     @ApiModelProperty(value= "鏉$爜")
     private String barcode;
-
-    @ApiModelProperty(value= "浜у湴")
-    private String origin;
-
-    @ApiModelProperty(value= "鍘傚")
-    private String manu;
 
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
@@ -160,19 +160,19 @@
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1 = "";
+    private String standby1 = "1";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2 = "";
+    private String standby2 = "1";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3 = "";
+    private String standby3 = "1";
 
     /**
      * 澶囩敤1
@@ -257,24 +257,6 @@
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
-    }
-
-    public String getBoxType1$(){
-        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
-        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
-        if (!Cools.isEmpty(processProcedures)){
-            return String.valueOf(processProcedures.getBoxSpecs());
-        }
-        return this.boxType1;
-    }
-
-    public String getBoxType2$(){
-        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
-        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
-        if (!Cools.isEmpty(basQualityTesting)){
-            return String.valueOf(basQualityTesting.getBoxSpecs());
-        }
-        return this.boxType1;
     }
 
     public void sync(Object source) {

--
Gitblit v1.9.1