设置点位

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MMeterialReceiveLogController.java

@@ -1,35 +1,23 @@
 package com.github.zuihou.business.controller.productionReadyCenter;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.request.PageParams;
-import com.github.zuihou.business.productionReadyCenter.dto.TrayPageDTO;
-import com.github.zuihou.business.productionReadyCenter.dto.TraySaveDTO;
-import com.github.zuihou.business.productionReadyCenter.dto.TrayUpdateDTO;
-import com.github.zuihou.business.productionReadyCenter.entity.Tray;
-import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
-import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
-import com.github.zuihou.business.productionReadyCenter.service.TrayService;
-import com.github.zuihou.database.mybatis.conditions.Wraps;
-import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialReceiveLogPageDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialReceiveLogSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialReceiveLogUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
+import com.github.zuihou.business.productionReadyCenter.service.MMeterialReceiveLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 
 /**
@@ -44,78 +32,26 @@ import java.util.stream.Collectors;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/tray")
-@Api(value = "Tray", tags = "托盘")
-public class MMeterialReceiveLogController extends SuperController<TrayService, Long, Tray, TrayPageDTO, TraySaveDTO, TrayUpdateDTO> {
-    @Autowired
-    private TrayPositionService trayPositionService;
+@RequestMapping("/meterialReceiveLog")
+@Api(value = "meterialReceiveLog", tags = "接受日志")
+public class MMeterialReceiveLogController extends SuperController<MMeterialReceiveLogService, Long, MMeterialReceiveLog, MMeterialReceiveLogPageDTO, MMeterialReceiveLogSaveDTO, MMeterialReceiveLogUpdateDTO> {
 
     @Override
-    public void query(PageParams<TrayPageDTO> params, IPage<Tray> page, Long defSize) {
-        TrayPageDTO data = params.getModel();
-        QueryWrap<Tray> wrap = handlerWrapper(null, params);
-        LbqWrapper<Tray> wrapper = wrap.lambda();
-        Tray tray = BeanUtil.toBean(data, Tray.class);
+    public void query(PageParams<MMeterialReceiveLogPageDTO> params, IPage<MMeterialReceiveLog> page, Long defSize) {
 
-        wrapper.like(Tray::getName, tray.getName())
-                .like(Tray::getSpecification, tray.getSpecification())
-                .eq(Tray::getBrand,tray.getBrand());
-
-        IPage<Tray> list= baseService.pageList(page, wrapper);
-        //取出分页里面得数据
-        List<Tray> l = list.getRecords();
-        //取出IDList
-        List<Long> idList = l.stream().map(p -> p.getId()).collect(Collectors.toList());
-        //根据IDList取出明细
-        List<TrayPosition> detailList = trayPositionService.list(Wraps.<TrayPosition>lbQ().in(TrayPosition::getTrayId, idList));
-        Map<Long,List<TrayPosition>>map = new HashMap<Long,List<TrayPosition>>();
-        for(TrayPosition ms:detailList){
-            if(map.containsKey(ms.getTrayId())){
-                map.get(ms.getTrayId()).add(ms);
-            }else{
-                List a = new ArrayList<TrayPosition>();
-                a.add(ms);
-                map.put(ms.getTrayId(),a);
-            }
-        }
-        for(Tray m:l){
-            if(map.containsKey(m.getId())){
-                m.setPositionList(map.get(m.getId()));
-            }
-        }
 
     }
 
     @ApiOperation(value = "查询托盘", notes = "查询托盘")
     @PostMapping("/all")
-    public R<List<Tray>> list() {
+    public R<List<MMeterialReceiveLog>> list() {
         return success(baseService.list());
     }
 
     @Override
-    public R<Tray> handlerSave(TraySaveDTO model) {
-        Tray tray = baseService.save(model);
-        return success(tray);
-    }
-
-    @ApiOperation(value = "删除托盘管理", notes = "删除托盘管理")
-    @PostMapping("/delete")
-    public R<Boolean> delete(@RequestBody Tray model) {
-        // 这个操作相当的危险，请谨慎操作！！!
-        return success(baseService.delete(model));
+    public R<MMeterialReceiveLog> handlerSave(MMeterialReceiveLogSaveDTO model) {
+        MMeterialReceiveLog MMeterialReceiveLog = null;
+        return success(MMeterialReceiveLog);
     }
 
-    @ApiOperation(value = "修改托盘管理", notes = "修改托盘管理")
-    @PostMapping("/update")
-    public R<Tray> update(@RequestBody TrayUpdateDTO model) {
-        Tray tray  = baseService.update(model);
-        return success(tray);
-    }
-
-    @ApiOperation(value = "修改状态", notes = "修改状态")
-    @PostMapping("/updateStatus")
-    public R<Tray> updateStatus(@RequestBody TrayUpdateDTO model) {
-        Tray tray  = baseService.updateStatus(model);
-        return success(tray);
-    }
 }