修改盘点查询回显

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesExchangeController.java

@@ -80,6 +80,18 @@ public class AftersalesExchangeController extends BladeController {
 		return R.data(AftersalesExchangeWrapper.build().pageVO(pages));
 	}
 
+
+	/**
+	 * 工单交流处理数据记录 分页
+	 */
+	@GetMapping("/exchangeList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesExchange")
+	public R<List<AftersalesExchangeVO>> getExchangeList(@ApiIgnore @RequestParam Map<String, Object> aftersalesExchange, Query query) {
+		List<AftersalesExchangeEntity> pages = aftersalesExchangeService.getExchangeList( aftersalesExchange);
+		return R.data(AftersalesExchangeWrapper.build().listVO(pages));
+	}
+
 	/**
 	 * 工单交流处理数据记录 自定义分页
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesExchangeService.java

@@ -23,6 +23,7 @@ import com.logpm.aftersales.excel.AftersalesExchangeExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 工单交流处理数据记录 服务类
@@ -55,4 +56,11 @@ public interface IAftersalesExchangeService extends BaseService<AftersalesExchan
 	 * @return
 	 */
     boolean ownSaveOrUpdate(AftersalesExchangeEntity aftersalesExchange);
+
+	/**
+	 * 查询回复数据
+	 * @param aftersalesExchange
+	 * @return
+	 */
+    List<AftersalesExchangeEntity> getExchangeList(Map<String, Object> aftersalesExchange);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java

@@ -16,16 +16,19 @@
  */
 package com.logpm.aftersales.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.aftersales.entity.AftersalesExchangeEntity;
 import com.logpm.aftersales.vo.AftersalesExchangeVO;
 import com.logpm.aftersales.excel.AftersalesExchangeExcel;
 import com.logpm.aftersales.mapper.AftersalesExchangeMapper;
 import com.logpm.aftersales.service.IAftersalesExchangeService;
+import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 工单交流处理数据记录 服务实现类
@@ -61,4 +64,16 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExc
 		return false;
 	}
 
+	/**
+	 * 查询回复数据
+	 * @param aftersalesExchange
+	 * @return
+	 */
+	@Override
+	public List<AftersalesExchangeEntity> getExchangeList(Map<String, Object> aftersalesExchange) {
+		QueryWrapper<AftersalesExchangeEntity> queryWrapper = Condition.getQueryWrapper(aftersalesExchange, AftersalesExchangeEntity.class);
+
+		return baseMapper.selectList(queryWrapper);
+	}
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -106,6 +107,21 @@ public class BasicMaterialController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicMaterial")
 	public R save(@Valid @RequestBody BasicMaterialEntity basicMaterial) {
+
+		if(ObjectUtil.isNull(basicMaterial)){
+			log.info("物料添加失败！");
+			return R.fail("添加失败，物料信息为空！");
+		}
+
+		if(ObjectUtil.isNull(basicMaterial.getName()) || ObjectUtil.isNull(basicMaterial.getProductCode()) ||
+			ObjectUtil.isNull(basicMaterial.getPackageNum()) || ObjectUtil.isNull(basicMaterial.getPackageNum())||
+			ObjectUtil.isNull(basicMaterial.getSku())|| ObjectUtil.isNull(basicMaterial.getPackingSpecification())||
+			ObjectUtil.isNull(basicMaterial.getSpecification())){
+			log.info("物料添加失败！");
+			return R.fail("添加失败，物料信息为空！");
+		}
+
+
 		return R.status(basicMaterialService.save(basicMaterial));
 	}
 
@@ -126,6 +142,18 @@ public class BasicMaterialController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicMaterial")
 	public R submit(@Valid @RequestBody BasicMaterialEntity basicMaterial) {
+		if(ObjectUtil.isNull(basicMaterial)){
+			log.info("物料添加失败！");
+			return R.fail("添加失败，物料信息为空！");
+		}
+
+		if(ObjectUtil.isNull(basicMaterial.getName()) || ObjectUtil.isNull(basicMaterial.getProductCode()) ||
+			ObjectUtil.isNull(basicMaterial.getPackageNum()) || ObjectUtil.isNull(basicMaterial.getPackageNum())||
+			ObjectUtil.isNull(basicMaterial.getSku())|| ObjectUtil.isNull(basicMaterial.getPackingSpecification())||
+			ObjectUtil.isNull(basicMaterial.getSpecification()) ||  ObjectUtil.isNull(basicMaterial.getLogpmUnit()) ){
+			log.info("物料添加失败！");
+			return R.fail("添加失败，必填物料信息不完整为空！");
+		}
 		return R.status(basicMaterialService.saveOrUpdateOwn(basicMaterial));
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -110,6 +110,7 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 			return true;
 		}else{
 			//添加
+
 			basicMaterial.setHide(1);
 			this.save(basicMaterial);
 			return true;

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -19,6 +19,7 @@ package com.logpm.warehouse.controller;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.warehouse.dto.QuestDetailDTO;
 import com.logpm.warehouse.dto.TaskQuestDTO;
+import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.vo.QuestContrastVO;
 import com.logpm.warehouse.vo.QuestDetailVO;
 import com.logpm.warehouse.wrapper.TaskQuestVOWrapper;
@@ -111,6 +112,25 @@ public class TaskQuestController extends BladeController {
 		return R.data(list);
 	}
 
+	/**
+	 * 删除盘点数据
+	 */
+	@DeleteMapping("/deleteQuestChild")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除盘点数据", notes = "code,type")
+	public R deleteQuestChild(@RequestBody TaskSearchDTO taskSearchDTO) {
+
+		if(ObjectUtils.isNull(taskSearchDTO.getQuestNum())){
+			return R.fail("任务编码不能为空");
+		}
+		if(ObjectUtils.isNull(taskSearchDTO.getQuestId())){
+			return R.fail("任务ID不能为空");
+		}
+
+		R r = taskQuestService.deleteQuestChild(taskSearchDTO);
+		return r;
+	}
+
 
 	/**
 	 * 查询盘点数据

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -703,7 +703,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		if(ObjectUtils.isNotNull(taskSearchDTO.getQuestDetailList())){
 			List<QuestDetailEntity> detailEntityList = new ArrayList<>();
 			//处理的包件
-			taskSearchDTO.getQuestDetailList().stream().forEach(i ->{
+			taskSearchDTO.getQuestDetailList().forEach(i ->{
 				Long taskID;
 				if(ObjectUtils.isNotNull(i.getId())){
 					taskID = i.getId();
@@ -770,9 +770,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 				//是否修改库位
 				QuestDetailEntity questDetail = new QuestDetailEntity();
-				if(ObjectUtils.isNotNull(i.getAllocationId())){
+				if(ObjectUtils.isNotNull(i.getGroundingAllocationId())){
 					questDetail.setId(i.getId());
-					questDetail.setGroundingAllocationId(Long.valueOf(i.getAllocationId()));
+//					questDetail.setGroundingAllocationId(Long.valueOf(i.getAllocationId()));
+					questDetail.setGroundingAllocationId(i.getGroundingAllocationId());
+					questDetail.setGroundingPositionCode(i.getGroundingPositionCode());
 					detailEntityList.add(questDetail);
 				}
 			});
@@ -2325,6 +2327,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			for (QuestDetailEntity questDetailEntity : questDetailEntities) {
 				TaskPackagelistVO packagelistVO = new TaskPackagelistVO();
 				BeanUtil.copyProperties(questDetailEntity,packagelistVO);
+				packagelistVO.setQuestDetailId(questDetailEntity.getId());
+				if(ObjectUtils.isNotNull(questDetailEntity.getGroundingAllocationId())){
+					packagelistVO.setAllocation(questDetailEntity.getGroundingPositionCode());
+				}
 				if(taskSearchDTO.getTypeState().equals(1)){
 					//有
 					if(questDetailEntity.getQuestTarget().equals(2) || ObjectUtils.isNull( questDetailEntity.getOrderPackageCode())){