工作中心

op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java

@@ -162,10 +162,21 @@ public class ProProcessController extends BaseController {
     /**
      * 查询工厂模型列表
      */
-    @RequiresPermissions("mes:pro:process:list")
+//    @RequiresPermissions("mes:pro:process:list")
-    @GetMapping("/selectSysFactoryList")
+//    @GetMapping("/selectSysFactoryList")
-    public AjaxResult selectSysFactoryList(SysFactory sysFactory) {
+//    public AjaxResult selectSysFactoryList(SysFactory sysFactory) {
-        List<SysFactory> list = proProcessService.selectSysFactoryList(sysFactory);
+//        List<SysFactory> list = proProcessService.selectSysFactoryList(sysFactory);
-        return success(list);
+//        return success(list);
+//    }
+
+    /**
+     * 查询设工作中心
+     */
+    @RequiresPermissions("wms:factory:getWorkCenterList")
+    @GetMapping("/getWorkCenterList")
+    public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
+        startPage();
+        List<SysFactory> list = proProcessService.getWorkCenterList(sysFactory);
+        return getDataTable(list);
     }
 }

op-modules/op-technology/src/main/java/com/op/technology/mapper/ProProcessMapper.java

@@ -71,6 +71,9 @@ public interface ProProcessMapper
     Equipment selectEquipmentByEquipmentId(Long equipmentId);
     List<BomComponent> selectBaseBomComponentList(BomComponent bomComponent);
 
-    //查询工厂模型
+    //查询树形工厂模型
-    public List<SysFactory> selectSysFactoryList(SysFactory sysFactory);
+//    public List<SysFactory> selectSysFactoryList(SysFactory sysFactory);
+
+    //查询下拉式工作中心
+    public List<SysFactory> getWorkCenterList(SysFactory sysFactory);
 }

op-modules/op-technology/src/main/java/com/op/technology/service/IProProcessService.java

@@ -72,6 +72,9 @@ public interface IProProcessService
 
     public List<BomComponent> selectBaseBomComponentList(BomComponent bomComponent);
 
-    //查询树形结构
+    //查询树形工作中心结构
-    public List<SysFactory> selectSysFactoryList(SysFactory sysFactory);
+    //public List<SysFactory> selectSysFactoryList(SysFactory sysFactory);
+
+    //查询下拉式工作中心
+    List<SysFactory> getWorkCenterList(SysFactory sysFactory);
 }

op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java

@@ -222,6 +222,18 @@ public class ProProcessServiceImpl implements IProProcessService {
         return proProcessMapper.selectBaseBomComponentList(bomComponent);
     }
 
+//    /**
+//     * 查询工厂模型列表
+//     *
+//     * @param sysFactory 工厂模型
+//     * @return 工厂模型
+//     */
+//    @Override
+//    @DS("#header.poolName")
+//    public List<SysFactory> selectSysFactoryList(SysFactory sysFactory) {
+//        return proProcessMapper.selectSysFactoryList(sysFactory);
+//    }
+
     /**
      * 查询工厂模型列表
      *
@@ -230,7 +242,7 @@ public class ProProcessServiceImpl implements IProProcessService {
      */
     @Override
     @DS("#header.poolName")
-    public List<SysFactory> selectSysFactoryList(SysFactory sysFactory) {
+    public List<SysFactory> getWorkCenterList(SysFactory sysFactory) {
-        return proProcessMapper.selectSysFactoryList(sysFactory);
+        return proProcessMapper.getWorkCenterList(sysFactory);
     }
 }

op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml

@@ -318,4 +318,9 @@
         <if test="bomCode != null  and bomCode != ''"> and bom_code = #{bomCode}</if>
     </select>
 
+    <select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
+		select  factory_code,factory_name
+		from sys_factory
+	</select>
+
 </mapper>

op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java

@@ -2,6 +2,8 @@ package com.op.wms.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.op.common.core.web.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -92,4 +94,16 @@ public class SysFactoryController extends BaseController {
 	public AjaxResult remove(@PathVariable Long[] factoryIds) {
 		return toAjax(sysFactoryService.deleteSysFactoryByFactoryIds(factoryIds));
 	}
+
+	// 查询工作中心
+	/**
+	 * 查询设备管理列表
+	 */
+	@RequiresPermissions("wms:factory:getWorkCenterList")
+	@GetMapping("/getWorkCenterList")
+	public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
+		startPage();
+		List<SysFactory> list = sysFactoryService.getWorkCenterList(sysFactory);
+		return getDataTable(list);
+	}
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java

@@ -5,6 +5,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.op.common.core.annotation.Excel;
 import com.op.common.core.web.domain.TreeEntity;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 工厂模型对象 sys_factory
  * 
@@ -44,6 +47,11 @@ public class SysFactory extends TreeEntity {
 	@Excel(name = "工厂编码")
 	private String factoryCode;
 
+	//虚拟字段
+	private List<Map<String,String>> workCenter;
+	private String value;
+	private String label;
+
 	public void setFactoryId(Long factoryId) {
 		this.factoryId = factoryId;
 	}
@@ -103,6 +111,27 @@ public class SysFactory extends TreeEntity {
 		this.factoryCode = factoryCode;
 	}
 
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public List<Map<String,String>> getWorkCenter() {
+		return workCenter;
+	}
+	public void setWorkCenter(List<Map<String,String>> workCenter) {
+		this.workCenter = workCenter;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -121,6 +150,8 @@ public class SysFactory extends TreeEntity {
 			.append("updateBy", getUpdateBy())
 			.append("updateTime", getUpdateTime())
 			.append("factoryCode", getFactoryCode())
+				.append("value", getValue())
+				.append("label", getLabel())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/SysFactoryMapper.java

@@ -58,4 +58,6 @@ public interface SysFactoryMapper {
 	 * @return 结果
 	 */
 	public int deleteSysFactoryByFactoryIds(Long[] factoryIds);
+
+    public List<SysFactory> getWorkCenterList(SysFactory sysFactory);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java

@@ -57,4 +57,7 @@ public interface ISysFactoryService {
 	 * @return 结果
 	 */
 	public int deleteSysFactoryByFactoryId(Long factoryId);
+
+    //好
+	List<SysFactory> getWorkCenterList(SysFactory sysFactory);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java

@@ -97,4 +97,17 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
 	public int deleteSysFactoryByFactoryId(Long factoryId) {
 		return sysFactoryMapper.deleteSysFactoryByFactoryId(factoryId);
 	}
+
+	/**
+	 * 查询工厂模型列表
+	 *
+	 * @param sysFactory 工厂模型
+	 * @return 工厂模型
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<SysFactory> getWorkCenterList(SysFactory sysFactory) {
+		return sysFactoryMapper.getWorkCenterList(sysFactory);
+	}
+
 }

op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml

@@ -112,4 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{factoryId}
 		</foreach>
 	</delete>
+
+	<select id="getWorkCenterList" parameterType="SysFactory" resultType="SysFactoryResult">
+		select  factory_code,factory_name
+		from sys_factory
+	</select>
+
 </mapper>