Merge branch 'liweidong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java

@@ -61,4 +61,10 @@ public class DsMainSaltAddQuantityVO extends DsMainSaltAddQuantityEntity {
 	@Schema(description = "作业中心名称")
 	private String wcName;
 
+	/**
+	 * 作业槽名称
+	 */
+	@Schema(description = "作业槽名称")
+	private String batchName;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java

@@ -49,4 +49,10 @@ public class DsSpecialProVO extends DsSpecialProEntity {
 	@Schema(description = "文件路径")
 	private String fileUrl;
 
+	/**
+	 * 工艺员名称
+	 */
+	@Schema(description = "工艺员名称")
+	private String proManName;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.dashboard.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springblade.desk.dashboard.pojo.entity.DsTaskBillEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -42,4 +43,11 @@ public class DsTaskBillVO extends DsTaskBillEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 工艺员名称
+	 */
+	@Schema(description = "工艺员名称")
+	private String proManName;
+
+
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java

@@ -57,6 +57,7 @@ public interface IUserClient {
 	String USER_INFO_BY_TENANT_ID_PHONE_TYPE = API_PREFIX + "/info/info-by-tenant-id-phone-type";
 	String USER_BY_ID = API_PREFIX + "/user-by-id";
 	String USER_BY_CODE = API_PREFIX + "/user-by-code";
+	String USER_BY_ACCOUNT_V2  = API_PREFIX + "/user-by-account-v2";
 	String USER_BY_ACCOUNT = API_PREFIX + "/user-by-account";
 	String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
 	String SAVE_USER = API_PREFIX + "/save-user";
@@ -198,4 +199,13 @@ public interface IUserClient {
 	 */
 	@GetMapping(USER_BY_CODE)
 	R<UserInfo> userInfoByCode(@RequestParam("code") String code);
+
+	/**
+	 * 获取用户信息
+	 *
+	 * @param account 用户账号
+	 * @return
+	 */
+	@GetMapping(USER_BY_ACCOUNT_V2)
+	R<User> userByAccountV2(@RequestParam("account") String account);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java

@@ -126,7 +126,7 @@ public class BsProcessSetController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入bsProcessSet")
 	public R save(@Valid @RequestBody BsProcessSetEntity bsProcessSet) {
-		return R.status(bsProcessSetService.save(bsProcessSet));
+		return R.status(bsProcessSetService.saveProcessSet(bsProcessSet));
 	}
 
 	/**
@@ -136,7 +136,7 @@ public class BsProcessSetController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入bsProcessSet")
 	public R update(@Valid @RequestBody BsProcessSetEntity bsProcessSet) {
-		return R.status(bsProcessSetService.updateById(bsProcessSet));
+		return R.status(bsProcessSetService.updateProcessSet(bsProcessSet));
 	}
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java

@@ -88,18 +88,18 @@ public class DsTaskBillController extends BladeController {
 	/**
 	 * 任务单表 分页
 	 */
-	@GetMapping("/list")
+//	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
+//	@ApiOperationSupport(order = 2)
-	@Operation(summary = "分页", description  = "传入dsTaskBill")
+//	@Operation(summary = "分页", description  = "传入dsTaskBill")
-	public R<IPage<DsTaskBillVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> dsTaskBill, Query query) {
+//	public R<IPage<DsTaskBillVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> dsTaskBill, Query query) {
-		IPage<DsTaskBillEntity> pages = dsTaskBillService.page(Condition.getPage(query), Condition.getQueryWrapper(dsTaskBill, DsTaskBillEntity.class));
+//		IPage<DsTaskBillEntity> pages = dsTaskBillService.page(Condition.getPage(query), Condition.getQueryWrapper(dsTaskBill, DsTaskBillEntity.class));
-		return R.data(DsTaskBillWrapper.build().pageVO(pages));
+//		return R.data(DsTaskBillWrapper.build().pageVO(pages));
-	}
+//	}
 
 	/**
 	 * 任务单表 自定义分页
 	 */
-	@GetMapping("/page")
+	@GetMapping("/list")
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入dsTaskBill")
 	public R<IPage<DsTaskBillVO>> page(DsTaskBillVO dsTaskBill, Query query) {

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml

@@ -397,7 +397,7 @@
         SELECT
             *
         FROM DS_PART
-        WHERE PART_CODE LIKE '%' || #{zPartCode} || '%'
+        WHERE PART_CODE = #{zPartCode}
             AND IS_DELETED = 0
             AND STATUS = 1
         ORDER BY PART_CODE

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml

@@ -66,7 +66,6 @@
         <if test="bPartCode != null and zPartCode == null">
             AND p.PART_CODE = #{bPartCode}
         </if>
-        <!-- 如果指定了具体版本号 -->
         <if test="bPartVersion != null and bPartVersion != ''">
             AND pv.PART_VERSION = #{bPartVersion}
         </if>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml

@@ -23,10 +23,10 @@
     <select id="selectDsSimilarPartsPage" resultType="org.springblade.desk.dashboard.pojo.vo.DsSimilarPartsVO">
         select * from DS_SIMILAR_PARTS where is_deleted = 0
         <if test="dsSimilarParts.partOne != null ">
-            and PART_ONE = #{dsSimilarParts.partOne}
+            and PART_TWO_CODE = #{dsSimilarParts.partOneCode}
         </if>
         <if test="dsSimilarParts.partTwo != null ">
-            and PART_TWO = #{dsSimilarParts.partTwo}
+            and PART_TWO_CODE = #{dsSimilarParts.partTwoCode}
         </if>
     </select>
 
@@ -37,7 +37,7 @@
     <select id="selectByPartOneAndPartTwo"
             resultType="org.springblade.desk.dashboard.pojo.entity.DsSimilarPartsEntity">
         select * from DS_SIMILAR_PARTS where is_deleted = 0
-        and PART_ONE = #{dsSimilarParts.partOne} and PART_TWO = #{dsSimilarParts.partTwo}
+        and PART_ONE_CODE = #{dsSimilarParts.partOneCode} and PART_TWO_CODE = #{dsSimilarParts.partTwoCode}
     </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml

@@ -29,9 +29,7 @@
     </resultMap>
 
 
-    <select id="selectDsTaskBillPage" resultMap="dsTaskBillResultMap">
+
-        select * from DS_TASK_BILL where is_deleted = 0
-    </select>
 
 
     <select id="exportDsTaskBill" resultType="org.springblade.desk.dashboard.excel.DsTaskBillExcel">
@@ -46,4 +44,8 @@
         select a.tb_Code  from ds_task_bill a where a.tb_code like #{codePattern} order by a.tb_code desc
     </select>
 
+    <select id="selectDsTaskBillPage" resultType="org.springblade.desk.dashboard.pojo.vo.DsTaskBillVO">
+          select * from DS_TASK_BILL where is_deleted = 0
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessSetService.java

@@ -94,4 +94,18 @@ public interface IBsProcessSetService extends BaseService<BsProcessSetEntity> {
 	 * @return
 	 */
 	BsProcessSetEntity selectOldMesProcessSetByOldPpsId(Long oldPpsId);
+
+	/**
+	 * 新增工序设置
+	 * @param bsProcessSet
+	 * @return
+	 */
+    boolean saveProcessSet(BsProcessSetEntity bsProcessSet);
+
+	/**
+	 * 修改工序设置
+	 * @param bsProcessSet
+	 * @return
+	 */
+	boolean updateProcessSet(BsProcessSetEntity bsProcessSet);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessSetServiceImpl.java

@@ -26,6 +26,7 @@
 package org.springblade.desk.dashboard.service.impl;
 
 
+import org.bouncycastle.crypto.prng.ThreadedSeedGenerator;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessTeamEntity;
@@ -177,4 +178,46 @@ public class BsProcessSetServiceImpl extends BaseServiceImpl<BsProcessSetMapper,
 		return bsProcessSetMapper.selectOldMesProcessSetByOldPpsId(oldPpsId);
 	}
 
+	@Override
+	public boolean saveProcessSet(BsProcessSetEntity bsProcessSet) {
+		if(null == bsProcessSet){
+			throw new ServiceException("工序不能为空!");
+		}
+		if(null == bsProcessSet.getCode()){
+			throw new ServiceException("工序编码不能为空!");
+		}
+		BsProcessSetEntity processSetEntity = bsProcessSetMapper.selectBsProcessSetByProcessCode(bsProcessSet.getCode());
+		if(null != processSetEntity){
+			throw new ServiceException("工序编码已存在,请勿重复添加： "+bsProcessSet.getCode());
+		}
+
+		return this.save(bsProcessSet);
+	}
+
+	@Override
+	public boolean updateProcessSet(BsProcessSetEntity bsProcessSet) {
+		if(null == bsProcessSet){
+			throw new ServiceException("工序不能为空!");
+		}
+		if(null == bsProcessSet.getCode()){
+			throw new ServiceException("工序编码不能为空!");
+		}
+
+		BsProcessSetEntity processSetEntity = bsProcessSetMapper.selectById(bsProcessSet.getId());
+		if(null == processSetEntity){
+			throw new ServiceException("记录不存在");
+		}
+
+		if (!bsProcessSet.getCode().equals(processSetEntity.getCode())) {
+			// 编码已变更，查询数据库中是否存在其他记录使用这个编码
+			BsProcessSetEntity processSet = bsProcessSetMapper.selectBsProcessSetByProcessCode(bsProcessSet.getCode());
+			if (processSet != null) {
+				throw new ServiceException("编码 " + bsProcessSet.getCode() + " 已被使用");
+			}
+		}
+
+
+		return this.updateById(bsProcessSet);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsMainSaltAddQuantityServiceImpl.java

@@ -26,6 +26,8 @@
 package org.springblade.desk.dashboard.service.impl;
 
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.desk.basic.pojo.entity.WorkTank;
+import org.springblade.desk.basic.service.IWorkTankService;
 import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsMainSaltAddQuantityEntity;
 import org.springblade.desk.dashboard.pojo.vo.DsMainSaltAddQuantityVO;
@@ -58,6 +60,9 @@ public class DsMainSaltAddQuantityServiceImpl extends BaseServiceImpl<DsMainSalt
 	@Autowired
 	DsMainSaltAddQuantityMapper mainSaltAddQuantityMapper;
 
+	@Autowired
+	IWorkTankService workTankService;
+
 	@Override
 	public IPage<DsMainSaltAddQuantityVO> selectDsMainSaltAddQuantityPage(IPage<DsMainSaltAddQuantityVO> page, DsMainSaltAddQuantityVO dsMainSaltAddQuantity) {
 		List<DsMainSaltAddQuantityVO> dsMainSaltAddQuantityVOS = baseMapper.selectDsMainSaltAddQuantityPage(page, dsMainSaltAddQuantity);
@@ -68,6 +73,12 @@ public class DsMainSaltAddQuantityServiceImpl extends BaseServiceImpl<DsMainSalt
 					dsMainSaltAddQuantityVO.setWcName(workCenterEntity.getWcName());
 				}
 			}
+			if(null != dsMainSaltAddQuantityVO.getBatchNo()){
+				WorkTank workTank = workTankService.getById(dsMainSaltAddQuantityVO.getBatchNo());
+				if(null != workTank){
+					dsMainSaltAddQuantityVO.setBatchName(workTank.getName());
+				}
+			}
 		}
 		return page.setRecords(dsMainSaltAddQuantityVOS);
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -132,7 +132,9 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 					if (!CollectionUtils.isEmpty(idList)) {
 						List<DsPartVersionVO> dsPartEntityList = dsPartMapper.selectDsPartVersionByIds(idList);
 						for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
-							dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
+							if(null != dsPartVersionVO.getUpdateUser()){
+								dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
+							}
 						}
 						dsPartVO.setChildren(dsPartEntityList);
 					}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java

@@ -77,21 +77,24 @@ public class DsSimilarPartsServiceImpl extends BaseServiceImpl<DsSimilarPartsMap
 		if (CollectionUtils.isEmpty(list)) {
 			throw new ServiceException("Excel文件中没有数据");
 		}
-
 		List<DsSimilarPartsEntity> similarPartsList = new ArrayList<>();
 		for (DsSimilarPartsVO dsSimilarPartsVO : list) {
-			DsPartEntity partOne = partService.selectDsPartByPatCodeAndVersion(dsSimilarPartsVO.getPartOneCode(),null);
+			if(null != dsSimilarPartsVO.getPartOneCode() && null != dsSimilarPartsVO.getPartTwoCode()){
-			DsPartEntity partTwo = partService.selectDsPartByPatCodeAndVersion(dsSimilarPartsVO.getPartTwoCode(),null);
-			if(null != partOne && null != partTwo){
 				DsSimilarPartsEntity dsSimilarPartsEntity = new DsSimilarPartsEntity();
-				dsSimilarPartsEntity.setPartOne(partOne.getId());
+				dsSimilarPartsEntity.setPartOneCode(dsSimilarPartsVO.getPartOneCode());
-				dsSimilarPartsEntity.setPartTwo(partTwo.getId());
+				dsSimilarPartsEntity.setPartTwoCode(dsSimilarPartsVO.getPartTwoCode());
+
+				//判断是否重复
+				DsSimilarPartsEntity similarPartsEntity = baseMapper.selectByPartOneAndPartTwo(dsSimilarPartsEntity);
+				if(null != similarPartsEntity){
+					continue;
+				}
+
 				similarPartsList.add(dsSimilarPartsEntity);
-			}else {
-				throw new ServiceException("请检查零件号: "+dsSimilarPartsVO.getPartOneCode()+" 或 "+dsSimilarPartsVO.getPartTwoCode());
 			}
 		}
-		// 4. 批量保存
+
+		//批量保存
 		saveBatch(similarPartsList);
 		return true;
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSpecialProServiceImpl.java

@@ -25,7 +25,7 @@
  */
 package org.springblade.desk.dashboard.service.impl;
 
-import cn.hutool.core.stream.CollectorUtil;
+import com.alibaba.nacos.api.utils.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity;
@@ -43,7 +43,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.util.CollectionUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -68,7 +67,18 @@ public class DsSpecialProServiceImpl extends BaseServiceImpl<DsSpecialProMapper,
 
 	@Override
 	public IPage<DsSpecialProVO> selectDsSpecialProPage(IPage<DsSpecialProVO> page, DsSpecialProVO dsSpecialPro) {
-		return page.setRecords(baseMapper.selectDsSpecialProPage(page, dsSpecialPro));
+		List<DsSpecialProVO> dsSpecialProVOS = baseMapper.selectDsSpecialProPage(page, dsSpecialPro);
+		if(!CollectionUtils.isEmpty(dsSpecialProVOS)){
+			for (DsSpecialProVO dsSpecialProVO : dsSpecialProVOS) {
+				if(dsSpecialProVO.getProMan() != null){
+					User user = userClient.userInfo(Func.toLong(dsSpecialProVO.getProMan())).getData().getUser();
+					if(null != user){
+						dsSpecialProVO.setProManName(user.getName());
+					}
+				}
+			}
+		}
+		return page.setRecords(dsSpecialProVOS);
 	}
 
 
@@ -98,7 +108,7 @@ public class DsSpecialProServiceImpl extends BaseServiceImpl<DsSpecialProMapper,
 			if(null == dsSpecialProExcel.getProMan()){
 				throw new ServiceException("工艺员不能为空");
 			}
-			User user = userClient.userInfo(Func.toLong(dsSpecialProExcel.getProMan())).getData().getUser();
+			User user = userClient.userByAccountV2(dsSpecialProExcel.getProMan()).getData();
 			if(null == user){
 				throw new ServiceException("工艺员: "+dsSpecialProExcel.getProMan()+" 不存在");
 			}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java

@@ -27,6 +27,7 @@ package org.springblade.desk.dashboard.service.impl;
 import com.alibaba.druid.sql.visitor.functions.Function;
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.pojo.entity.BsFillingDetailEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsSpecialProEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsTaskBillEntity;
@@ -36,6 +37,8 @@ import org.springblade.desk.dashboard.mapper.DsTaskBillMapper;
 import org.springblade.desk.dashboard.service.IBsFillingDetailService;
 import org.springblade.desk.dashboard.service.IDsSpecialProService;
 import org.springblade.desk.dashboard.service.IDsTaskBillService;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -67,9 +70,23 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl<DsTaskBillMapper, DsT
 	@Autowired
 	IBsFillingDetailService fillingDetailService;
 
+	@Autowired
+	IUserClient userClient;
+
 	@Override
 	public IPage<DsTaskBillVO> selectDsTaskBillPage(IPage<DsTaskBillVO> page, DsTaskBillVO dsTaskBill) {
-		return page.setRecords(baseMapper.selectDsTaskBillPage(page, dsTaskBill));
+		List<DsTaskBillVO> dsTaskBillVOS = baseMapper.selectDsTaskBillPage(page, dsTaskBill);
+		if(!CollectionUtils.isEmpty(dsTaskBillVOS)){
+			for (DsTaskBillVO dsTaskBillVO : dsTaskBillVOS) {
+				if(null != dsTaskBillVO.getProMan()){
+					User user = userClient.userInfo(Func.toLong(dsTaskBillVO.getProMan())).getData().getUser();
+					if(null != user){
+						dsTaskBillVO.setProManName(user.getName());
+					}
+				}
+			}
+		}
+		return page.setRecords(dsTaskBillVOS);
 	}
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -614,9 +614,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Override
 	public boolean taskRedeploy(DsTaskingDTO tasking) {
 		DsTaskingEntity dsTaskingEntity = taskingMapper.selectById(tasking.getId());
-		if(!TaskingConstant.TASK_STATUS_ALREADY.equals(dsTaskingEntity.getTaskStatus())){
+//		if(!TaskingConstant.TASK_STATUS_ALREADY.equals(dsTaskingEntity.getTaskStatus())){
-			throw new ServiceException("任务状态: 非待接收 禁止转派");
+//			throw new ServiceException("任务状态: 非待接收 禁止转派");
-		}
+//		}
 
 		//工艺分派人
 		String assignMan = AuthUtil.getUser().getUserName();

blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java

@@ -168,4 +168,10 @@ public class UserClient implements IUserClient {
 	public R<UserInfo> userInfoByCode(String code) {
 		return R.data(service.userInfoByCode(code));
 	}
+
+	@Override
+	@GetMapping(USER_BY_ACCOUNT_V2)
+	public R<User> userByAccountV2(String account) {
+		return  R.data(service.userByAccountV2(account));
+	}
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java

@@ -310,4 +310,12 @@ public interface IUserService extends BaseService<User> {
 	 * @return
 	 */
 	UserInfo userInfoByCode(String code);
+
+	/**
+	 * 根据账号获取用户
+	 *
+	 * @param tenantId
+	 * @return
+	 */
+	User userByAccountV2(String tenantId);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java

@@ -614,4 +614,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		User user = baseMapper.selectOne(qw);
 		return buildUserInfo(user);
 	}
+
+	@Override
+	public User userByAccountV2( String account) {
+		return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
+	}
 }