diff --git a/op-api/op-api-system/op-api-system.iml b/op-api/op-api-system/op-api-system.iml
deleted file mode 100644
index 56a20a076..000000000
--- a/op-api/op-api-system/op-api-system.iml
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
index b08684dc6..3a9584651 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
@@ -48,4 +48,7 @@ public interface RemoteOpenService {
@PostMapping("/openInterface/sendWeChartMessage")
public AjaxResult sendWeChartMessage(@RequestBody List wechartDTO);
+
+ @PostMapping("/openInterface/getDeliveryNoteDetail")
+ public AjaxResult getDeliveryNoteDetail(@RequestBody Map paramMap);
}
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
index ec6d37d8a..7c9b4292d 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
@@ -62,6 +62,11 @@ public class RemoteOpenFallbackFactory implements FallbackFactory wechartDTO) {
return AjaxResult.error("消息发送失败:" + throwable.getMessage());
}
+
+ @Override
+ public AjaxResult getDeliveryNoteDetail(Map paramMap) {
+ return AjaxResult.error("送货单获取失败:" + throwable.getMessage());
+ }
};
}
}
diff --git a/op-common/op-common-swagger/op-common-swagger.iml b/op-common/op-common-swagger/op-common-swagger.iml
deleted file mode 100644
index e0cb242b5..000000000
--- a/op-common/op-common-swagger/op-common-swagger.iml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
index a2ac37197..eadd4fe8b 100644
--- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
+++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
@@ -239,4 +239,9 @@ public class OpenController extends BaseController {
public AjaxResult sendWeChartMessage(@RequestBody List wechartDTO) {
return openService.sendWeChartMessage(wechartDTO);
}
+
+ @PostMapping("/getDeliveryNoteDetail")
+ public AjaxResult getDeliveryNoteDetail(@RequestBody Map paramMap) {
+ return openService.getDeliveryNoteDetail(paramMap);
+ }
}
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
index 53a5a1b6e..f0d1f62c7 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
@@ -41,4 +41,6 @@ public interface OpenService {
AjaxResult GetHrPostInfo();
AjaxResult sendWeChartMessage(List wechartDTO);
+
+ AjaxResult getDeliveryNoteDetail(Map paramMap);
}
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 1f7428f8c..f534ac2c7 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -72,6 +72,9 @@ public class OpenServiceImpl implements OpenService {
@Value("${WeChart.url}")
private String weChartUrl;
+ @Value("${SRM.url}")
+ private String SrmUrl;
+
@Autowired
private OpenMapper openMapper;
@@ -618,6 +621,8 @@ public class OpenServiceImpl implements OpenService {
}
}
+
+
protected Boolean oneMinHas(Date lastData){
if(lastData != null){
int year= Integer.parseInt(String.format("%tY", lastData));
@@ -648,4 +653,17 @@ public class OpenServiceImpl implements OpenService {
System.out.println("++++++++++++检验任务1分钟内生成过，不再重复创建++++++++++++++");
}
}
+
+ @Override
+ public AjaxResult getDeliveryNoteDetail(Map paramMap) {
+ try {
+ //String url = SrmUrl+paramMap.get("id");
+ String result = HttpUtils.sendPost(SrmUrl,"id="+paramMap.get("id").toString());
+ JSONArray jsonArray=JSONArray.parseArray(result);
+ return success("获取成功",jsonArray);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(e.getMessage());
+ }
+ }
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 0113532dd..86e9de660 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -6,15 +6,14 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.domain.R;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
-import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.system.api.RemoteQualityService;
-import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO;
import com.op.system.api.domain.wms.wmsReportWork;
import com.op.system.api.RemoteSapService;
import com.op.wms.domain.*;