From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase,仅需要有脚本变动的时候开启在执行,避免启动报错 3、原片仓储新增入库请求、出库情况,调整整体逻辑,增加格子号架子号,任务表、详情表、工位表都需要记录架子信息,用于任务执行过程中,架子在执行过程中可返回架子对应的工位上,避免架子乱放后格子架子号不对应的情况发生。

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index cfa07e3..4e5ec39 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -18,11 +18,13 @@
  */
 public interface DamageService extends MPJBaseService<Damage> {
 
-    List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
+    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+
+//    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
 
     void submitDamage(List<Damage> damageList);
 
-    void submitReport(Damage damage);
+    Boolean submitReport(Damage damage);
 
     /**
      * 鍗曚釜鐮存崯
@@ -44,5 +46,5 @@
 
     void deleteByGlassId(String glassId);
 
-    void sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
 }

--
Gitblit v1.8.0