Merge branch 'dev' into test

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

@@ -145,4 +145,7 @@ public class  DistributionStockEntity extends TenantEntity {
 	@ApiModelProperty(value = "备货区")
 	private String stockupArea;
 
+	@ApiModelProperty(value = "扫码类型 1包件 2库存品")
+	private Integer type;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -245,6 +245,7 @@ public class DistributionStockupAppController extends BladeController {
 			entity.setStockupArea(stockupArea);
 			entity.setReservationId(reservationId);
 			entity.setConditions(0);
+			entity.setType(2);
 			distributionStockService.save(entity);
 
 			Map<String, Object> map = new HashMap<>();
@@ -289,6 +290,7 @@ public class DistributionStockupAppController extends BladeController {
 			entity.setReservationId(reservationId);
 			entity.setStockListId(stockListId);
 			entity.setConditions(0);
+			entity.setType(2);
 			distributionStockService.save(entity);
 
 			Map<String, Object> map = new HashMap<>();

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java

@@ -37,7 +37,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -133,19 +132,19 @@ public class PanFactoryDataController extends BladeController {
 	}
 
 
-	@ResponseBody
-	@PostMapping("/test")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "通常数据推送", notes = "传入factoryOrderDTO")
-	public Resp test(@RequestBody Map<String,Object> map) {
-		String unitNo = (String) map.get("unitNo");
-
-
-		//真正的处理需要的数据
-		panFactoryDataService.handleDataToPlatform("CS0011061260002",null);
-
-		return null;
-	}
+//	@ResponseBody
+//	@PostMapping("/test")
+//	@ApiOperationSupport(order = 1)
+//	@ApiOperation(value = "通常数据推送", notes = "传入factoryOrderDTO")
+//	public Resp test(@RequestBody Map<String,Object> map) {
+//		String unitNo = (String) map.get("unitNo");
+//
+//
+//		//真正的处理需要的数据
+//		panFactoryDataService.handleDataToPlatform("CS0011061260002",null);
+//
+//		return null;
+//	}
 
 
 }