From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index ccd52fc..c6630aa 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,12 +1,15 @@
 package com.zy.common.model;
 
+import com.alibaba.fastjson.JSON;
 import com.core.exception.CoolException;
-import com.zy.core.model.protocol.StaProtocol;
+import com.zy.asrs.entity.BasDevp;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Created by vincent on 2020/10/19
  */
+@Slf4j
 @Data
 public class LocTypeDto {
 
@@ -22,31 +25,16 @@
     public LocTypeDto() {
     }
 
-    public LocTypeDto(StaProtocol staProtocol) {
-        if (staProtocol.isHigh() == staProtocol.isLow()) {
+    public LocTypeDto(BasDevp basDevp) {
+        if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
             throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
         }
-        if (staProtocol.isLow()) {
+        if (basDevp.getLocType1() == 1) {
             this.locType1 = 1; // 浣庡簱浣�
         } else {
             this.locType1 = 2; // 楂樺簱浣�
         }
-    }
-
-    /**
-     * 搴撲綅绫诲瀷瑙f瀽
-     */
-    public static LocTypeDto process(StaProtocol staProtocol) {
-        LocTypeDto dto = new LocTypeDto();
-        if (staProtocol.isHigh() == staProtocol.isLow()) {
-            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-        }
-        if (staProtocol.isLow()) {
-            dto.setLocType1((short) 1); // 浣庡簱浣�
-        } else {
-            dto.setLocType1((short) 2); // 楂樺簱浣�
-        }
-        return dto;
+        log.info(JSON.toJSONString(this));
     }
 
 }

--
Gitblit v1.9.1