|
|
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.awt.image.Kernel;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
@@ -476,8 +477,10 @@ public class WMSController extends BaseRESTfulController {
|
|
|
Integer apiId,
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
- String con) {
|
|
|
- return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
|
|
|
+ String con,
|
|
|
+ String startTime,
|
|
|
+ String endTime) {
|
|
|
+ return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -704,7 +707,7 @@ public class WMSController extends BaseRESTfulController {
|
|
|
return wmsFeign.updateInstruction(map);
|
|
|
}
|
|
|
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
@PostMapping("/getIvboundMakeResultList")
|
|
|
@ApiOperation(value = "展示倒库列表")
|
|
|
@@ -785,38 +788,93 @@ public class WMSController extends BaseRESTfulController {
|
|
|
return wmsFeign.getNewDistribute(personnelWorkshopid);
|
|
|
}
|
|
|
|
|
|
- // 获取物资类型
|
|
|
- @PostMapping(value = "/getMaterialTypeList")
|
|
|
- public Map<String,Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
|
|
|
- @RequestParam("stackingId") BigDecimal stackingId,
|
|
|
- @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
|
|
|
- @RequestParam("pageNum") Integer pageNum,
|
|
|
- @RequestParam("pageSize") Integer pageSize,
|
|
|
- @RequestParam("apiId") Integer apiId){
|
|
|
- return wmsFeign.getMaterialTypeList(warehouseid,stackingId,gradtionNumber,pageNum,pageSize,apiId);
|
|
|
+
|
|
|
+// @PostMapping("/createRestackMakeResult")
|
|
|
+// public RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
|
|
|
+// @RequestParam("beforeLevel")BigDecimal beforeLevel,
|
|
|
+// @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
|
|
|
+// @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
|
|
|
+// @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
|
|
|
+// @RequestParam("resultRemark")String resultRemark,
|
|
|
+// @RequestBody(required = false) List<Map<String,Object>> mps){
|
|
|
+// return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //收发存
|
|
|
+ @PostMapping("/addSendReceive")
|
|
|
+ public RESTfulResult addSendReceive() {
|
|
|
+ return wmsFeign.addSendReceive();
|
|
|
+ }
|
|
|
+
|
|
|
+ // 获取物资类型
|
|
|
+ @PostMapping(value = "/getMaterialTypeList")
|
|
|
+ public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
|
|
|
+ @RequestParam("stackingId") BigDecimal stackingId,
|
|
|
+ @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
|
|
|
+ @RequestParam("pageNum") Integer pageNum,
|
|
|
+ @RequestParam("pageSize") Integer pageSize,
|
|
|
+ @RequestParam("apiId") Integer apiId){
|
|
|
+ return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @ApiOperation("进入出库扫码页面，查询出库物资信息详情")
|
|
|
+ @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
|
|
|
+ @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
|
|
|
+ public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
|
|
|
+ return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostMapping("/wmspoutboundresults/deleteGridMaterial")
|
|
|
+ public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
|
|
|
+ return wmsFeign.deleteGridMaterial(materialOnlyCode);
|
|
|
}
|
|
|
|
|
|
-// 创建倒垛单
|
|
|
@PostMapping(value = "/createRestackMakeResult")
|
|
|
- public Map<String,Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
|
|
|
- @RequestParam("beforeLevel")BigDecimal beforeLevel,
|
|
|
- @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
|
|
|
- @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
|
|
|
- @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
|
|
|
- @RequestParam("resultRemark")String resultRemark,
|
|
|
- @RequestBody(required = false) List<Map<String,Object>> mps){
|
|
|
- return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
|
|
|
+ public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
|
|
|
+ @RequestParam("beforeLevel") BigDecimal beforeLevel,
|
|
|
+ @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
|
|
|
+ @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
|
|
|
+ @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
|
|
|
+ @RequestParam("resultRemark") String resultRemark,
|
|
|
+ @RequestBody(required = false) List < Map < String, Object >> mps){
|
|
|
+ return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
|
|
|
}
|
|
|
+
|
|
|
+ //修改实时库存,针对倒垛
|
|
|
+ @PostMapping(value = "/updateWmspGridMaterialForRestack")
|
|
|
+ public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
|
|
|
+ return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ //修改实时库存,针对倒垛
|
|
|
+ @PostMapping(value = "/getStockTakingList")
|
|
|
+ public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
|
|
|
+ @RequestParam(value = "pageSize") Integer pageSize,
|
|
|
+ @RequestParam(value = "apiId") Integer apiId){
|
|
|
+ return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
|
|
|
+ }
|
|
|
+ // 根据倒垛单ID获得物资类型
|
|
|
+ @GetMapping(value = "getRestackMakeTypeResult")
|
|
|
+ public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
|
|
|
+ @RequestParam("context") String context){
|
|
|
+ return wmsFeign.getRestackMakeTypeResult(restackMake, context);
|
|
|
+ }
|
|
|
+ // 改变已经稽核的吊牌信息
|
|
|
+ @GetMapping(value = "changeRestackMakeResult")
|
|
|
+ public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
|
|
|
+ return wmsFeign.changeRestackMakeResult(restackMake);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
//PDA根据仓库id查找倒垛单
|
|
|
@GetMapping(value = "selectRestackByWarehouseIds")
|
|
|
public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
|
|
|
return wmsFeign.selectRestackByWarehouseIds(warehouseid);
|
|
|
}
|
|
|
- //修改实时库存,针对倒垛
|
|
|
- @PostMapping(value = "/updateWmspGridMaterialForRestack")
|
|
|
- public Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> mapValue) {
|
|
|
- return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
|
|
|
- }
|
|
|
|
|
|
//修改实时库存,针对倒垛
|
|
|
@PostMapping(value = "/insertStockTaking")
|
|
|
@@ -825,13 +883,6 @@ public class WMSController extends BaseRESTfulController {
|
|
|
@RequestParam(value = "quantity") Integer quantity) {
|
|
|
return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
|
|
|
}
|
|
|
- //修改实时库存,针对倒垛
|
|
|
- @PostMapping(value = "/getStockTakingList")
|
|
|
- public Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
|
|
|
- @RequestParam(value = "pageSize") Integer pageSize,
|
|
|
- @RequestParam(value = "apiId") Integer apiId) {
|
|
|
- return wmsFeign.getStockTakingList(pageNum,pageSize,apiId);
|
|
|
- }
|
|
|
// 查询所有的钢材物资信息
|
|
|
@PostMapping(value = "/getSteelMaterialList")
|
|
|
public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
|
|
|
@@ -839,15 +890,6 @@ public class WMSController extends BaseRESTfulController {
|
|
|
@RequestParam(value = "apiId") Integer apiId) {
|
|
|
return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
|
|
|
}
|
|
|
- // 根据倒垛单ID获得物资类型
|
|
|
- @GetMapping(value = "getRestackMakeTypeResult")
|
|
|
- public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,
|
|
|
- @RequestParam("context")String context){
|
|
|
- return wmsFeign.getRestackMakeTypeResult(restackMake,context);
|
|
|
- }
|
|
|
- // 改变已经稽核的吊牌信息
|
|
|
- @GetMapping(value = "changeRestackMakeResult")
|
|
|
- public int changeRestackMakeResult(@RequestParam("restackMake") String restackMake){
|
|
|
- return wmsFeign.changeRestackMakeResult(restackMake);
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
+
|
胡半仙