手动模式

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/WorkpieceService.java

@@ -7,6 +7,8 @@ import com.github.zuihou.business.operationManagementCenter.entity.PlanProduct;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
@@ -50,4 +52,10 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public String add(Map map);
 
 
+    public List<MToolClamp>toolClamplist();
+
+
+    public List<Tray>traylist();
+
+
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/WorkpieceServiceImpl.java

@@ -19,8 +19,12 @@ import com.github.zuihou.business.operationManagementCenter.entity.*;
 import com.github.zuihou.business.operationManagementCenter.service.*;
 import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.business.productionReadyCenter.service.AutoNodeService;
 import com.github.zuihou.business.productionReadyCenter.service.BomProcedureService;
+import com.github.zuihou.business.productionReadyCenter.service.MToolClampService;
+import com.github.zuihou.business.productionReadyCenter.service.TrayService;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
@@ -72,6 +76,12 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     @Autowired
     private TaskNodeService taskNodeService;
 
+    @Autowired
+    private MToolClampService toolClampService;
+
+    @Autowired
+    private TrayService trayService;
+
     @Autowired
     private HandModeWorkNode handModeWorkNode;
 
@@ -290,4 +300,18 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         BaseContextHandler.setTenant("0000");
         return taskNodeService.handModeStockIn(map).getData();
     }
+
+
+    @Override
+    public List<MToolClamp> toolClamplist() {
+        BaseContextHandler.setTenant("0000");
+        return toolClampService.list();
+    }
+
+
+    @Override
+    public List<Tray> traylist() {
+        BaseContextHandler.setTenant("0000");
+        return trayService.list();
+    }
 }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/WorkpieceController.java

@@ -12,7 +12,9 @@ import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.operationManagementCenter.service.TaskService;
 import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.websocket.WebSocketServer;
 import com.github.zuihou.common.util.StringUtil;
@@ -22,6 +24,7 @@ import com.github.zuihou.file.entity.File;
 import com.github.zuihou.log.annotation.SysLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import jcifs.smb.NtlmPasswordAuthentication;
 import jcifs.smb.SmbFile;
 import jcifs.smb.SmbFileInputStream;
@@ -188,5 +191,19 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
     }
 
 
+    @ApiOperation(value = "查询所有工装夹具", notes = "查询所有工装夹具")
+    @PostMapping("/handMode/toolClamplist")
+    public R<List<MToolClamp>> toolClamplist(@ApiParam(name="工装夹具对象",value="传入json格式",required = true)
+                                    @RequestBody(required = true) MToolClamp bean) {
+        return success(baseService.toolClamplist());
+    }
+
+
+    @ApiOperation(value = "查询托盘", notes = "查询托盘")
+    @PostMapping("/handMode/traylist")
+    public R<List<Tray>> traylist() {
+        return success(baseService.traylist());
+    }
+
 
 }