修改在库订单查询

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

@@ -61,6 +61,11 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderSelfNumbering;
 	/**
 	 * 仓库
 	 */

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

@@ -81,6 +81,6 @@ public class DistributionServiceLogEntity extends TenantEntity {
 	 * 在库Id
 	 */
 	@ApiModelProperty(value = "在库ID")
-	private Long stockArticleId;
+	private String stockArticleId;
 
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -89,6 +90,11 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+
+	@TableField(exist = false)
+	private String stateName;
+	@TableField(exist = false)
+	private String typeName;
 	/**
 	 * 入库时间
 	 */
@@ -166,7 +172,13 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	/**
 	 * 增值服务总费用
 	 */
-	@ApiModelProperty(value = "预约编号")
+	@ApiModelProperty(value = "增值服务总费用")
 	private BigDecimal fee;
 
+	/**
+	 * 协商费用
+	 */
+	@ApiModelProperty(value = "协商费用")
+	private BigDecimal rate;
+
 }

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

@@ -91,6 +91,16 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+	/**
+	 * 工厂车次
+	 */
+	@ApiModelProperty(value = "工厂车次")
+	private String factory;
+	/**
+	 * 品分类
+	 */
+	@ApiModelProperty(value = "品分类")
+	private String category;
 	/**
 	 * 商场
 	 */

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

@@ -32,4 +32,5 @@ import lombok.EqualsAndHashCode;
 public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	private static final long serialVersionUID = 1L;
 
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java

@@ -50,7 +50,7 @@ public interface IBasicDelineNodeService extends BaseService<BasicDelineNodeEnti
 	 */
 	List<BasicDelineNodeExcel> exportBasicDelineNode(Wrapper<BasicDelineNodeEntity> queryWrapper);
 	/**
-	 * 获取字典
+	 * 获取
 	 *
 	 * @return
 	 */

blade-service/logpm-distribution/pom.xml

@@ -27,6 +27,11 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-dict-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-distribution-api</artifactId>

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

@@ -117,7 +117,7 @@ public class DistributionServiceLogController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入distributionServiceLog")
 	public R submit(@Valid @RequestBody DistributionServiceLogEntity distributionServiceLog) {
-		return R.status(distributionServiceLogService.saveOrUpdate(distributionServiceLog));
+		return R.status(distributionServiceLogService.OwnSaveOrUpdate(distributionServiceLog));
 	}
 
 	/**

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

@@ -29,6 +29,10 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.Dict;
+import org.springblade.system.entity.DictBiz;
+import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.feign.IDictClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,6 +63,8 @@ public class DistributionStockArticleController extends BladeController {
 
 	private final IDistributionStockArticleService distributionStockArticleService;
 
+	private final IDictBizClient dictBizClient;
+
 	/**
 	 * 配送在库订单 详情
 	 */
@@ -77,6 +83,31 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class));
+		pages.getRecords().forEach( i ->{
+			R<List<DictBiz>> distribution_type = dictBizClient.getList("distribution_type");
+			DictBiz dictBiz = distribution_type.getData().get(i.getTypeService()-1);
+			i.setTypeName(dictBiz.getDictValue());
+			switch (i.getState()){
+				case 1:
+					i.setStateName("待预约");
+					break;
+				case 2:
+					i.setStateName("已预约");
+					break;
+				case 3:
+					i.setStateName("待配送");
+					break;
+				case 4:
+					i.setStateName("配送中");
+					break;
+				case 5:
+					i.setStateName("已配送");
+					break;
+				case 6:
+					i.setStateName("已完成");
+					break;
+			}
+		});
 		return R.data(pages);
 	}
 
@@ -88,6 +119,16 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleVO>> page(DistributionStockArticleVO distributionStockArticle, Query query) {
 		IPage<DistributionStockArticleVO> pages = distributionStockArticleService.selectDistributionStockArticlePage(Condition.getPage(query), distributionStockArticle);
+		pages.getRecords().forEach( i ->{
+			switch (i.getState()){
+				case 1:
+					i.setStateName("待预约");
+					break;
+				case 2:
+					i.setStateName("已预约");
+					break;
+			}
+		});
 		return R.data(pages);
 	}
 

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

@@ -49,4 +49,5 @@ public interface IDistributionServiceLogService extends BaseService<Distribution
 	 */
 	List<DistributionServiceLogExcel> exportDistributionServiceLog(Wrapper<DistributionServiceLogEntity> queryWrapper);
 
+    Boolean OwnSaveOrUpdate(DistributionServiceLogEntity distributionServiceLog);
 }

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

@@ -17,14 +17,22 @@
 package com.logpm.distribution.service.impl;
 
 import com.logpm.distribution.entity.DistributionServiceLogEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionServiceLogVO;
 import com.logpm.distribution.excel.DistributionServiceLogExcel;
 import com.logpm.distribution.mapper.DistributionServiceLogMapper;
 import com.logpm.distribution.service.IDistributionServiceLogService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.ArrayList;
 import java.util.List;
 
 /**
@@ -34,8 +42,12 @@ import java.util.List;
  * @since 2023-06-14
  */
 @Service
+@Slf4j
+@AllArgsConstructor
 public class DistributionServiceLogServiceImpl extends BaseServiceImpl<DistributionServiceLogMapper, DistributionServiceLogEntity> implements IDistributionServiceLogService {
 
+	private final IDistributionStockArticleService distributionStockArticleService;
+
 	@Override
 	public IPage<DistributionServiceLogVO> selectDistributionServiceLogPage(IPage<DistributionServiceLogVO> page, DistributionServiceLogVO distributionServiceLog) {
 		return page.setRecords(baseMapper.selectDistributionServiceLogPage(page, distributionServiceLog));
@@ -51,4 +63,27 @@ public class DistributionServiceLogServiceImpl extends BaseServiceImpl<Distribut
 		return distributionServiceLogList;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean OwnSaveOrUpdate(DistributionServiceLogEntity distributionServiceLog) {
+		String[] split = distributionServiceLog.getStockArticleId().split(",");
+		List<DistributionServiceLogEntity> list = new ArrayList<>();
+		List<DistributionStockArticleEntity> entityList = new ArrayList<>();
+		for (String s : split) {
+			DistributionServiceLogEntity distributionServiceLogEntity = new DistributionServiceLogEntity();
+			BeanUtils.copyProperties(distributionServiceLog,distributionServiceLogEntity);
+			distributionServiceLogEntity.setStockArticleId(s);
+			list.add(distributionServiceLogEntity);
+			DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
+			distributionStockArticle.setId(Long.parseLong(s));
+			distributionStockArticle.setTypeService(distributionServiceLog.getTypeService());
+			distributionStockArticle.setRate(distributionServiceLog.getCost());
+			entityList.add(distributionStockArticle);
+		}
+		//添加记录
+		this.saveBatch(list);
+		//修改订单服务状态
+		return distributionStockArticleService.saveOrUpdateBatch(entityList);
+	}
+
 }