Browse Source

PDA生产退仓、生产领退料现在用存储过程形式

master
shenzhouyu 2 weeks ago
parent
commit
ed1a83dd6f
  1. 27
      src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java
  2. 1
      src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java
  3. 7
      src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java

27
src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java

@ -106,6 +106,33 @@ public class ProductionReturnController extends AbstractController {
}
}
@PostMapping("getQualifiedReturnListByProcedure")
public R getQualifiedReturnListByProcedure(@RequestBody Map<String, Object> params) {
try {
String warehouseId = (String) params.get("warehouseId");
String searchCode = (String) params.get("searchCode");
String site = (String) params.get("site");
String status = (String) params.get("status");
if (warehouseId == null || warehouseId.trim().isEmpty()) {
return R.error("仓库ID不能为空");
}
// 默认状态为待入库
if (status == null || status.trim().isEmpty()) {
status = "待入库";
}
List<Map<String, Object>> resultList = productionReturnService.getQualifiedReturnListByProcedure(
site, warehouseId, searchCode, status);
return R.ok().put("data", resultList);
} catch (Exception e) {
logger.error("获取生产待入库列表失败", e);
return R.error("获取数据失败: " + e.getMessage());
}
}
/**
* 获取生产入库单详情
*/

1
src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java

@ -25,6 +25,7 @@ public interface ProductionReturnService {
* @return 待入库列表
*/
List<Map<String, Object>> getQualifiedInboundList(String site, String warehouseId, String searchCode, String status);
List<Map<String, Object>> getQualifiedReturnListByProcedure(String site, String warehouseId, String searchCode, String status);
/**
* 获取生产入库单详情

7
src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java

@ -79,6 +79,13 @@ public class ProductionReturnServiceImpl implements ProductionReturnService {
return productionReturnMapper.getQualifiedInboundList(site, warehouseId, searchCode, status, sysUserEntity.getUsername());
}
@Override
public List<Map<String, Object>> getQualifiedReturnListByProcedure(String site, String warehouseId, String searchCode, String status) {
SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
// 从inbound_notification_head表获取列表,关联SFDC_ROLLS表统计
return procedureMapper.getProcedureData("dbo.usp_GetQualifiedReturnList", Arrays.<Object>asList(site, searchCode, sysUserEntity.getUsername()));
}
@Override
public Map<String, Object> getInboundDetails(String orderNo, String warehouseId, String site, String buNo) {
// 从inbound_notification_head表获取基本信息,关联SFDC_ROLLS表统计标签数据

Loading…
Cancel
Save