1.查询订单接口

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

@@ -0,0 +1,34 @@
+package com.logpm.distribution.vo.app;
+
+import com.logpm.distribution.entity.DistributionParcelListEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class queryOrderVO extends DistributionParcelListEntity {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 包件列表
+	 */
+	@ApiModelProperty(value = "包件列表")
+	private List<DistributionParcelListEntity> list = new ArrayList<>();
+	/**
+	 * 定制品
+	 */
+	@ApiModelProperty(value = "定制品数量")
+	private Integer wrapNum;
+
+	/**
+	 * 库存品数量
+	 */
+	@ApiModelProperty(value = "定制品数量")
+	private Integer inventoryNum;
+
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -191,6 +191,7 @@ public class BasicMaterialController extends BladeController {
 		basicMaterialExcel.setLogpmUnit("1");
 		basicMaterialExcel.setPackageNum("3");
 		basicMaterialExcel.setWeight(BigDecimal.valueOf(0));
+		list.add(basicMaterialExcel);
 		ExcelUtil.export(response, "物料基础信息数据模板" + DateUtil.time(), "物料基础信息数据模板表", list, BasicMaterialExcel.class);
 	}
 

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

@@ -0,0 +1,50 @@
+package com.logpm.distribution.appcontroller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.distribution.dto.app.queryOrderDTO;
+import com.logpm.distribution.service.IDistributionStockArticleService;
+import com.logpm.distribution.vo.app.queryOrderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Log4j2
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/distributionInQuery")
+@Api(value = "库内查询", tags = "库内查询")
+public class DistributionInQueryApiController {
+
+	private final IDistributionStockArticleService distributionStockArticleService;
+
+
+	@ResponseBody
+	@PostMapping("/order")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询订单", notes = "传入trayTypeDTO")
+	public R order(@RequestBody queryOrderDTO queryrderDTO) {
+		if (null == queryrderDTO.getType()){
+			return R.fail("查询类型为空");
+		}
+		queryOrderVO q = distributionStockArticleService.queryOrder(queryrderDTO);
+		return R.data(q);
+	}
+
+	@ResponseBody
+	@PostMapping("/fuzzy")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "模糊查询", notes = "传入trayTypeDTO")
+	public R fuzzy(@RequestBody queryOrderDTO queryrderDTO) {
+		if (null == queryrderDTO.getType()){
+			return R.fail("查询类型为空");
+		}
+		List<String> q = distributionStockArticleService.queryFuzzy(queryrderDTO);
+		return R.data(q);
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/queryOrderDTO.java

@@ -0,0 +1,17 @@
+package com.logpm.distribution.dto.app;
+
+import lombok.Data;
+
+@Data
+public class queryOrderDTO {
+
+	/**
+	 * 查询条件
+	 */
+	private String condition;
+
+	/**
+	 * 类型（1-包条,2-订单）
+	 */
+	private Integer type;
+}

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

@@ -28,6 +28,7 @@ import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.PackageStockupVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -106,4 +107,11 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 * @return
 	 */
 	List<DistributionParcelListEntity> getPackageList(@Param("stockArticleId") Long id);
+
+
+	List<DistributionParcelListEntity> selectListByOderId(@Param("id")Long id,@Param("collect") List<Long> collect);
+
+	ArrayList<String> selectorderPackageCodeByLike(@Param("condition") String condition,@Param("collect") List<Long> collect);
+
+	ArrayList<String> selectorderCodeByLike(@Param("condition") String condition,@Param("collect") List<Long> collect);
 }

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

@@ -504,5 +504,57 @@
             ldpl.stock_article_id = #{stockArticleId} and ldpl.order_package_reservation_status in ('10','20') and ldpl.order_package_reservation_status = '10'
 
     </select>
+    <select id="selectListByOderId" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        SELECT
+            ldpl.id id,
+            ldpl.order_package_code orderPackageCode,
+            ldpl.warehouse warehouse,
+            ldpl.firsts firsts,
+            ldpl.SECOND SECOND,
+            ldpl.third_product thirdProduct,
+            ldpl.material_name materialName,
+            ldpl.order_package_status orderPackageStatus,
+            lwug.position_code goodsAllocation
+        FROM
+            logpm_distribution_parcel_list ldpl
+                JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id = ldsa.id
+                LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id
+        <where>
+            ldsa.is_deleted = 0
+          AND ldpl.conditions =1
+            <if test="id != null and id != ''" > and ldsa.id = #{id} </if>
+<!--            <if test="condition != null and condition != ''" > and ldsa.order_code = #{condition} </if>-->
+            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+                and ldpl.warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="selectorderPackageCodeByLike" resultType="java.lang.String">
+        select order_package_code from logpm_distribution_parcel_list
+        <where>
+            is_deleted = 0 and order_package_code like concat('%',#{condition},'%')
+            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+                and warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="selectorderCodeByLike" resultType="java.lang.String">
+        select order_code from logpm_distribution_stock_article
+        <where>
+            is_deleted = 0 and order_code like concat('%',#{condition},'%')
+            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+                and warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
+import com.logpm.distribution.vo.app.queryOrderVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -92,4 +93,8 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 
     void updateGroundingStatus(@Param("orderCode") String orderCode, @Param("groundingStatus") String groundingStatus);
     IPage<DistributionStockArticleEntity> pageListOwe(IPage page,@Param("param")DistributionStockArticleOweDTO stockArticleEntity);
+
+	queryOrderVO selectOneByWrap(@Param("condition") String condition,@Param("collect") List<Long> collect);
+
+	queryOrderVO selectOneByOrder(@Param("condition") String condition,@Param("collect") List<Long> collect);
 }

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

@@ -404,6 +404,31 @@
         </where>
         GROUP BY  ldsa.id ,ldpl.id
     </select>
+    <select id="selectOneByWrap" resultType="com.logpm.distribution.vo.app.queryOrderVO">
+        SELECT ldsa.* FROM logpm_distribution_parcel_list ldpl join logpm_distribution_stock_article ldsa on ldpl.stock_article_id = ldsa.id
+        <where>
+         ldsa.is_deleted =0 and ldpl.order_package_code = #{condition}
+            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+                and ldsa.warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="selectOneByOrder" resultType="com.logpm.distribution.vo.app.queryOrderVO">
+        SELECT ldsa.* FROM  logpm_distribution_stock_article ldsa
+        <where>
+            ldsa.is_deleted =0 and ldsa.order_code = #{condition}
+            <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
+                and ldsa.warehouse_id in
+                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
     <update id="updateGroundingStatus" >
         update logpm_distribution_stock_article

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

@@ -19,10 +19,12 @@ package com.logpm.distribution.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
+import com.logpm.distribution.dto.app.queryOrderDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.distribution.vo.app.queryOrderVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -135,4 +137,13 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 * @return
 	 */
 	R selectStockArticleInfoList(Map<String, Object> distributionStockArticle, Query query);
+	/**
+	 * 订单查询
+	 * @param queryrderDTO
+	 */
+	queryOrderVO queryOrder(queryOrderDTO queryrderDTO);
+
+	queryOrderVO queryOrderVOCont(String condition,Integer i);
+
+	List<String> queryFuzzy(queryOrderDTO queryrderDTO);
 }

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

@@ -32,6 +32,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.dto.DistributionStockArticleOweDTO;
+import com.logpm.distribution.dto.app.queryOrderDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.mapper.DistributionAddvalueMapper;
@@ -43,6 +44,7 @@ import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
+import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import lombok.AllArgsConstructor;
@@ -779,6 +781,74 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return R.data(distributionStockArticleVOIPage);
 	}
 
+	@Override
+	public queryOrderVO queryOrder(queryOrderDTO queryrderDTO) {
+		queryOrderVO queryOrderVO  =new queryOrderVO();
+		//查询类型
+		switch (queryrderDTO.getType()){
+			case 1:
+				//查询包条
+			 queryOrderVO = this.queryOrderVOCont(queryrderDTO.getCondition(),1);
+				break;
+			case 2:
+				//查询订单
+			 queryOrderVO = this.queryOrderVOCont(queryrderDTO.getCondition(),2);
+				break;
+		};
+		return queryOrderVO;
+	}
+
+	@Override
+	public queryOrderVO queryOrderVOCont(String condition,Integer i) {
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWarehouseList.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		//查询包条所在订单
+		queryOrderVO queryOrderVO;
+		if (i ==1){
+		 	queryOrderVO =	distributionStockArticleMapper.selectOneByWrap(condition,collect);
+		}else {
+			//根据订单自编码查询该订单
+			queryOrderVO =	distributionStockArticleMapper.selectOneByOrder(condition,collect);
+		}
+		if (null == queryOrderVO){
+			return new queryOrderVO();
+		}
+		Long id = queryOrderVO.getId();
+		//查询订单下的所有包条
+		List<DistributionParcelListEntity>  distributionParcelListEntitys =	distributionParcelListMapper.selectListByOderId(id,collect);
+	   queryOrderVO.setWrapNum(distributionParcelListEntitys.size());
+	   queryOrderVO.setInventoryNum(0);
+		queryOrderVO.setList(distributionParcelListEntitys);
+		return queryOrderVO;
+	}
+
+	@Override
+	public List<String> queryFuzzy(queryOrderDTO queryrderDTO) {
+		ArrayList<String> arrayList = new ArrayList<>();
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWarehouseList.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+		//查询类型
+		switch (queryrderDTO.getType()){
+			case 1:
+				//查询包条
+				arrayList =distributionParcelListMapper.selectorderPackageCodeByLike(queryrderDTO.getCondition(),collect);
+			break;
+			case 2:
+				//查询订单
+				arrayList =distributionParcelListMapper.selectorderCodeByLike(queryrderDTO.getCondition(),collect);
+			break;
+
+		};
+		return arrayList;
+	}
+
+
 	@Override
 	public DistributionStockArticleEntity findStockArticleByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml

@@ -92,7 +92,6 @@
             <if test="param.bindingType!=null and param.bindingType!=''">
                 and lwup.binding_type = #{param.bindingType}
             </if>
-
         </where>
 
     </select>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -47,6 +47,7 @@ import com.logpm.warehouse.service.IWarehouseWarehousingDetailService;
 import com.logpm.warehouse.service.IWarehouseWarehousingEntryService;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -71,6 +72,7 @@ import java.util.stream.Collectors;
  */
 @AllArgsConstructor
 @Service
+@Log4j2
 public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<WarehouseWarehousingEntryMapper, WarehouseWarehousingEntryEntity> implements IWarehouseWarehousingEntryService {
 	private final IWarehouseWarehousingDetailService warehouseWarehousingDetailService;
 	private final IDistributionStockListClient distributionStockListClient;
@@ -355,6 +357,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 	@Override
 	public WarehouseWarehousingEntryVO getOneOwn(WarehouseWarehousingEntryEntity warehouseWarehousingEntry) {
 		WarehouseWarehousingEntryEntity one = this.getOne(Condition.getQueryWrapper(warehouseWarehousingEntry));
+		log.info("one>>>>>>>>>>>>{}",one);
 		if(ObjectUtils.isNotNull(one) && ObjectUtils.isNotNull(one.getId())){
 			List<WarehouseWarehousingDetailEntity> list = warehouseWarehousingDetailService.list(Wrappers.<WarehouseWarehousingDetailEntity>query().lambda()
 				.eq(WarehouseWarehousingDetailEntity::getWarehousingEntryId, one.getId())