零担包件详情

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

@@ -0,0 +1,117 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.vo;
+
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 配送在库订单 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-13
+ */
+@Data
+public class DistributionOrderZeroPackafeVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Long Id;
+	/**
+	 * 总数
+	 */
+	private Integer quantity;
+	/**
+	 * 品类
+	 */
+	private String firsts;
+
+	private String warehouseName;
+	/**
+	 * 入库车次
+	 */
+	private String trainNumber;
+	/**
+	 * 订单自编号
+	 */
+	private String orderCode;
+	/**
+	 * 品牌
+	 */
+	private String brandName;
+	/**
+	 * 运单号
+	 */
+	private String waybillNumber;
+	/**
+	 * 入库时间
+	 */
+	private String warehouseEntryTimeEnd;
+	/**
+	 * 发站仓
+	 */
+	private String sendWarehouseName;
+	/**
+	 * 收站仓
+	 */
+	private String acceptWarehouseName;
+	/**
+	 * 托盘
+	 */
+	private String pallet;
+	/**
+	 * 库位
+	 */
+	private String goodsAllocation;
+	/**
+	 * 在库数量
+	 */
+	private Integer handQuantity;
+	/**
+	 * 冻结数量
+	 */
+	private Integer deliveryQuantity;
+	/**
+	 * 出库数量
+	 */
+	private Integer outboundQuantity;
+	/**
+	 * 签收数量
+	 */
+	private Integer signinQuantity;
+	/**
+	 * 品类
+	 */
+	private String aaa;
+	/**
+	 * 品类
+	 */
+	private String bbb;
+	/**
+	 * 品类
+	 */
+	private String ccc;
+
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java

@@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 品类 数据传输对象实体类
  *
@@ -33,5 +35,8 @@ public class BasicdataWarehouseDTO extends BasicdataWarehouseEntity {
 
 	private Integer pageType;
 
+	private String warehouseNames;
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java

@@ -42,7 +42,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 
 	/**
@@ -89,7 +89,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectExpireWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectExpireWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 	/**
 	 * 查询临期仓库
@@ -97,6 +97,6 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	 * @param warehouseWarehouse
 	 * @return
 	 */
-	IPage<BasicdataWarehouseVO> selectDeadlineWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse);
+	IPage<BasicdataWarehouseVO> selectDeadlineWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List<String> warehouseNameList);
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml

@@ -74,6 +74,13 @@
         select * from logpm_warehouse_warehouse
         <where>
             is_deleted = 0
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
 
@@ -150,6 +157,13 @@
         <where>
             is_deleted = 0
             AND  DATEDIFF(DATE_FORMAT(end_date,'%y%m%d'),DATE_FORMAT(NOW(),'%y%m%d'))  &lt;= 0
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
     <select id="selectDeadlineWarehouseWarehousePage" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
@@ -157,6 +171,13 @@
         <where>
             is_deleted = 0
             AND  DATEDIFF(DATE_FORMAT(end_date,'%y%m%d'),DATE_FORMAT(NOW(),'%y%m%d'))  BETWEEN 1 AND 90
+            <if test="warehouseNameList != '' and warehouseNameList != null">
+                AND name IN
+                <foreach collection="warehouseNameList" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+
+            </if>
         </where>
     </select>
 

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

@@ -93,16 +93,20 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		if (!Objects.isNull(warehouseWarehouse.getPageType())){
 			 pageType = warehouseWarehouse.getPageType();
 		}
+		List<String> warehouseNameList = null;
+		if (!Objects.isNull(warehouseWarehouse.getWarehouseNames())){
+			warehouseNameList = Func.toStrList(warehouseWarehouse.getWarehouseNames());
+		}
 		switch (pageType){
 			case 1:
-				IPage<BasicdataWarehouseVO> basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				return basicdataWarehouseVOS;
 			case 2:
-				IPage<BasicdataWarehouseVO> basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				//临期
 				return basicdataDeadlineWarehouseVOS;
 			case 3:
-				IPage<BasicdataWarehouseVO> basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse);
+				IPage<BasicdataWarehouseVO> basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList);
 				return basicdataExpireWarehouseVOS;
 			default:
 				log.error("未知的pageType>>>>>>>>>>>>>>> {}",pageType);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -26,6 +26,7 @@ import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.vo.DistributionOrderZeroPackafeVO;
 import com.logpm.distribution.vo.DistributionParcelListBaseVO;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.DistributionParcelListZeroVO;
@@ -90,6 +91,15 @@ public class DistributionParcelListController extends BladeController  {
 		return R.data(DistributionParcelListWrapper.build().pageVO(pages));
 	}
 
+
+	@GetMapping("/zeroList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
+	public R zeroList(@ApiIgnore @RequestParam Long orderId) {
+		List<DistributionOrderZeroPackafeVO> pages = distributionParcelListService.pageOweZeroList(orderId);
+		return R.data(pages);
+	}
+
 	/**
 	 * 在库订单包件清单 分页
 	 */

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

@@ -317,4 +317,13 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     void deleteListByParcelListIds(@Param("parceListIds") List<Long> deleteParcelListIds);
 
 	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(@Param("waybillNo") String waybillNo, @Param("warehouseId") Long warehouseId);
+
+	/**
+	 * 查询零担包件详情
+	 * @param page
+	 * @param distributionParcelListDTO
+	 * @return
+	 */
+	List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId);
+
 }

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

@@ -1982,5 +1982,65 @@
         where lwwd.waybill_no = #{waybillNo}
         and ldpl.warehouse_id = #{warehouseId}
     </select>
+    <select id="pageOweZeroList" resultType="com.logpm.distribution.vo.DistributionOrderZeroPackafeVO">
+        SELECT
+        t.id AS id,
+        t.warehouse AS warehouseName,
+        t.firsts AS firsts,
+        t.quantity AS quantity,
+        t.train_number AS train_number,
+        t.order_code AS orderCode,
+        t.brand_name AS brandName,
+        t.waybill_number AS waybillNumber,
+        t.warehouse_entry_time_end AS warehouseEntryTimeEnd,
+        t.send_warehouse_name AS sendWarehouseName,
+        t.accept_warehouse_name AS acceptWarehouseName,
+        t.pallet AS  pallet,
+        t.goodsAllocation AS  goodsAllocation,
+        t.hand_quantity AS handQuantity,
+        t.delivery_quantity AS deliveryQuantity,
+        t.outbound_quantity AS outboundQuantity,
+        t.signin_quantity AS signinQuantity,
+        t.aaa,
+        t.bbb,
+        t.ccc
+        FROM
+        (
+        SELECT
+        ldpl.id,
+        ldpl.warehouse,
+        ldpl.firsts,
+        ldpl.train_number,
+        ldpl.order_code,
+        ldpl.brand_name,
+        ldpl.waybill_number,
+        ldpl.warehouse_entry_time_end,
+        ldpl.send_warehouse_name,
+        ldpl.accept_warehouse_name,
+        ldsa.trays pallet,
+        ldsa.allocation goodsAllocation,
+        ldpn.hand_quantity,
+        ldpn.quantity,
+        ldpn.delivery_quantity,
+        ldpn.outbound_quantity,
+        ldpn.signin_quantity,
+        IF(ldpn.outbound_quantity > 0,IF(ldpn.outbound_quantity = ldpn.quantity,'已出库','部分出库'),'未出库') AS aaa,
+        IF(ldpn.signin_quantity > 0,IF(ldpn.signin_quantity = ldpn.quantity,'已签收','部分签收'),'未签收') AS bbb,
+        IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) = 0,'已配送',IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) > 0,'部分配送','未配送')) AS ccc
+        FROM
+        logpm_distribution_parcel_list ldpl
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldpl.stock_article_id = ldsa.id
+        LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id
+        WHERE
+        ldpl.conditions = '3'
+        AND ldpl.is_deleted = 0
+        AND ldpl.stock_article_id = #{orderId}
+        GROUP BY
+        ldpl.id
+        ) AS t
+
+
+
+    </select>
 
 </mapper>

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

@@ -477,8 +477,9 @@
             <if test="o != '' and o != null">
                and ldpl.id = #{o}
             </if>
-
         </where>
+        GROUP BY
+        ldpl.id
     </select>
 
     <select id="fingListByServiceNumber" resultType="java.util.Map">

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

@@ -290,4 +290,12 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	void deleteListByParcelListIds(List<Long> deleteParcelListIds);
 
 	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId);
+
+	/**
+	 * 查询零担品类信息
+	 * @return
+	 */
+	List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId);
+
+
 }

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

@@ -309,24 +309,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			} else {
 				distributionParcelListDTO.setStockArticleIdsLike(trim);
 			}
-			//转库存品限制
-			/*if(ObjectUtils.isNotNull(o) && String.valueOf(o).equals("2")){
-				//查询包件上架状态
-				//查询包件有没有上架，打托信息
-				List<DistributionStockArticleGroundingVO> list2 = distributionStockArticleMapper.selectListGrounding(list);
-				if(!list2.isEmpty()){
-					boolean b = list2.stream().anyMatch(i -> i.getGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue()));
-					if(b){
-						throw new ServiceException("选择的订单有上架的包件，请下架后在操作！");
-					}else{
-						boolean b1 = list2.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getAssociationType()));
-						if(b1){
-							throw new ServiceException("选择的订单在托盘上面有包件，请解托后在操作！");
-						}
-					}
-				}
-			}*/
-
 		}
 		return baseMapper.pageOweList(page, distributionParcelListDTO);
 	}
@@ -1530,4 +1512,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId) {
 		return baseMapper.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId);
 	}
+
+	@Override
+	public List<DistributionOrderZeroPackafeVO> pageOweZeroList(Long orderId) {
+
+
+		return baseMapper.pageOweZeroList(orderId);
+	}
 }

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

@@ -3207,7 +3207,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
 		String mallName = "";
 		if (!Objects.isNull(distributionReservationEntity)){
-			mallName = distributionReservationEntity.getReceivingUnit();
+			mallName = distributionReservationEntity.getMallName();
 		}
 		//查询自提
 		DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
@@ -3230,7 +3230,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (jsonArray != null) {
 				for (int i = 0; i < jsonArray.size(); i++) {
 					JSONObject jsonObject = jsonArray.getJSONObject(i);
-					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = JSONObject.parseObject(jsonObject.toJSONString(), WarehouseUpdownGoodsEntity.class);
+					WarehouseUpdownGoodsEntity	warehouseUpdownGoodsEntity = JSONObject.parseObject(jsonObject.toJSONString(), WarehouseUpdownGoodsEntity.class);
 					if ("3".equals(warehouseUpdownGoodsEntity.getAssociationType()) && warehouseUpdownGoodsEntity.getAssociationValue().equals(orderPackageCode)) {
 						// 得到的的是包件 通过包件 查询  通过包件码查询
 						Map<String, Object> map = distributionStockListInfoMapper.selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(warehouseUpdownGoodsEntity.getAssociationValue(), warehouseUpdownGoodsEntity.getWarehouseId(), cargoNumber);
@@ -3357,7 +3357,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName);
 			// 入库 时间先进的先出
-			lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
+ 		lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
 			List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(lambdaQueryWrapper);
 			return distributionStockListEntities.get(0).getId();