Merge remote-tracking branch 'origin/master'

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")
-    @GetMapping("/selectSysFactoryList")
-    public AjaxResult selectSysFactoryList(SysFactory sysFactory) {
-        List<SysFactory> list = proProcessService.selectSysFactoryList(sysFactory);
-        return success(list);
+//    @RequiresPermissions("mes:pro:process:list")
+//    @GetMapping("/selectSysFactoryList")
+//    public AjaxResult selectSysFactoryList(SysFactory sysFactory) {
+//        List<SysFactory> list = proProcessService.selectSysFactoryList(sysFactory);
+//        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) {
-        return proProcessMapper.selectSysFactoryList(sysFactory);
+    public List<SysFactory> getWorkCenterList(SysFactory 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/BaseAreaController.java

@@ -72,7 +72,13 @@ public class BaseAreaController extends BaseController {
 	@Log(title = "库区", businessType = BusinessType.INSERT)
 	@PostMapping
 	public AjaxResult add(@RequestBody BaseArea baseArea) {
-		return toAjax(baseAreaService.insertBaseArea(baseArea));
+		if (baseAreaService.checkAreaCodeUnique(baseArea)) {
+			return AjaxResult.error("库区编码已存在！");
+		}else if(baseAreaService.checkAreaDescUnique(baseArea)){
+			return AjaxResult.error("库区描述已存在！");
+		}else{
+			return toAjax(baseAreaService.insertBaseArea(baseArea));
+		}
 	}
 
 	/**

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

@@ -72,7 +72,13 @@ public class BaseEquipmentController extends BaseController {
 	@Log(title = "设备管理", businessType = BusinessType.INSERT)
 	@PostMapping
 	public AjaxResult add(@RequestBody BaseEquipment baseEquipment) {
-		return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment));
+		if (baseEquipmentService.checkEquipmentCodeUnique(baseEquipment)) {
+			return AjaxResult.error("设备编码已存在！");
+		}else if(baseEquipmentService.checkEquipmentNameUnique(baseEquipment)){
+			return AjaxResult.error("设备名称已存在！");
+		}else{
+			return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment));
+		}
 	}
 
 	/**

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)
@@ -120,7 +149,9 @@ public class SysFactory extends TreeEntity {
 			.append("createTime", getCreateTime())
 			.append("updateBy", getUpdateBy())
 			.append("updateTime", getUpdateTime())
-				.append("factoryCode", getFactoryCode())
-				.toString();
+			.append("factoryCode", getFactoryCode())
+				.append("value", getValue())
+				.append("label", getLabel())
+			.toString();
 	}
 }

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

@@ -60,4 +60,7 @@ public interface BaseAreaMapper {
 	public int deleteBaseAreaByAreaIds(String[] areaIds);
 
     public Integer queryCount(BaseArea baseArea);
+
+    public String checkAreaCodeUnique(BaseArea baseArea);
+	public String checkAreaDescUnique(BaseArea baseArea);
 }

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

@@ -2,6 +2,7 @@ package com.op.wms.mapper;
 
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.wms.domain.BaseEquipment;
 
 /**
@@ -58,4 +59,10 @@ public interface BaseEquipmentMapper {
 	 * @return 结果
 	 */
 	public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds);
+	@DS("master")
+    public String getEquipmentTypeName(BaseEquipment baseEquipment);
+
+	//判断
+    String checkEquipmentCodeUnique(BaseEquipment baseEquipment);
+	String checkEquipmentNameUnique(BaseEquipment baseEquipment);
 }

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/IBaseAreaService.java

@@ -57,4 +57,8 @@ public interface IBaseAreaService {
 	 * @return 结果
 	 */
 	public int deleteBaseAreaByAreaId(String areaId);
+
+    boolean checkAreaCodeUnique(BaseArea baseArea);
+
+	boolean checkAreaDescUnique(BaseArea baseArea);
 }

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

@@ -57,4 +57,7 @@ public interface IBaseEquipmentService {
 	 * @return 结果
 	 */
 	public int deleteBaseEquipmentByEquipmentId(Long equipmentId);
+
+    boolean checkEquipmentCodeUnique(BaseEquipment baseEquipment);
+	boolean checkEquipmentNameUnique(BaseEquipment baseEquipment);
 }

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/BaseAreaServiceImpl.java

@@ -100,4 +100,37 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
 	public int deleteBaseAreaByAreaId(String areaId) {
 		return baseAreaMapper.deleteBaseAreaByAreaId(areaId);
 	}
+
+	/**
+	 * 判断库区信息
+	 *
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public boolean checkAreaCodeUnique(BaseArea baseArea){
+		String area = baseAreaMapper.checkAreaCodeUnique(baseArea);
+		if(area == null){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
+	/**
+	 * 判断库区信息
+	 *
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public boolean checkAreaDescUnique(BaseArea baseArea){
+		String desc = baseAreaMapper.checkAreaDescUnique(baseArea);
+		if(desc== null){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
+import com.op.wms.domain.BaseArea;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.wms.mapper.BaseEquipmentMapper;
@@ -55,6 +56,8 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 	@DS("#header.poolName")
 	public int insertBaseEquipment(BaseEquipment baseEquipment) {
 		baseEquipment.setCreateTime(DateUtils.getNowDate());
+		String 	equipmentTypeName = baseEquipmentMapper.getEquipmentTypeName(baseEquipment);
+		baseEquipment.setEquipmentTypeName(equipmentTypeName);
 		return baseEquipmentMapper.insertBaseEquipment(baseEquipment);
 	}
 
@@ -68,6 +71,8 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 	@DS("#header.poolName")
 	public int updateBaseEquipment(BaseEquipment baseEquipment) {
 		baseEquipment.setUpdateTime(DateUtils.getNowDate());
+		String 	equipmentTypeName = baseEquipmentMapper.getEquipmentTypeName(baseEquipment);
+		baseEquipment.setEquipmentTypeName(equipmentTypeName);
 		return baseEquipmentMapper.updateBaseEquipment(baseEquipment);
 	}
 
@@ -94,4 +99,36 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 	public int deleteBaseEquipmentByEquipmentId(Long equipmentId) {
 		return baseEquipmentMapper.deleteBaseEquipmentByEquipmentId(equipmentId);
 	}
+
+	/**
+	 * 判断设备信息
+	 *
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public boolean checkEquipmentCodeUnique(BaseEquipment baseEquipment){
+		String equipment = baseEquipmentMapper.checkEquipmentCodeUnique(baseEquipment);
+		if(equipment == null){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
+	/**
+	 * 判断设备信息
+	 *
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public boolean checkEquipmentNameUnique(BaseEquipment baseEquipment){
+		String equipment = baseEquipmentMapper.checkEquipmentNameUnique(baseEquipment);
+		if(equipment == null){
+			return false;
+		}else{
+			return true;
+		}
+	}
 }

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/BaseAreaMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.op.wms.mapper.BaseAreaMapper">
-	
+
 	<resultMap type="BaseArea" id="BaseAreaResult">
 		<result property="areaId"	column="area_id"	/>
 		<result property="areaCode"	column="area_code"	/>
@@ -44,11 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectBaseAreaList" parameterType="BaseArea" resultMap="BaseAreaResult">
 		<include refid="selectBaseAreaVo"/>
-		<where>  
-			<if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
-			<if test="areaDesc != null  and areaDesc != ''"> and area_desc = #{areaDesc}</if>
+		<where>
+			<if test="areaCode != null  and areaCode != ''"> and area_code like concat('%', #{areaCode}, '%')</if>
+			<if test="areaDesc != null  and areaDesc != ''"> and area_desc like concat('%', #{areaDesc}, '%')</if>
 			<if test="regionCode != null  and regionCode != ''"> and region_code = #{regionCode}</if>
-			<if test="whCode != null  and whCode != ''"> and wh_code = #{whCode}</if>
+			<if test="whCode != null  and whCode != ''"> and wh_code like concat('%', #{whCode}, '%')</if>
 			<if test="instockTranLoc != null  and instockTranLoc != ''"> and instock_tran_loc = #{instockTranLoc}</if>
 			<if test="outstockTranLoc != null  and outstockTranLoc != ''"> and outstock_tran_loc = #{outstockTranLoc}</if>
 			<if test="pickTranLoc != null  and pickTranLoc != ''"> and pick_tran_loc = #{pickTranLoc}</if>
@@ -72,16 +72,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
 		</where>
 	</select>
-	
+
 	<select id="selectBaseAreaByAreaId" parameterType="String" resultMap="BaseAreaResult">
 		<include refid="selectBaseAreaVo"/>
 		where area_id = #{areaId}
 	</select>
-		
+
 	<insert id="insertBaseArea" parameterType="BaseArea">
 		insert into base_area
 		<trim prefix="(" suffix=")" suffixOverrides=",">
-<!--			<if test="areaId != null">area_id,</if>-->
+			<!--			<if test="areaId != null">area_id,</if>-->
 			<if test="areaCode != null and areaCode != ''">area_code,</if>
 			<if test="areaDesc != null">area_desc,</if>
 			<if test="regionCode != null">region_code,</if>
@@ -112,9 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="activeFlag != null">active_flag,</if>
 			<if test="remark != null">remark,</if>
 			<if test="factoryCode != null">factory_code,</if>
-		 </trim>
+		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
-<!--			<if test="areaId != null">#{areaId},</if>-->
+			<!--			<if test="areaId != null">#{areaId},</if>-->
 			<if test="areaCode != null and areaCode != ''">#{areaCode},</if>
 			<if test="areaDesc != null">#{areaDesc},</if>
 			<if test="regionCode != null">#{regionCode},</if>
@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="activeFlag != null">#{activeFlag},</if>
 			<if test="remark != null">#{remark},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
-		 </trim>
+		</trim>
 	</insert>
 
 	<update id="updateBaseArea" parameterType="BaseArea">
@@ -190,15 +190,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</delete>
 
 	<delete id="deleteBaseAreaByAreaIds" parameterType="String">
-		delete from base_area where area_id in 
+		delete from base_area where area_id in
 		<foreach item="areaId" collection="array" open="(" separator="," close=")">
 			#{areaId}
 		</foreach>
 	</delete>
-    <!--查询总数-->
+	<!--查询总数-->
 	<select id="queryCount" parameterType="BaseArea" resultType="java.lang.Integer">
 		select count(*)
 		from base_area
 	</select>
 
+
+	<select id="checkAreaCodeUnique" parameterType="BaseArea" resultType ="java.lang.String">
+		select area_code
+		from base_area
+		where area_code = #{areaCode}
+	</select>
+
+	<select id="checkAreaDescUnique" parameterType="BaseArea" resultType ="java.lang.String">
+		select area_desc
+		from base_area
+		where area_desc = #{areaDesc}
+	</select>
+
 </mapper>

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

@@ -39,12 +39,12 @@
 	<select id="selectBaseEquipmentList" parameterType="BaseEquipment" resultMap="BaseEquipmentResult">
 		<include refid="selectBaseEquipmentVo"/>
 		<where>
-			<if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
+			<if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
 			<if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
 			<if test="equipmentBrand != null  and equipmentBrand != ''"> and equipment_brand = #{equipmentBrand}</if>
 			<if test="equipmentSpec != null  and equipmentSpec != ''"> and equipment_spec = #{equipmentSpec}</if>
 			<if test="equipmentTypeId != null "> and equipment_type_id = #{equipmentTypeId}</if>
-			<if test="equipmentTypeCode != null  and equipmentTypeCode != ''"> and equipment_type_code = #{equipmentTypeCode}</if>
+			<if test="equipmentTypeCode != null  and equipmentTypeCode != ''"> and equipment_type_code like concat('%', #{equipmentTypeCode}, '%')</if>
 			<if test="equipmentTypeName != null  and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
 			<if test="workshopId != null "> and workshop_id = #{workshopId}</if>
 			<if test="workshopCode != null  and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
@@ -163,4 +163,23 @@
 			#{equipmentId}
 		</foreach>
 	</delete>
+
+	<select id="getEquipmentTypeName" parameterType="BaseEquipment" resultType="java.lang.String">
+		select dict_label
+		from sys_dict_data
+		where dict_value = #{equipmentTypeCode}
+	</select>
+
+	<select id="checkEquipmentNameUnique" parameterType="BaseEquipment" resultType ="java.lang.String">
+		select equipment_name
+		from base_equipment
+		where equipment_name = #{equipmentName}
+	</select>
+
+	<select id="checkEquipmentCodeUnique" parameterType="BaseEquipment" resultType ="java.lang.String">
+		select equipment_code
+		from base_equipment
+		where equipment_code = #{equipmentCode}
+	</select>
+
 </mapper>

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>