Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java

@@ -0,0 +1,50 @@
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_basicdata_factory_category")
+@ApiModel(value = "BasicdataFactoryCategory对象", description = "工厂物料映射表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataFactoryCategoryEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+
+	private Long categoryId;
+	private String firsts;
+	private String seconds;
+	private String thirds;
+	private String brand;
+
+
+}

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

@@ -1423,11 +1423,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			stockArticleEntity.setCompleteSet(1);
 			if (signNum == 0) {
 				if (handleNum == 0) {
-					stockArticleEntity.setOrderStatus("30");
+					stockArticleEntity.setOrderStatus("20");
 				} else if (0 < handleNum && handleNum < totalNumber) {
-					stockArticleEntity.setOrderStatus("30");
+					stockArticleEntity.setOrderStatus("20");
 				} else {
-					stockArticleEntity.setOrderStatus("30");
+					stockArticleEntity.setOrderStatus("20");
 				}
 			} else {
 				stockArticleEntity.setOrderStatus("70");
@@ -1449,9 +1449,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			stockArticleEntity.setCompleteSet(2);
 			if (signNum == 0) {
 				if (handleNum == 0) {
-					stockArticleEntity.setOrderStatus("40");
+					stockArticleEntity.setOrderStatus("20");
 				} else if (0 < handleNum && handleNum < totalNumber) {
-					stockArticleEntity.setOrderStatus("30");
+					stockArticleEntity.setOrderStatus("20");
 				} else {
 					stockArticleEntity.setOrderStatus("20");
 				}