From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/OpenService.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 2108b95..93c86d9 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,9 +1,11 @@
package com.zy.asrs.service;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.ViewWorkInBean;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.common.model.LocDetlDto;
import java.util.List;
@@ -43,7 +45,7 @@
* 鍚屾鍟嗗搧淇℃伅
* @param param
*/
- MatSyncParam syncMat(MatSyncParam param);
+ Mat syncMat(MatSyncParam param);
/**
* 鍏ュ簱閫氱煡妗ｇ敓鎴�
@@ -58,6 +60,27 @@
/**
* 鍑哄簱璁板綍鑾峰彇
*/
- void outlogERP();
+ List<ViewWorkInBean> outlogERP();
+ /**
+ * 鍚屾鍟嗗搧淇℃伅
+ * @param param
+ */
+ boolean syncMat(MatInfoParam param);
+
+ /**
+ * 鐢熸垚鍑哄叆搴撳崟鎹�
+ * @param param
+ */
+ boolean syncOrder(OrderSyncParam param, boolean pakin, String docName);
+
+ /**
+ * 鐢熸垚鍑哄叆搴撳崟鎹�
+ */
+ boolean orderDelete(String orderNo);
+
+ /*
+ 搴撳瓨鐩樼偣
+ */
+ boolean checkAndAdjustLocDetl(CheckParam params);
}
--
Gitblit v1.9.1