工装

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

@@ -12,6 +12,7 @@ import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayService;
+import com.github.zuihou.common.constant.BizConstant;
 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;
@@ -75,4 +76,12 @@ public class MMeterialController extends SuperController<MMeterialService, Long,
         return success(MMeterial);
     }
 
+
+    @ApiOperation(value = "获取原材料", notes = "获取原材料")
+    @PostMapping("/get")
+    public R<MMeterial> getById(@RequestBody MMeterial model) {
+        MMeterial mMeterial = baseService.getById(model.getId());
+        return success(mMeterial);
+    }
+
 }

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

@@ -11,7 +11,9 @@ import com.github.zuihou.business.productionReadyCenter.dto.MMeterialReceiveLogU
 import com.github.zuihou.business.productionReadyCenter.dto.PlatePageDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialReceiveLogService;
+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 io.swagger.annotations.Api;
@@ -19,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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;
 
@@ -65,4 +68,10 @@ public class MMeterialReceiveLogController extends SuperController<MMeterialRece
         return success(MMeterialReceiveLog);
     }
 
+    @ApiOperation(value = "查询托盘", notes = "查询托盘")
+    @PostMapping("/getBymeterialId")
+    public R<List<MMeterialReceiveLog>> getBymeterialId(@RequestBody MMeterialReceiveLog log) {
+        return success(baseService.list(Wraps.<MMeterialReceiveLog>lbQ().eq(MMeterialReceiveLog::getMeterialId,log.getMeterialId())));
+    }
+
 }