PDA备货调整

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java

@@ -81,7 +81,7 @@ public interface IBasicdataGoodsAllocationClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/scanStockUpAllocationByCode")
-	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode);
+	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(@RequestParam Long stockUpAreaCode);
 
 	/**
 	 * 查询库位的完整名称，按照货区-货架-货位的方式呈现

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

@@ -26,6 +26,8 @@ public class DistributionStockupListVO implements Serializable {
 
 	private String trays;//托盘
 
+	 private String mallName;//商场名称
+
 	private Integer orderNum;//订单总数
 	private Integer stockupNum;//备货数
 	private Integer inventoryNub;//库存品数

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

@@ -300,7 +300,6 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	@Override
 	public BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode) {
-
 		return baseMapper.getAllocationIntegrityEntity(stockUpAreaCode);
 	}
 

blade-service/logpm-distribution/pom.xml

@@ -116,12 +116,12 @@
 <!--            <version>${bladex.project.version}</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>logpm-factory-api</artifactId>
-            <version>${bladex.project.version}</version>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>logpm-factory-api</artifactId>-->
+<!--            <version>${bladex.project.version}</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
 
 
     </dependencies>

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

@@ -209,14 +209,15 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperation(value = "检查备货区", notes = "传入stockupDTO")
 	public R scanStockUpArea(@RequestParam Long stockUpAreaCode) {
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = basicdataGoodsAllocationClient.scanStockUpAllocationByCode(stockUpAreaCode);
+		if (Func.isEmpty(basicdataGoodsAllocationEntity)){
+			return Resp.scanFail("无此库位信息","无此库位信息");
+		}
 		Long goodsAreaId = basicdataGoodsAllocationEntity.getGoodsAreaId();
 		BasicdataGoodsAreaEntity entityByGoodsAreaId = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
-		if (entityByGoodsAreaId.getAreaType().equals("1")){
+		if (entityByGoodsAreaId.getAreaType().equals("2")){
 			return Resp.scanFail("不是备货区库位","不是备货区库位");
 		}
-		if (Func.isEmpty(basicdataGoodsAllocationEntity)){
-			return Resp.scanFail("无此库位信息","无此库位信息");
-		}
+
 		return R.data(basicdataGoodsAllocationEntity);
 	}
 

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

@@ -414,6 +414,14 @@
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldsi.reservation_id
         where ds.id = lds.id
         ) customer,
+<!--        (-->
+<!--        SELECT-->
+<!--        group_concat(  IFNULL( ldr.mall_name, '' ) SEPARATOR ',' )-->
+<!--        FROM-->
+<!--        logpm_distribution_reservation ldr-->
+<!--        WHERE-->
+<!--        ldr.id = ldsi.reservation_id-->
+<!--        ) AS mallName,-->
         (
         select GROUP_CONCAT(DISTINCT lwug.position_code )
         from logpm_distribution_stockup ds
@@ -481,6 +489,14 @@
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
         where ldbs.bill_lading_id = ldsi.reservation_id
         ) customer,
+<!--        (-->
+<!--        SELECT-->
+<!--        group_concat(  IFNULL( ldr.mall_name, '' ) SEPARATOR ',' )-->
+<!--        FROM-->
+<!--        logpm_distribution_reservation AS ldr-->
+<!--        WHERE-->
+<!--        ldr.id = ldsi.reservation_id-->
+<!--        ) AS mallName,-->
         (
         select GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ',')
         from logpm_distrilbution_bill_stock ldbs

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

@@ -777,7 +777,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 		distributionStockListInfo.setServiceNumber(distributionStockListEntity.getServiceNumber()); //服务号
 		distributionStockListInfo.setDescriptionGoods(distributionStockListEntity.getMallName()); //物料名称
-		distributionStockListInfo.setCargoNumber(distributionStockListEntity.getMarketCode()); //物料编号
+		distributionStockListInfo.setCargoNumber(distributionStockListEntity.getCargoNumber()); //物料编号
 		distributionStockListInfo.setWarehouseName(distributionStockListEntity.getWarehouseName()); //仓库
 		distributionStockListInfo.setWarehouseId(distributionStockListEntity.getWarehouseId()); //仓库ID
 		distributionStockListInfo.setMarketId(distributionStockListEntity.getMarketId()); //商场

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -34,7 +34,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
-//import org.springblade.system.feign.IRegionFeign;
+import org.springblade.system.feign.IRegionFeign;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,7 +63,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final IDistributionStockArticleClient distributionStockArticleClient;
 	private final IDistributionParcelListClient distributionParcelListClient;
 	private final IDistributionParcelNumberClient distributionParcelNumberClient;
-//	private final IRegionFeign regionFeign;
+	private final IRegionFeign regionFeign;
 
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {