修改查询，添加价格表

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java

@@ -31,5 +31,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataTeamGroupVO extends BasicdataTeamGroupEntity {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 仓库名称
+	 */
+	private String name;
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -46,6 +47,13 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备货人")
 	private String stockupUser;
+
+	/**
+	 * ids
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "备货人")
+	private String ids;
 	/**
 	 * 备货状态
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -32,4 +32,8 @@ import lombok.EqualsAndHashCode;
 public class DistributionStockupVO extends DistributionStockupEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String headline;
+
+	private String groupName;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java

@@ -79,6 +79,17 @@ public class BasicdataTeamGroupController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 基础班组表 分页
+	 */
+	@GetMapping("/listTeam")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataTeamGroup")
+	public R<IPage<BasicdataTeamGroupEntity>> listTeam(@ApiIgnore @RequestParam Map<String, Object> basicdataTeamGroup, Query query) {
+		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.listTeam(Condition.getPage(query), basicdataTeamGroup);
+		return R.data(pages);
+	}
+
 	/**
 	 * 基础班组表 自定义分页
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.java

@@ -51,4 +51,5 @@ public interface BasicdataTeamGroupMapper extends BaseMapper<BasicdataTeamGroupE
 	 */
 	List<BasicdataTeamGroupExcel> exportBasicdataTeamGroup(@Param("ew") Wrapper<BasicdataTeamGroupEntity> queryWrapper);
 
+	IPage<BasicdataTeamGroupEntity> listTeam(IPage page, @Param("param") BasicdataTeamGroupEntity basicdataTeamGroupEntity);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml

@@ -28,6 +28,14 @@
     <select id="selectBasicdataTeamGroupPage" resultMap="basicdataTeamGroupResultMap">
         select * from logpm_basicdata_team_group where is_deleted = 0
     </select>
+    <select id="listTeam" resultType="com.logpm.basicdata.vo.BasicdataTeamGroupVO">
+        select btg.id,btg.belong_to ,btg.group_type ,btg.group_name ,lww.name
+        from logpm_basicdata_team_group btg
+                 LEFT JOIN logpm_warehouse_warehouse lww on btg.belong_to = lww.id
+        <where>
+            lww.department =#{param.department}
+        </where>
+    </select>
 
 
     <select id="exportBasicdataTeamGroup" resultType="com.logpm.basicdata.excel.BasicdataTeamGroupExcel">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamGroupService.java

@@ -17,12 +17,14 @@
 package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataTeamGroupEntity;
 import com.logpm.basicdata.vo.BasicdataTeamGroupVO;
 import com.logpm.basicdata.excel.BasicdataTeamGroupExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 基础班组表 服务类
@@ -49,4 +51,5 @@ public interface IBasicdataTeamGroupService extends BaseService<BasicdataTeamGro
 	 */
 	List<BasicdataTeamGroupExcel> exportBasicdataTeamGroup(Wrapper<BasicdataTeamGroupEntity> queryWrapper);
 
+	IPage<BasicdataTeamGroupEntity> listTeam(IPage<Object> page, Map<String, Object> basicdataTeamGroup );
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java

@@ -16,6 +16,9 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.basicdata.entity.BasicdataTeamGroupEntity;
 import com.logpm.basicdata.vo.BasicdataTeamGroupVO;
 import com.logpm.basicdata.excel.BasicdataTeamGroupExcel;
@@ -26,6 +29,7 @@ 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;
 
 /**
  * 基础班组表 服务实现类
@@ -51,4 +55,10 @@ public class BasicdataTeamGroupServiceImpl extends BaseServiceImpl<BasicdataTeam
 		return basicdataTeamGroupList;
 	}
 
+	@Override
+	public IPage<BasicdataTeamGroupEntity> listTeam(IPage<Object> page, Map<String, Object> basicdataTeamGroup) {
+		BasicdataTeamGroupEntity basicdataTeamGroupEntity = JSON.parseObject(JSON.toJSONString(basicdataTeamGroup), BasicdataTeamGroupEntity.class);
+		return baseMapper.listTeam(page,basicdataTeamGroupEntity);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -76,7 +76,8 @@ public class DistributionStockupController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockup")
 	public R<IPage<DistributionStockupEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
-		IPage<DistributionStockupEntity> pages = distributionStockupService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockup, DistributionStockupEntity.class));
+
+		IPage<DistributionStockupEntity> pages = distributionStockupService.pageList(Condition.getPage(query),distributionStockup);
 		return R.data(pages);
 	}
 	/**
@@ -115,6 +116,16 @@ public class DistributionStockupController extends BladeController {
 		return R.status(distributionStockupService.save(distributionStockup));
 	}
 
+	/**
+	 * 备货信息表 新增
+	 */
+	@PostMapping("/saveAssign")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入distributionStockup")
+	public R saveAssign(@Valid @RequestBody DistributionStockupEntity distributionStockup) {
+		return R.status(distributionStockupService.saveAssign(distributionStockup));
+	}
+
 	/**
 	 * 备货信息表 修改
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java

@@ -51,4 +51,5 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 */
 	List<DistributionStockupExcel> exportDistributionStockup(@Param("ew") Wrapper<DistributionStockupEntity> queryWrapper);
 
+	IPage<DistributionStockupEntity> pageList(IPage<Object> page, DistributionStockupEntity distributionStockupEntity);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -35,6 +35,16 @@
     <select id="selectDistributionStockupPage" resultMap="distributionStockupResultMap">
         select * from logpm_distribution_stockup where is_deleted = 0
     </select>
+    <select id="pageList" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select lds.id,lds.stockup_date , lds.stockup_user , lds.stockup_status , lds.stockup_area , lds.assign_status , lds.stockip_allocation , lds.goods_area_id , lds.forklift ,
+               lds.loader ,lds.fix_time ,lds.assign_time,lwga.headline,btg.group_name
+        from logpm_distribution_stockup lds
+                 LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
+                 LEFT JOIN logpm_basicdata_team_group btg ON lds.loader = btg.id
+        <where>
+
+        </where>
+    </select>
 
 
     <select id="exportDistributionStockup" resultType="com.logpm.distribution.excel.DistributionStockupExcel">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -23,6 +23,7 @@ import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 备货信息表 服务类
@@ -49,4 +50,7 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 */
 	List<DistributionStockupExcel> exportDistributionStockup(Wrapper<DistributionStockupEntity> queryWrapper);
 
+    Boolean saveAssign(DistributionStockupEntity distributionStockup);
+
+	IPage<DistributionStockupEntity> pageList(IPage<Object> page, Map<String, Object> distributionStockup);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -16,16 +16,23 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.mapper.DistributionStockupMapper;
 import com.logpm.distribution.service.IDistributionStockupService;
+import org.springframework.beans.BeanUtils;
 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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 备货信息表 服务实现类
@@ -51,4 +58,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return distributionStockupList;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean saveAssign(DistributionStockupEntity distributionStockup) {
+		if(StringUtils.isNotBlank(distributionStockup.getIds())){
+			String[] split = distributionStockup.getIds().split(",");
+			for (String s : split) {
+				DistributionStockupEntity distributionStockupEntity =new DistributionStockupEntity();
+				BeanUtils.copyProperties(distributionStockup,distributionStockupEntity);
+				distributionStockupEntity.setId(Long.parseLong(s));
+				distributionStockupEntity.setAssignStatus("2");
+				distributionStockupEntity.setStockupStatus("2");
+				distributionStockupEntity.setAssignTime(new Date());
+				baseMapper.updateById(distributionStockupEntity);
+			}
+			return true;
+		}
+		return null;
+	}
+
+	@Override
+	public IPage<DistributionStockupEntity> pageList(IPage<Object> page, Map<String, Object> distributionStockup) {
+		DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class);
+		return baseMapper.pageList(page,distributionStockupEntity);
+	}
+
 }