修改自提操作

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

@@ -123,6 +123,9 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	@ApiModelProperty("通知状态")
 	private String notificationStatus;
 
+	@ApiModelProperty("提货批次")
+	private String pickupBatch;
+
 
 
 

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

@@ -107,6 +107,17 @@ public class DistributionParcelListController extends BladeController  {
 		IPage<DistributionParcelListVO> pages = distributionParcelListService.getParcelListOwn(Condition.getPage(query), distributionParcelList);
 		return R.data(pages);
 	}
+	/**
+	 * 在库订单包件清单 自提分页
+	 */
+	@GetMapping("/parcelListOwnSelf")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
+	public R<IPage<DistributionParcelListVO>> getParcelListOwnSelf(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
+
+		IPage<DistributionParcelListVO> pages = distributionParcelListService.getParcelListOwnSelf(Condition.getPage(query), distributionParcelList);
+		return R.data(pages);
+	}
 
 	/**
 	 * 在库订单包件清单

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

@@ -122,6 +122,16 @@ public class DistributionStockupController extends BladeController {
 		IPage<DistributionStockupVO> detail = distributionStockupService.getInventoryOwn(Condition.getPage(query),Long.parseLong((String) o));
 		return R.data(detail);
 	}
+	/**
+	 * 备货信息表 库存品信息自提 详情
+	 */
+	@GetMapping("/inventoryOwnSelf")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	public R<IPage<DistributionStockupVO>> getInventoryOwnSelf(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+		Object o = distributionStockup.get("id");
+		IPage<DistributionStockupVO> detail = distributionStockupService.getInventoryOwnSelf(Condition.getPage(query),Long.parseLong((String) o));
+		return R.data(detail);
+	}
 	/**
 	 * 备货信息表 订单信息 详情
 	 */
@@ -132,6 +142,16 @@ public class DistributionStockupController extends BladeController {
 		IPage<DistributionStockupVO> detail = distributionStockupService.detailOrderOwn(Condition.getPage(query),Long.parseLong((String) o));
 		return R.data(detail);
 	}
+	/**
+	 * 备货信息表 订单信息 自提详情
+	 */
+	@GetMapping("/detailOrderOwnSelf")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	public R<IPage<DistributionStockupVO>> detailOrderOwnSelf(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+		Object o = distributionStockup.get("id");
+		IPage<DistributionStockupVO> detail = distributionStockupService.detailOrderOwnSelf(Condition.getPage(query),Long.parseLong((String) o));
+		return R.data(detail);
+	}
 
 	/**
 	 * 备货信息表 分页

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

@@ -77,4 +77,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	void updateOrderGroundingStatus(@Param("orderCode") String orderCode, @Param("groundingStatus") String groundingStatus);
 
     String getOrderPackageCode(@Param("id")Long id);
+
+	IPage<DistributionParcelListVO> getParcelListOwnSelf(IPage<Object> page,@Param("id") long parseLong);
 }

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

@@ -60,6 +60,18 @@
         where stock_article_id = #{id}
     </select>
 
+    <select id="getParcelListOwnSelf" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
+        select ldpl.id id,ldpl.order_package_code orderPackageCode,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,
+        ldpl.goods_allocation goodsAllocation,ldpl.pallet,lds.coding stockupStatus,lds.create_time stockupDate ,lds.stockup_area stockupArea
+        from  logpm_distribution_stockup_info ldsi
+        LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id =ldpl.stock_article_id
+        LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id
+        <where>
+            ldsi.stockup_id = #{id}
+        </where>
+    </select>
+
     <select id="exportDistributionParcelList" resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
         SELECT * FROM logpm_distribution_parcel_list ${ew.customSqlSegment}
     </select>

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

@@ -111,4 +111,8 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	DistributionStockupVO getDeliveryStockupInfo(@Param("id")Long id);
 
 	String selectStockupAreaByReservationId(@Param("reservationId") Long id);
+
+	IPage<DistributionStockupVO> detailOrderOwnSelf(IPage<Object> page,@Param("id") long parseLong);
+
+	List<DistributionStockupVO> getInventoryCheSelf(@Param("id")long id);
 }

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

@@ -276,6 +276,7 @@
         <where>
             ldsi.stockup_id =#{id}
         </where>
+
     </select>
 
 
@@ -287,5 +288,37 @@
         where ldsi.reservation_id = #{reservationId}
         and ldsi.is_deleted = 0
     </select>
+    <select id="getInventoryCheSelf" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select lddd.quantity,ldsi.reservation_id
+        from logpm_distribution_stockup_info ldsi
+        LEFT JOIN logpm_distribution_delivery_details lddd on ldsi.reservation_id = lddd.bill_lading_id
+        <where>
+            ldsi.stockup_id =#{id} and lddd.inventory_status in (1,2)
+        </where>
+    </select>
+    <select id="detailOrderOwnSelf" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select  ldsa.order_code AS orderCode,
+        ldsa.description_goods AS descriptionGoods,
+        lds.stockup_status AS stockupStatus,
+        lds.stockup_date AS stockupDate,
+        lds.stockup_area AS stockupArea,
+        ldsa.id stockArticleId,
+        (
+        SELECT GROUP_CONCAT(NULLIF(dpl.goods_allocation, '') SEPARATOR ', ')
+        FROM logpm_distribution_parcel_list dpl
+        WHERE dpl.stock_article_id = ldbs.stock_article_id
+        ) AS goodsAllocation,(
+        SELECT COUNT(*)
+        FROM logpm_distribution_parcel_list dpl
+        WHERE dpl.stock_article_id = ldbs.stock_article_id
+        ) AS reservationNum
+        from logpm_distribution_stockup_info  ldsi
+        LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
+        LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldbs.stock_article_id
+        INNER JOIN logpm_distribution_stockup lds ON lds.id = ldsi.stockup_id
+        <where>
+            ldsi.stockup_id = #{ id } and ldsi.stock_up_type = 3 AND ldsi.is_deleted = 0
+        </where>
+    </select>
 
 </mapper>

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

@@ -249,7 +249,8 @@ WHERE ldbl.id = #{id} GROUP BY ldbl.id;
             dbl.conditions,
             dbl.notification_status,
             dbl.total_cost totalCost,
-            dbl.pick_up_plate pickUpPlate
+            dbl.pick_up_plate pickUpPlate,
+            dbl.pickup_batch pickupBatch
         FROM
             logpm_distrilbution_bill_lading dbl
         LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id

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

@@ -68,6 +68,8 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 */
     IPage<DistributionParcelListVO> getParcelListOwn(IPage<Object> page, Map<String, Object> distributionParcelList);
 
+	IPage<DistributionParcelListVO> getParcelListOwnSelf(IPage<Object> page, Map<String, Object> distributionParcelList);
+
 
 	/**
 	 * 根据包件状态维护订单的状态

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

@@ -96,6 +96,7 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @return
 	 */
 	IPage<DistributionStockupVO> getInventoryOwn(IPage<Object> page, Long id);
+	IPage<DistributionStockupVO> getInventoryOwnSelf(IPage<Object> page, long parseLong);
 
 	List<String> createPackageCode(Long reservationId, Long stockListId, Integer packageNum);
 
@@ -104,6 +105,6 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	DistributionStockupVO detailOwnSelf(Long id);
 
 
-
+	IPage<DistributionStockupVO> detailOrderOwnSelf(IPage<Object> page, long parseLong);
 
 }

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

@@ -103,6 +103,16 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return parcelListOwn;
 	}
 
+	@Override
+	public IPage<DistributionParcelListVO> getParcelListOwnSelf(IPage<Object> page, Map<String, Object> distributionParcelList) {
+		Object o = distributionParcelList.get("id");
+		IPage<DistributionParcelListVO> parcelListOwn = baseMapper.getParcelListOwnSelf(page, Long.parseLong((String) o));
+		parcelListOwn.getRecords().forEach(i ->{
+			i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus()));
+		});
+		return parcelListOwn;
+	}
+
 	@Override
 	public void updateOrderStatus(String orderPackageCode, String type) {
 

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

@@ -408,6 +408,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 	}
 
+	@Override
+	public IPage<DistributionStockupVO> getInventoryOwnSelf(IPage<Object> page, long id) {
+		IPage<DistributionStockupVO> l = new Page<>();
+		List<DistributionStockupVO> inventoryChe = baseMapper.getInventoryCheSelf(id);
+		boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0);
+		if (b) {
+			//查询库存品
+			return baseMapper.getInventoryOwn(page, id);
+		} else {
+			return l;
+		}
+	}
+
 
 	/**
 	 * 查询预约信息
@@ -476,5 +489,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return distributionStockupVO;
 	}
 
+	@Override
+	public IPage<DistributionStockupVO> detailOrderOwnSelf(IPage<Object> page, long parseLong) {
+		IPage<DistributionStockupVO> distributionStockupVOIPage = baseMapper.detailOrderOwnSelf(page, parseLong);
+		distributionStockupVOIPage.getRecords().forEach( o ->{
+			Integer integer = distributionStockService.selectCount(Long.parseLong(o.getStockArticleId()));
+			o.setNumber(integer);
+		});
+		return distributionStockupVOIPage;
+	}
+
 
 }

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

@@ -48,6 +48,7 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
+import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -61,6 +62,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -267,6 +269,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//新增
 			distrilbutionBillLading.setConsignee("1");
 			distrilbutionBillLading.setStockupCode(distributionReservationService.bianMa());
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+			String format = dateFormat.format(new Date());
+			distrilbutionBillLading.setPickupBatch("ZT"+format);//批次号
 			this.saveDistrilbutionBillLading(distrilbutionBillLading);
 
 			//修改订单状态
@@ -275,7 +280,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				for (String s : split) {
 					DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
 					distributionStockArticle.setId(Long.parseLong(s));
-//				distributionStockArticle.setOrderStatus(ServiceConstant.ORDER_STATE_TWO);
+//				    distributionStockArticle.setOrderStatus(OrderStatusConstant.zhuangche.getValue());
 					distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 					distributionStockArticle.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
 					distributionStockArticleService.updateById(distributionStockArticle);