修改拆包

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

@@ -217,11 +217,6 @@ public class DistributionStockListEntity extends TenantEntity {
 	@ApiModelProperty(value = "预约数量")
 	@TableField(exist = false)
 	private Integer reservationNum;
-	/**
-	 * 单位
-	 */
-	@ApiModelProperty(value = "单位")
-	private String unit;
 	/**
 	 * 仓库名称
 	 */

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

@@ -52,7 +52,7 @@
         where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is null )
         ELSE  (select  sum(l.quantity_stock)
         from logpm_distribution_stock_list l
-        where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null )
+        where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid  = ldsi.pid  and l.pid is not null )
         END 'quantityStock',
         CASE  WHEN ldsi.pid is null THEN
         (select count(ldrs.reservation_num)
@@ -64,7 +64,7 @@
         FROM logpm_distribution_reservation_stocklist ldrs
         where  ldrs.stocklist_id in (select  l.id
         from logpm_distribution_stock_list l
-        where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid is  not null))
+        where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid  = ldsi.pid  and l.pid is  not null))
         END 'quantityOccupied',
         CASE  WHEN ldsi.pid is null THEN
         (select  sum(l.outbound_quantity)
@@ -72,7 +72,7 @@
         where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id AND l.pid is null)
         else (select  sum(l.outbound_quantity)
         from logpm_distribution_stock_list l
-        where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null)
+        where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid  = ldsi.pid  and l.pid is not null)
         END 'outboundQuantity',
         ldsi.brand_name brandName,ldsi.market_name marketName,ldsi.store_name storeName,ldsi.warehouse_name warehouseName,ldsi.cargo_unit cargoUnit,
         CASE  WHEN ldsi.pid is null THEN
@@ -85,7 +85,7 @@
         from logpm_distribution_stock_list lds
         where lds.pid in (select  l.id
         from logpm_distribution_stock_list l
-        where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null ))
+        where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid  = ldsi.pid  and l.pid is not null ))
         END 'unpack',
         ldsi.market_id marketId,ldsi.store_id storeId,ldsi.material_id materialId,ldsi.id,ldsi.unpacking_quantity unpackingQuantity
         from logpm_distribution_stock_list ldsi

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

@@ -72,6 +72,11 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
 	void importUser(List<DistributionStockListExcel> data, Boolean isCovered);
 
+	/**
+	 * 拆包
+	 * @param distributionStockListDTO
+	 * @return
+	 */
     Boolean parcels(DistributionStockListDTO distributionStockListDTO);
 
     DistributionStockListVO getQueryData(Long storeId, Long clientId,Long materialId);

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

@@ -286,7 +286,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionReservationStocklistEntity distributionReservationStocklistEntity = new DistributionReservationStocklistEntity();
 				distributionReservationStocklistEntity.setReservationId(reservationId);
 				distributionReservationStocklistEntity.setStocklistId(stocklistId);
-				distributionReservationStocklistEntity.setUnit(i.getUnit());
+				distributionReservationStocklistEntity.setUnit(i.getCargoUnit());
 				if (Func.isBlank(i.getPid().toString())){
 					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_NOT_HAVE_DATA);
 				}else {

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

@@ -265,7 +265,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setQuantityStock(Optional.ofNullable(distributionStockArticleEntity.getHandQuantity()).orElse(null)); //库存数量
 		distributionStockListEntity.setOutboundQuantity(0); //出库数量
 		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
-		distributionStockListEntity.setUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
+//		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
 		distributionStockListEntity.setStoreId(Optional.ofNullable(distributionStockArticleEntity.getStoreId()).orElse(null));//门店ID
 		distributionStockListEntity.setMarketCode(Optional.ofNullable(distributionStockArticleEntity.getMallCode()).orElse(null));//商场编码
 		distributionStockListEntity.setMarketName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null));//商场名称

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

@@ -151,6 +151,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			distributionStockListEntity.setSku(distributionStockListDTO.getSku());
 			distributionStockListEntity.setQuantityStock(distributionStockListDTO.getStoreNum());
 			distributionStockListEntity.setUnpackingQuantity(0);
+			distributionStockListEntity.setCargoUnit(distributionStockListDTO.getCargoUnit());
+			distributionStockListEntity.setSku(distributionStockListDTO.getSku());
 			distributionStockListEntity.setId(null);
 			this.save(distributionStockListEntity);
 
@@ -159,8 +161,9 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 		distributionStockListEntity.setId(one.getId());
 		distributionStockListEntity.setQuantityStock(one.getQuantityStock()-distributionStockListDTO.getUnpackingQuantity());
-		distributionStockListEntity.setUnpackingQuantity(distributionStockListDTO.getUnpackingQuantity());
-		baseMapper.updateById(distributionStockListEntity);
+
+		distributionStockListEntity.setUnpackingQuantity( one.getUnpackingQuantity() + distributionStockListDTO.getUnpackingQuantity());
+		this.updateById(distributionStockListEntity);
 
 		//添加拆包记录
 		DistributionUnpackingDetailsEntity distributionUnpackingDetails= new DistributionUnpackingDetailsEntity();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -170,8 +170,8 @@ public class WarehouseWarehousingEntryController extends BladeController {
 		//	queryWrapper.lambda().eq(WarehouseWarehousingEntry::getTenantId, bladeUser.getTenantId());
 		//}
 		queryWrapper.lambda().eq(WarehouseWarehousingEntryEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<WarehouseWarehousingEntryExcel> list = warehouseWarehousingEntryService.exportWarehouseWarehousingEntry(queryWrapper);
-		ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehouseWarehousingEntryExcel.class);
+		List<WarehousingEntryDetailExcel> list = warehouseWarehousingEntryService.exportWarehouseWarehousingEntry(queryWrapper);
+		ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehousingEntryDetailExcel.class);
 	}
 
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.mapper;
 
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
+import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,6 +50,6 @@ public interface WarehouseWarehousingEntryMapper extends BaseMapper<WarehouseWar
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WarehouseWarehousingEntryExcel> exportWarehouseWarehousingEntry(@Param("ew") Wrapper<WarehouseWarehousingEntryEntity> queryWrapper);
+	List<WarehousingEntryDetailExcel> exportWarehouseWarehousingEntry(@Param("ew") Wrapper<WarehouseWarehousingEntryEntity> queryWrapper);
 
 }

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

@@ -29,7 +29,7 @@
         <result column="license_plate" property="licensePlate"/>
         <result column="service_type" property="serviceType"/>
         <result column="source" property="source"/>
-        <result column="condition" property="condition"/>
+<!--        <result column="condition" property="condition"/>-->
         <result column="total_input" property="totalInput"/>
     </resultMap>
 
@@ -39,7 +39,7 @@
     </select>
 
 
-    <select id="exportWarehouseWarehousingEntry" resultType="com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel">
+    <select id="exportWarehouseWarehousingEntry" resultType="com.logpm.warehouse.excel.WarehousingEntryDetailExcel">
         SELECT * FROM logpm_warehouse_warehousing_entry ${ew.customSqlSegment}
     </select>
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java

@@ -21,7 +21,6 @@ import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
 import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
-import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
@@ -49,7 +48,7 @@ public interface IWarehouseWarehousingEntryService extends BaseService<Warehouse
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WarehouseWarehousingEntryExcel> exportWarehouseWarehousingEntry(Wrapper<WarehouseWarehousingEntryEntity> queryWrapper);
+	List<WarehousingEntryDetailExcel> exportWarehouseWarehousingEntry(Wrapper<WarehouseWarehousingEntryEntity> queryWrapper);
 
 	/**
 	 * 自定添加修改

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

@@ -38,7 +38,6 @@ import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
 import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import com.logpm.warehouse.service.IWarehouseWarehousingDetailService;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
-import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
 import com.logpm.warehouse.mapper.WarehouseWarehousingEntryMapper;
 import com.logpm.warehouse.service.IWarehouseWarehousingEntryService;
 import lombok.AllArgsConstructor;
@@ -87,8 +86,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 
 
 	@Override
-	public List<WarehouseWarehousingEntryExcel> exportWarehouseWarehousingEntry(Wrapper<WarehouseWarehousingEntryEntity> queryWrapper) {
-		List<WarehouseWarehousingEntryExcel> warehouseWarehousingEntryList = baseMapper.exportWarehouseWarehousingEntry(queryWrapper);
+	public List<WarehousingEntryDetailExcel> exportWarehouseWarehousingEntry(Wrapper<WarehouseWarehousingEntryEntity> queryWrapper) {
+		List<WarehousingEntryDetailExcel> warehouseWarehousingEntryList = baseMapper.exportWarehouseWarehousingEntry(queryWrapper);
 		//warehouseWarehousingEntryList.forEach(warehouseWarehousingEntry -> {
 		//	warehouseWarehousingEntry.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseWarehousingEntry.getType()));
 		//});
@@ -197,7 +196,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			}else{
 				distributionStockListEntity.setQuantityStock(num); //库存数量
 				distributionStockListEntity.setOutboundQuantity(0); //出库数量
-
+				distributionStockListEntity.setUnpackingQuantity(0); //库存拆包数量
+				distributionStockListEntity.setSku(warehousingDetail.getSku());
 			}
 			distributionStockListEntity.setUnpack(false);
 //			distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID