From e918d4fa4f5065b51be706f21da6793c378c9aaf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 16 八月 2025 17:05:05 +0800
Subject: [PATCH] 接口文档修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckObjParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseSyncParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java | 5 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SaveCheckDiffParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java | 23 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 10 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderItem.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OpStockParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/PublicToStockParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatGroupParams.java | 26 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReceiptParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java | 34 +++++---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java | 2
rsf-server/src/main/resources/mapper/manager/LocMapper.xml | 23 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OtherReceiptParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WkOrderDto.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/TaskInParam.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 9 --
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 2
37 files changed, 133 insertions(+), 69 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index f6b67dc..9d7c18f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.system.controller.BaseController;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java
similarity index 78%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java
index 901c901..f5a9690 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java
@@ -1,17 +1,18 @@
-package com.vincent.rsf.server.api.controller;
+package com.vincent.rsf.server.api.controller.erp;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.BaseMatParms;
-import com.vincent.rsf.server.api.controller.params.OrderParams;
-import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
+import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
+import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
+import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -38,13 +39,14 @@
*/
@RestController
@RequestMapping("/erp")
-@Api(tags = "ERP鎺ュ彛瀵规帴")
public class ReceiveMsgController extends BaseController {
@Autowired
private ReceiveMsgService receiveMsgService;
@Autowired
private MatnrService matnrService;
+ @Autowired
+ private MatnrGroupService matnrGroupService;
/**
@@ -54,7 +56,7 @@
* @return
* @time 2025/3/4 13:57
*/
- @ApiOperation(value = "鎺ユ敹鍚屾ERP閲囪喘鍗�")
+ @ApiOperation(value = "鎺ユ敹鍚屾ERP閲囪喘鍗�", tags = "鍗曟嵁鍚屾")
@PostMapping("/sync/purchase")
public R syncPurchases(@RequestBody List<OrderParams> orders) {
if (orders.isEmpty()) {
@@ -74,7 +76,7 @@
* @description: DO鍗曞悓姝�
* @version 1.0
*/
- @ApiOperation("鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)")
+ @ApiOperation(value = "鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)", tags = "鍗曟嵁鍚屾")
@PostMapping("/sync/delivery")
public R syncDelivery(@RequestBody List<OrderParams> orders) {
if (!receiveMsgService.syncPurchasee(orders)) {
@@ -91,7 +93,7 @@
* @return
* @time 2025/3/12 16:56
*/
- @ApiOperation("璐ㄦ缁撴灉鍚屾")
+ @ApiOperation(value = "璐ㄦ缁撴灉鍚屾", tags = "鍗曟嵁鍚屾")
@PostMapping("/sync/inspect")
public void syncQlyInspect(HttpServletRequest request, HttpServletResponse response) {
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
@@ -103,17 +105,24 @@
}
- @ApiOperation("鍩虹鐗╂枡淇℃伅鍚屾")
+ @ApiOperation(value = "鍩虹鐗╂枡淇℃伅鍚屾", tags = "鍩虹淇℃伅鍚屾")
@PostMapping("/sync/base/matnrs")
public R syncMatnrs(@RequestBody List<BaseMatParms> matnrs) {
if (Objects.isNull(matnrs)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛�1");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛�");
}
receiveMsgService.syncMatnrs(matnrs);
return R.ok();
}
- @ApiOperation("鏌ヨ鍗曟嵁鐘舵��")
+ @ApiOperation(value = "鏌ヨ鍒嗙被淇℃伅", tags = "鏌ヨ")
+ @PostMapping("/query/matnr/group")
+ public R syncMatGroup() {
+ return R.ok().add(matnrGroupService.list());
+ }
+
+
+ @ApiOperation(value = "鏌ヨ鍗曟嵁鐘舵�佸強鏄庣粏", tags = "鏌ヨ")
@PostMapping("/query/order")
public R queryOrderStatus(@RequestBody QueryOrderParam queryParams) {
if (Objects.isNull(queryParams)) {
@@ -130,12 +139,11 @@
* @version 1.0
*/
@PostMapping("/sync/locs/detls")
- @ApiOperation("搴撲綅淇℃伅鏄庣粏鍚屾")
+ @ApiOperation(value = "搴撲綅淇℃伅鏄庣粏鍚屾", tags = "鍩虹淇℃伅鍚屾")
public R syncLocDetls(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
QueryWrapper<Loc> wrapper = pageParam.buildWrapper(true);
-
return receiveMsgService.syncLocsDetl(pageParam, wrapper);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReportMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
similarity index 90%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReportMsgController.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
index eb916b4..b786e62 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReportMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller;
+package com.vincent.rsf.server.api.controller.erp;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseMatParms.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
similarity index 94%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseMatParms.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
index d1acc08..1d0c087 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseMatParms.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModelProperty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseSyncParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseSyncParams.java
similarity index 80%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseSyncParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseSyncParams.java
index 8c9019c..038fe39 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseSyncParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseSyncParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/CheckObjParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckObjParams.java
similarity index 89%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/CheckObjParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckObjParams.java
index 7476746..93840fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/CheckObjParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckObjParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ManualShelvingParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
similarity index 92%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ManualShelvingParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
index e81563c..af7757a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ManualShelvingParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OpStockParams.java
similarity index 88%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OpStockParams.java
index a0f2e0a..d9a74e8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OpStockParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderItem.java
similarity index 95%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderItem.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderItem.java
index 0006660..17457b8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderItem.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
similarity index 96%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
index 91aaad7..effee8b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OtherReceiptParams.java
similarity index 91%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OtherReceiptParams.java
index 7feca0c..b7f240d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OtherReceiptParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/PublicToStockParams.java
similarity index 90%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/PublicToStockParams.java
index b059381..74de32a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/PublicToStockParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import io.swagger.annotations.ApiModel;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/QueryOrderParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java
similarity index 90%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/QueryOrderParam.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java
index 535e5fa..26f2703 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/QueryOrderParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ReceiptParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReceiptParams.java
similarity index 92%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ReceiptParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReceiptParams.java
index a933489..c2341b6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ReceiptParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReceiptParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import io.swagger.annotations.ApiModel;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/SaveCheckDiffParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SaveCheckDiffParams.java
similarity index 91%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/SaveCheckDiffParams.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SaveCheckDiffParams.java
index 924ccd5..1c0fe37 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/SaveCheckDiffParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SaveCheckDiffParams.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.vincent.rsf.server.manager.entity.CheckDiffItem;
import com.vincent.rsf.server.manager.entity.TaskItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/TaskInParam.java
similarity index 93%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/TaskInParam.java
index 2e2b56b..32d3435 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/TaskInParam.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/WkOrderDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WkOrderDto.java
similarity index 90%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/WkOrderDto.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WkOrderDto.java
index ee677b9..6e84267 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/WkOrderDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WkOrderDto.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.controller.params;
+package com.vincent.rsf.server.api.controller.erp.params;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
index f244c17..95ae94f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -1,7 +1,6 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.OpStockParams;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index 5ef37c3..5f368f8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -4,7 +4,10 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.erp.params.ManualShelvingParams;
+import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
+import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index 9725c26..f4c04ff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java
index 38565a6..d0a8a24 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java
@@ -1,6 +1,6 @@
package com.vincent.rsf.server.api.entity.dto;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import lombok.Data;
@Data
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index 7e2eecd..a1f361b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -1,20 +1,11 @@
package com.vincent.rsf.server.api.entity.dto;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.vincent.rsf.server.api.controller.params.ReceiptParams;
-import com.vincent.rsf.server.common.utils.CommonUtil;
-import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
import java.util.Map;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index d3de1b1..5ce4eff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -1,7 +1,10 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
+import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
+import com.vincent.rsf.server.api.controller.erp.params.PublicToStockParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
index 1a69f45..13e3339 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import java.util.Map;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
index 71faa49..310d88c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.BaseMatParms;
-import com.vincent.rsf.server.api.controller.params.OrderParams;
-import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
+import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
+import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
+import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Loc;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
index 5d0444f..f40ea7c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
public interface WcsService {
InTaskMsgDto createInTask(TaskInParam param);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index c8b78f0..23933bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 8c13859..e1e6599 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 61376e7..e01e3ff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.BaseMatParms;
-import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
-import com.vincent.rsf.server.api.controller.params.WkOrderDto;
+import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
+import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
+import com.vincent.rsf.server.api.controller.erp.params.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
@@ -18,7 +18,7 @@
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.api.controller.params.OrderParams;
+import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
@@ -215,7 +215,7 @@
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
IPage<LocStockDto> locStocks = locService.getLocDetls(page);
- return null;
+ return R.ok().add(locStocks);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index c6bec07..e6a36bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
index 0b4fc0b..9d7c34b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
@@ -1,17 +1,14 @@
package com.vincent.rsf.server.api.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.vincent.rsf.framework.common.Arith;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,8 +17,6 @@
import javax.annotation.PostConstruct;
-import javax.annotation.RegEx;
-import javax.annotation.Resource;
import java.util.List;
@Component
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
index 35bd8d2..4dc8b27 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
@@ -2,6 +2,8 @@
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -40,13 +42,30 @@
.select()
//apis锛� 娣诲姞swagger鎺ュ彛鎻愬彇鑼冨洿
.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+// .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.manager.controller"))
.paths(PathSelectors.any())
- .build()
- ;
+ .build();
return docket;
}
+ @Bean
+ public Docket erpDocket() {
+ Docket docket = new Docket(DocumentationType.OAS_30)
+ .apiInfo(apiInfo())
+ .enable("dev".equals(active))
+ .groupName("ERP鎺ュ彛瀵规帴")
+ .select()
+ //apis锛� 娣诲姞swagger鎺ュ彛鎻愬彇鑼冨洿
+ .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.api.controller.erp"))
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build();
+
+ return docket;
+ }
+
+
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
index 81d6fed..c41549f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
@@ -30,7 +30,7 @@
private String matnr;
@ApiModelProperty("瑙勬牸灞炴��")
- private String specs;
+ private String spec;
@ApiModelProperty("鎵规")
private String batch;
@@ -39,7 +39,7 @@
private Double anfme;
@ApiModelProperty("渚涘簲鍟�")
- private String supplier;
+ private String splrId;
@ApiModelProperty("鍗曚綅")
private String unit;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatGroupParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatGroupParams.java
new file mode 100644
index 0000000..0f1d6bf
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatGroupParams.java
@@ -0,0 +1,26 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "MatGroupParams", description = "鐗╂枡鍒嗙被")
+public class MatGroupParams implements Serializable {
+
+ @ApiModelProperty("鍒嗙被鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("鍒嗙被缂栫爜")
+ private String code;
+
+ @ApiModelProperty("涓婄骇缂栫爜")
+ private String parCode;
+
+ @ApiModelProperty("搴忓垪鍙�")
+ private Integer sort;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 58b8709..36e4db5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 79bde62..414becc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
@@ -33,7 +33,6 @@
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
@Service("taskService")
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
diff --git a/rsf-server/src/main/resources/mapper/manager/LocMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
index 330516c..5f4e0e1 100644
--- a/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
@@ -14,6 +14,27 @@
use_status
</select>
<select id="getLocDetls" resultType="com.vincent.rsf.server.manager.controller.dto.LocStockDto">
-
+ SELECT
+ li.loc_code,
+ li.loc_id,
+ l.barcode,
+ li.matnr_code AS matnr,
+ li.matnr_id,
+ li.maktx,
+ li.spec,
+ li.batch,
+ SUM( li.anfme ) anfme,
+ splr_id,
+ li.unit,
+ l.update_time
+ FROM
+ man_loc l
+ LEFT JOIN man_loc_item li ON l.id = li.loc_id
+ GROUP BY
+ loc_id,
+ matnr_id,
+ batch
+ ORDER BY
+ update_time DESC
</select>
</mapper>
--
Gitblit v1.9.1