Merging dev

blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderReceiveStatusConstant.java

@@ -0,0 +1,47 @@
+package org.springblade.common.constant.order;
+
+/**
+ * 订单收货枚举
+ * 对应码表
+ * order_receive_status
+ * @author pref
+ */
+public enum OrderReceiveStatusConstant {
+
+	weishouhuo("未收货","10"),
+	bufenshouhuo("部分收货","20"),
+	yishouhuo("已收货","30");
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private OrderReceiveStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -401,6 +401,9 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "备货状态")
 	private String stockupStatus;
 
+	@ApiModelProperty(value = "收货状态")
+	private String orderReceiveStatus;
+
 
 
 

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

@@ -88,6 +88,9 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "备货状态名称")
 	private String stockupStatusName;
 
+
+	@ApiModelProperty(value = "收货状态名称")
+	private String orderReceiveStatusName;
 	/**
 	 * 是否齐套名称
 	 */

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

@@ -83,12 +83,12 @@ public class BasicdataWarehouseController extends BladeController {
 		Object endDate = warehouseWarehouse.get("endDate");
 		warehouseWarehouse.put("startDate", null);
 		warehouseWarehouse.put("endDate", null);
-		String deptId = AuthUtil.getUser().getDeptId();
+//		String deptId = AuthUtil.getUser().getDeptId();
 		QueryWrapper<BasicdataWarehouseEntity> qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class);
 		qw.apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate)
 			.apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate);
-		qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId());
+//		qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId());
-		qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId);
+//		qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId);
 		IPage<BasicdataWarehouseEntity> page = warehouseService.page(Condition.getPage(query), qw);
 		//TODO  这里将仓库的行政区域放到Service中通过缓存进行陪陪结果后返回给前端
 		page.getRecords().forEach(basicdataWarehouseEntity -> {

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

@@ -66,4 +66,13 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @return
 	 */
     IPage<DistributionParcelListEntity> getParcelListOwn(IPage<Object> page, Map<String, Object> distributionParcelList);
+
+
+	/**
+	 * 根据包件状态维护订单的状态
+	 * @param orderPackageCode
+	 * @param type
+	 */
+	void updateOrderStatus(String orderPackageCode,String type);
+
 }

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

@@ -91,4 +91,14 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.getParcelListOwn(page, Long.parseLong((String) o) );
 	}
 
+	@Override
+	public void updateOrderStatus(String orderPackageCode, String type) {
+
+		// 根据传入的类型
+
+		// 上架状态
+
+
+
+	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -439,8 +439,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setFreezeStatus(OrderFreezeStatusConstant.weidongjie.getValue()); //冻结状态
 				distributionStockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); //预约状态
 				distributionStockArticleEntity.setStockupStatus(OrderStockupStatusConstant.daibeihuo.getValue()); //备货状态
-				distributionStockArticleEntity.setGroundingStatus(OrderGroundingStatusConstant.bufenshangjia.getValue()); //上架状态
+				distributionStockArticleEntity.setGroundingStatus(OrderGroundingStatusConstant.daishangjia.getValue()); //上架状态
-				distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
+				distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
+				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
@@ -456,6 +457,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			saveOrderPackage(unitNo, distributionStockArticleEntity, id, basicdataWarehouseEntity);
 			//包件保存成功去修改订单的数量
 			distributionStockArticleClient.addHandQuantity(id,1);
+
+
+			// 根据包件维护订单的状态
+
+
+
+
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		}else {
 			//已存在包件信息那就不处理