From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 15 十一月 2023 18:57:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java index 908e90b..7194588 100644 --- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java +++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/CustomerOrderService.java @@ -26,6 +26,7 @@ import com.chinaztt.mes.plan.entity.CustomerOrderForJointStockCompany; import com.chinaztt.mes.plan.entity.MasterProductionSchedule; import com.chinaztt.mes.plan.entity.ProcessConfigFileOrderMapping; +import com.chinaztt.mes.plan.vo.CustomerOrderVO1; import com.chinaztt.mes.quality.dto.CustomOrderSyncDTO; import com.chinaztt.mes.technology.entity.Document; import com.chinaztt.mes.warehouse.dto.PackagingDTO; @@ -141,7 +142,7 @@ * @param id * @return */ - CustomerOrderDTO getCustomerOrderById(Long id); + CustomerOrderVO1 getCustomerOrderById(Long id); /** * 璁㈠崟琛屽叧鑱斿伐鑹烘枃浠� @@ -164,10 +165,10 @@ * 鍚屾otc鎺ュ彛 * * @param selectTime - * @param pathCode 0:鍘熻矾寰�;1:璁㈠崟鎵�灞炲叕鍙镐负ZTKJ鐨勮鍗� + * @param orderNo * @return */ - R otcCustomerOrderSync(String selectTime, String pathCode); + R otcCustomerOrderSync(String selectTime, String orderNo); /** * 鑷姩鍚屾otc鎺ュ彛鐢ㄤ簬瀹氭椂浠诲姟姣忎釜灏忔椂1娆� -- Gitblit v1.9.3