diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java index feed6ef..0cf4bf4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java @@ -1,17 +1,21 @@ package org.nl.wms.ext_manage.controller; import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.dto.mes.MesBackMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesCallMaterialRequestDto; import org.nl.wms.ext_manage.service.MesToWmsService; +import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; /** * MES接口controller @@ -27,6 +31,9 @@ public class MesToWmsController { @Resource private MesToWmsService mesToWmsService; + @Autowired + private PdaIosOutService pdaIosOutService; + @PostMapping("/callMaterial") @SaIgnore @Log("MES请求叫料") @@ -40,4 +47,12 @@ public class MesToWmsController { public ResponseEntity backMaterial(@RequestBody @Validated MesBackMaterialRequestDto param) { return new ResponseEntity<>(mesToWmsService.backMaterial(param), HttpStatus.OK); } + + + @GetMapping("/getStructIvt") + @Log("查询库存") + @SaIgnore + public ResponseEntity getStructIvt(@RequestParam JSONObject whereJson) { + return new ResponseEntity<>(pdaIosOutService.getStructivtByMaterialAndSectCode(whereJson), HttpStatus.OK); + } }