From 9bb2ae7c767b0391b866a7fbff99bbe000b58f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 6 Jun 2024 10:40:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E9=AB=98=E8=AE=BE=E5=A4=87=E4=BA=A7?= =?UTF-8?q?=E8=83=BD=202.=E4=BC=98=E5=8C=96=E6=8E=92=E4=BA=A7=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E7=BB=93=E6=9E=9C=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=8A=E6=97=A5=E5=BF=97=E8=BE=93=E5=85=A5=E5=87=BA=203.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E7=94=B1=E8=BE=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=8F=8A=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=204.=E4=BF=AE=E5=A4=8D3=E5=9E=AE=E5=B9=B3=E9=93=81=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/pc/Constant.java | 3 +- .../java/com/dsic/gj_erp/pc/DataFactory.java | 9 +++-- .../dsic/gj_erp/pc/dto/gx/工序31光电.java | 33 +++++++++++++++++++ .../dsic/gj_erp/pc/dto/sb/设备31光电.java | 11 +++++++ .../dsic/gj_erp/pc/dto/tlt/三跨平铁.java | 1 + 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/pc/dto/gx/工序31光电.java create mode 100644 src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java diff --git a/src/main/java/com/dsic/gj_erp/pc/Constant.java b/src/main/java/com/dsic/gj_erp/pc/Constant.java index 519ee2a..4b85413 100644 --- a/src/main/java/com/dsic/gj_erp/pc/Constant.java +++ b/src/main/java/com/dsic/gj_erp/pc/Constant.java @@ -51,6 +51,7 @@ public interface Constant { 打磨01(工序.打磨, "打磨01", "", 2.0, 3.0, 100.0, 13.0, 13.0), 自由边处理01(工序.自由边处理, "自由边处理01", "", 2.0, 3.0, 100.0, 13.0, 13.0), + 光电01(工序.光电结束, "光电01", "", 2.0, 3.0, 100.0, 13.0, 13.0), 未知01(工序.NULL, "未知01", "", 2.0, 3.0, 100.0, 13.0, 13.0), ; public 工序 _工序; @@ -82,7 +83,7 @@ public interface Constant { 倒棱("09"), 切端头("11"), 预配盘(""), - 光电结束(""), + 光电结束("66"), 配送(""), ; diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java index f22a771..cf860c3 100644 --- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java +++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java @@ -290,7 +290,7 @@ public class DataFactory { return new 七跨型板().小组(bom); case "161110": return new 七跨型板().大组(bom); - case "171010": + case "171120": return new 光电().小组(bom); default: return null; @@ -358,10 +358,13 @@ public class DataFactory { .put(Constant.设备产能.自由边处理01.设备编号, new 设备21自由边处理(Constant.设备产能.自由边处理01)) .build(); return new 工序21自由边处理(_设备); + case 光电结束: + _设备=ImmutableMap.builder() + .put(Constant.设备产能.光电01.设备编号, new 设备31光电(Constant.设备产能.光电01)) + .build(); + return new 工序31光电(_设备); // case 预配盘: // return new 工序01上料(_工序,_设备); -// case 光电结束: -// return new 工序01上料(_工序,_设备); // case 配送: // return new 工序01上料(_工序,_设备); default: diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/gx/工序31光电.java b/src/main/java/com/dsic/gj_erp/pc/dto/gx/工序31光电.java new file mode 100644 index 0000000..6b600a0 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/dto/gx/工序31光电.java @@ -0,0 +1,33 @@ +package com.dsic.gj_erp.pc.dto.gx; + +import com.dsic.gj_erp.pc.Constant; +import com.dsic.gj_erp.pc.dto.工序产能; +import com.dsic.gj_erp.pc.dto.设备; +import lombok.Getter; +import lombok.Setter; + +import java.util.Map; + +@Getter +@Setter +public class 工序31光电 extends 工序产能 { + public 工序31光电(Map _设备) { + super(Constant.工序.光电结束,_设备); + } + + @Override + public void 计算工作量() { + this.产能=0; + if (this.白班时长>0){ + this.产能+=this.白班时长*Constant.设备产能.型材01.get白班设备产能()/7.0; + } + if (this.二班时长>0){ + this.产能+=this.二班时长*Constant.设备产能.型材01.get二班设备产能()/7.0; + } + } + + @Override + public void 占用资源(double 所需产能) { + super.占用资源(所需产能); + } +} diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java new file mode 100644 index 0000000..7ab7308 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java @@ -0,0 +1,11 @@ +package com.dsic.gj_erp.pc.dto.sb; + +import com.dsic.gj_erp.pc.Constant; +import com.dsic.gj_erp.pc.dto.设备; + +public class 设备31光电 extends 设备 { + + public 设备31光电(Constant.设备产能 _设备产能) { + super(_设备产能); + } +} diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/tlt/三跨平铁.java b/src/main/java/com/dsic/gj_erp/pc/dto/tlt/三跨平铁.java index 1eae494..9961a4a 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/tlt/三跨平铁.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/tlt/三跨平铁.java @@ -44,6 +44,7 @@ public class 三跨平铁 extends 套料图工序 { public 三跨平铁 焊接机器人肘板(Bom bom) { this.kw = "6"; this.zl = "4230"; + this.bom = bom; this.工序 = ImmutableList.builder() .add(Constant.工序.上料) .add(Constant.工序.抛丸)