Merge remote-tracking branch 'origin/dev' into dev

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

@@ -44,7 +44,7 @@ public interface IBasicdataWarehouseClient {
 	String API_PREFIX = "warehouse/client";
 	String TOP = API_PREFIX + "/top";
 	String GETWAREHOUSE = API_PREFIX + "/warehouse";
-    String WAREHOUSEBYDEPARTMENT = API_PREFIX+"/getWarehouseByDepartment";
+	String WAREHOUSEBYDEPARTMENT = API_PREFIX + "/getWarehouseByDepartment";
 
 	/**
 	 * 获取仓库列表
@@ -56,25 +56,26 @@ public interface IBasicdataWarehouseClient {
 	@GetMapping(TOP)
 	BladePage<BasicdataWarehouseEntity> topWarehouse(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
-	@GetMapping(API_PREFIX+"/findByName")
+	@GetMapping(API_PREFIX + "/findByName")
 	BasicdataWarehouseEntity findByName(@RequestParam("warehouseName") String destinationWarehouse);
 
 	/**
 	 * 查询仓库信息
+	 *
 	 * @param name
 	 * @param warehouseCode
 	 * @return
 	 */
 	@GetMapping(GETWAREHOUSE)
-	BasicdataWarehouseEntity getWarehouse(@RequestParam("name") String name,@RequestParam("warehouseCode") String warehouseCode);
+	BasicdataWarehouseEntity getWarehouse(@RequestParam("name") String name, @RequestParam("warehouseCode") String warehouseCode);
 
-	@GetMapping(API_PREFIX+"/getWarehouseByOldId")
+	@GetMapping(API_PREFIX + "/getWarehouseByOldId")
 	BasicdataWarehouseEntity getWarehouseByOldId(@RequestParam Integer id);
 
-	@PostMapping(API_PREFIX+"/addWarehouse")
+	@PostMapping(API_PREFIX + "/addWarehouse")
 	Long addWarehouse(@RequestBody BasicdataWarehouseEntity newEntity);
 
-	@GetMapping(API_PREFIX+"/getWarehouseEntityByWarehouseCode")
+	@GetMapping(API_PREFIX + "/getWarehouseEntityByWarehouseCode")
 	BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(@RequestParam String warehouseCode);
 
 
@@ -84,44 +85,60 @@ public interface IBasicdataWarehouseClient {
 
 	/**
 	 * 查询当前登录人仓库信息
+	 *
 	 * @return
 	 */
-	@GetMapping(API_PREFIX+"/getMyWarehouseList")
+	@GetMapping(API_PREFIX + "/getMyWarehouseList")
 	List<BasicdataWarehouseEntity> getMyWarehouseList();
 
 	/**
 	 * 将当前登录人选择仓库存至缓存
 	 */
-	@PostMapping(API_PREFIX+"/preserveCurrentWarehouse")
+	@PostMapping(API_PREFIX + "/preserveCurrentWarehouse")
 	BasicdataWarehouseEntity preserveCurrentWarehouse(@RequestBody BasicdataWarehouseEntity warehouseEntity);
 
 
 	/**
 	 * 根据当前用户查询缓存中仓库信息
+	 *
 	 * @return
 	 */
-	@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
+	@GetMapping(API_PREFIX + "/getMyCurrentWarehouse")
 	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
 
 	/**
 	 * 获取当前登录人的能查看的仓库
+	 *
 	 * @return
 	 */
-	@GetMapping(API_PREFIX+"/getMyWatchWarehouse")
+	@GetMapping(API_PREFIX + "/getMyWatchWarehouse")
 	List<BasicdataWarehouseEntity> getMyWatchWarehouse();
 
 
 	/**
 	 * 清除当前登录人仓库缓存
+	 *
 	 * @return
 	 */
-	@GetMapping(API_PREFIX+"/clearWarehouseCache")
+	@GetMapping(API_PREFIX + "/clearWarehouseCache")
 	R clearWarehouseCache();
 
 
+	@GetMapping(API_PREFIX + "/getEntityWarehouseId")
+	BasicdataWarehouseEntity getEntityWarehouseId(@RequestParam("warehouseId") Long warehouseId);
 
 
-	@GetMapping(API_PREFIX+"/getEntityWarehouseId")
-    BasicdataWarehouseEntity getEntityWarehouseId(@RequestParam("warehouseId") Long warehouseId);
+	/**
+	 * 设置当前用户的仓库，前台是如果这个用户只有一个仓库
+	 *
+	 * @param deptId
+	 * @param tenantId
+	 * @param userId
+	 * @return
+	 */
+	@GetMapping(API_PREFIX + "/addWarehouseSingle")
+	BasicdataWarehouseEntity addWarehouseSingle(@RequestParam("deptId")String deptId, @RequestParam("tenantId")String tenantId, @RequestParam("userId")Long userId);
+
 }
+

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryPackageDetailEntity.java

@@ -53,4 +53,14 @@ public class FactoryPackageDetailEntity extends BaseEntity {
 	@ApiModelProperty(name = "原物料编码",notes = "")
 	private String orgCode ;
 
+	/** 入库单状态 0正常 1作废 */
+	@ApiModelProperty(name = "入库单状态 0正常 1作废",notes = "")
+	private Integer receiptStatus ;
+	/** 推送状态 1推送 0未推送 */
+	@ApiModelProperty(name = "推送状态 1推送 0未推送",notes = "")
+	private Integer pushStatus ;
+	/** 转发状态 1转送 0未转送 */
+	@ApiModelProperty(name = "转发状态 1转送 0未转送 2 转送失败",notes = "")
+	private Integer turnStatus ;
+
 }

blade-service/logpm-basicdata/Dockerfile

@@ -11,4 +11,4 @@ EXPOSE 8400
 ADD ./target/logpm-basicdata.jar ./app.jar
 
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
-CMD ["--spring.profiles.active=test"]
+CMD ["--spring.profiles.active=dev"]

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

@@ -68,9 +68,6 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 
 	/**
 	 * 查询仓库数据
-	 * @param name
-	 * @param warehouseCode
-	 * @return
      */
 	@Override
 	public BasicdataWarehouseEntity getWarehouse(String name, String warehouseCode) {
@@ -144,8 +141,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
 	@Override
 	public BasicdataWarehouseEntity getMyCurrentWarehouse() {
-		BasicdataWarehouseEntity warehouseEntity = warehouseWarehouseService.getMyCurrentWarehouse();
-		return warehouseEntity;
+        return warehouseWarehouseService.getMyCurrentWarehouse();
 	}
 
 	@Override
@@ -175,4 +171,11 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 		return warehouseWarehouseService.getById(warehouseId);
 	}
 
+	@Override
+	@GetMapping(API_PREFIX + "/addWarehouseSingle")
+	public BasicdataWarehouseEntity addWarehouseSingle(String deptId, String tenantId, Long userId) {
+	return warehouseWarehouseService.getMyWarehouseList(deptId, tenantId, userId);
+
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java

@@ -94,6 +94,16 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 */
 	List<BasicdataWarehouseEntity> getMyWarehouseList();
 
+
+	/**
+	 * 根据相关参数查询用户仓库，如果用户仓库只有一个 将仓库数据写入缓存
+	 * @param deptId
+	 * @param tenantId
+	 * @param userId
+	 * @return
+	 */
+	BasicdataWarehouseEntity getMyWarehouseList(String deptId, String tenantId, Long userId);
+
 	/**
 	 * 保存当前用户选择的仓库至Redis缓存中
 	 * @param warehouseEntity

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

@@ -43,6 +43,7 @@ import com.logpm.basicdata.vo.BasicdataStockArticleVO;
 import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import com.logpm.basicdata.vo.WarehouseStockListVO;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.vo.WarehouseTrayQRCode;
@@ -285,8 +286,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public R disable(String ids) {
+		List<Long> longs = Func.toLongList(ids);
+		for (Long aLong : longs) {
 			//查询托盘有无绑定货物
-
+			List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(aLong);
+		}
 		return null;
 	}
 

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

@@ -17,7 +17,6 @@
 package com.logpm.basicdata.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,11 +30,9 @@ import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
-import com.logpm.basicdata.wrapper.BasicdataWarehouseWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.cache.CacheNames;
-import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
@@ -48,7 +45,6 @@ import org.springblade.system.feign.IDeptClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -164,12 +160,6 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 			1、登录人部门范围大  登录人 -- 仓库 -> 一对多
 					   递归查询
 			2、登录人部门就是营业部节点  登录人 -- 仓库 -> 一对一
-
-
-
-
-
-
 	 */
 
 	@Override
@@ -180,7 +170,6 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		//查询出部门表
 		String deptId = user.getDeptId();
 		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(deptId));
-		StringBuffer depts = new StringBuffer();
 
 		List<Long> deptIds = new ArrayList<>();
 
@@ -194,12 +183,39 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		}
 		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds));
 //		String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
-		if(warehouseEntityList.size() <= 1 ){
-			redis.setEx(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()),warehouseEntityList.get(0),30*24*60*60L);
+		if (warehouseEntityList.size() <= 1) {
+			redis.setEx(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()), warehouseEntityList.get(0), 30 * 24 * 60 * 60L);
 		}
 		return warehouseEntityList;
 	}
 
+	@Override
+	public BasicdataWarehouseEntity getMyWarehouseList(String deptId, String tenantId, Long userId) {
+
+		//查询出部门表
+		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(deptId));
+
+		List<Long> deptIds = new ArrayList<>();
+
+		if (Func.isEmpty(userDeptNode)) {
+			log.error("userDeptNode用户部门信息有误+{" + userDeptNode + "}");
+			return null;
+		} else {
+			userDeptNode.forEach(u -> {
+				deptIds.add(u.getId());
+			});
+		}
+		BasicdataWarehouseEntity warehouseEntity = null;
+		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds));
+//		String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
+		if (warehouseEntityList.size() <= 1) {
+			warehouseEntity = warehouseEntityList.get(0);
+			String json = JSONObject.toJSONString(warehouseEntity);
+			redis.setEx(CacheNames.tenantKeyObj(tenantId, CacheNames.USER_WAREHOUSE_KEY, userId), json, 30 * 24 * 60 * 60L);
+		}
+		return warehouseEntity;
+	}
+
 
 	@Override
 	public R<?> preserveCurrentMyWarehouse(BasicdataWarehouseEntity warehouseEntity) {
@@ -220,10 +236,10 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	public BasicdataWarehouseEntity getMyCurrentWarehouse() {
 		BladeUser user = AuthUtil.getUser();
 		String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
-		if(StringUtil.isBlank(json)){
+		if (StringUtil.isBlank(json)) {
 			return null;
 		}
-		BasicdataWarehouseEntity o = JSONObject.parseObject(json,BasicdataWarehouseEntity.class);
+		BasicdataWarehouseEntity o = JSONObject.parseObject(json, BasicdataWarehouseEntity.class);
 		return o;
 	}
 

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

@@ -16,8 +16,10 @@
  */
 package com.logpm.distribution.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -184,7 +186,11 @@ public class DistributionStockArticleController extends BladeController {
 		Object o1 = distributionStockArticle.get("entDate");
 		String orderIds = (String) distributionStockArticle.get("orderIds");
 		String customerName = (String) distributionStockArticle.get("customerName");
+		String reservationStatus = (String) distributionStockArticle.get("reservationStatus");
+		String warehouseEntryTime = (String) distributionStockArticle.get("warehouseEntryTime");
 		String customerTelephone = (String) distributionStockArticle.get("customerTelephone");
+		String completeSet = (String) distributionStockArticle.get("completeSet");
+		String freezeStatus = (String) distributionStockArticle.get("freezeStatus");
 		Object d = distributionStockArticle.get("id");
 		distributionStockArticle.remove("id");
 		distributionStockArticle.remove("startDate");
@@ -194,10 +200,23 @@ public class DistributionStockArticleController extends BladeController {
 //		distributionStockArticle.remove("currentPage");
 //		distributionStockArticle.remove("total");
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class);
+		LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda();
 		queryWrapper.ne("reservation_status","30");
 		queryWrapper.lambda().eq(DistributionStockArticleEntity::getWarehouseId,myCurrentWarehouse.getId());
 		if(Func.isNotEmpty(o)){
-			queryWrapper.in("orderCode",String.valueOf(o).split(","));
+			queryWrapper.in("order_code",String.valueOf(o).split(","));
+		}
+		if(Func.isNotEmpty(reservationStatus)){
+			queryWrapper.eq("reservation_status",reservationStatus);
+		}
+		if(Func.isNotEmpty(warehouseEntryTime)){
+			queryWrapper.apply("datediff(warehouse_entry_time,{0} ) = 0",warehouseEntryTime);
+		}
+		if(Func.isNotEmpty(freezeStatus)){
+			queryWrapper.eq("freeze_status",freezeStatus);
+		}
+		if(Func.isNotEmpty(completeSet)){
+			queryWrapper.eq("complete_set",completeSet);
 		}
 		if(ObjectUtil.isNotEmpty(d)){
 			queryWrapper.in("id",String.valueOf(d).split(","));
@@ -208,9 +227,9 @@ public class DistributionStockArticleController extends BladeController {
 		if(Func.isNotEmpty(orderIds)){
 			queryWrapper.notIn("id",Func.toLongList(orderIds));
 		}
-		if(Func.isNotEmpty(orderIds)){
-			queryWrapper.notIn("id",Func.toLongList(orderIds));
-		}
+//		if(Func.isNotEmpty(orderIds)){
+//			queryWrapper.notIn("id",Func.toLongList(orderIds));
+//		}
 		if(Func.isNotEmpty(customerName)){
 			queryWrapper.like("customer_name",customerName);
 		}
@@ -239,7 +258,6 @@ public class DistributionStockArticleController extends BladeController {
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
 		IPage<DistributionStockArticleVO> distributionStockArticleVOIPage  = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages));
 		return R.data(distributionStockArticleVOIPage);
-
 	}
 
 

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

@@ -153,4 +153,11 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @return
 	 */
 	Integer selectPackageExistSelf(@Param("param")StockupDTO stockupDTO);
+
+	/**
+	 *
+	 * @param id
+	 * @return
+	 */
+	List<DistributionStockupVO> getMarketDeliveryStockupInfo(@Param("deliveryListId")Long id);
 }

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

@@ -586,5 +586,52 @@
             ldsi.stockup_id = #{ id } and ldsi.stock_up_type = 3 AND ldsi.is_deleted = 0
         </where>
     </select>
+    <select id="getMarketDeliveryStockupInfo" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        SELECT
+        ldsu.id,
+        ldsu.tenant_id,
+        ldsu.create_user,
+        ldsu.create_time,
+        ldsu.update_user,
+        ldsu.update_time,
+        ldsu.status,
+        ldsu.is_deleted,
+        ldsu.create_dept,
+        ldsu.reserve1,
+        ldsu.reserve2,
+        ldsu.reserve3,
+        ldsu.reserve4,
+        ldsu.reserve5,
+        ldsu.stockup_date,
+        ldsu.stockup_user,
+        ldsu.stockup_status,
+        ldsu.stockup_area,
+        ldsu.assign_status,
+        ldsu.stockip_allocation,
+        ldsu.goods_area_id,
+        ldsu.forklift_id,
+        ldsu.loader_id,
+        ldsu.team_responsibility,
+        ldsu.fix_time,
+        ldsu.assign_time,
+        ldsu.type_service,
+        ldsu.stockup_user_id,
+        ldsu.forklift_name,
+        ldsu.loader_name,
+        ldsu.stockup_code,
+        ldsu.remarks,
+        ldsu.annulment,
+        ldsu.outbound_date
+        FROM
+        logpm_distribution_delivery_list AS lddl
+        INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
+        INNER JOIN logpm_distribution_stockup_info AS ldsi ON lds.reservation_id = ldsi.reservation_id
+        INNER JOIN logpm_distribution_stockup AS ldsu ON ldsu.id = ldsi.stockup_id
+        <where>
+            <if test="deliveryListId !=null and deliveryListId!=''">
+                and lddl.id = #{deliveryListId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -210,8 +210,51 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		distributionDeliveryListVO.setReservationList(customList);
 		//查询备货信息
+//		DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());
+		if (Func.equals(distributionDeliveryListVO.getType(),DistributionTypeConstant.shipie.getValue())){
+			List<DistributionStockupVO> distributionStockupVOList = distributionStockupMapper.getMarketDeliveryStockupInfo(detail.getId());
+//			Optional<DistributionStockupVO> max = distributionStockupVOList.stream().max(Comparator.comparing(DistributionStockupVO::getOutboundDate));
+//			Optional<DistributionStockupVO> min = distributionStockupVOList.stream().min(Comparator.comparing(DistributionStockupVO::getOutboundDate));
+//			String s1 = distributionStockupVOList.stream().min(Comparator.comparing(DistributionStockupVO::getOutboundDate)).toString();
+			Date outboundDate = distributionStockupVOList.stream().filter(o -> o.getOutboundDate() != null).max(Comparator.comparing(DistributionStockupVO::getOutboundDate)).get().getOutboundDate();
+			//这里需要处理一下
+			if (distributionStockupVOList.size()>1){
+				HashSet<String> forkliftName = new HashSet<>();
+				HashSet<String> loaderName = new HashSet<>();
+				HashSet<String> stockUser = new HashSet<>();
+				HashSet<String> goodsArea = new HashSet<>();
+				distributionStockupVOList.forEach(s->{
+					if (Func.isNotEmpty(s.getForkliftName())){
+						forkliftName.add(s.getForkliftName());
+					}
+					if (Func.isNotEmpty(s.getLoaderName())){
+						loaderName.add(s.getLoaderName());
+					}
+					if (Func.isNotEmpty(s.getStockupUser())){
+						stockUser.add(s.getStockupUser());
+					}
+					if (Func.isNotEmpty(s.getStockupArea())){
+						goodsArea.add(s.getStockupArea());
+					}
+				});
+				DistributionStockupVO distributionStockupVO = new DistributionStockupVO();
+				distributionStockupVO.setForkliftName(String.join(",",forkliftName));
+				distributionStockupVO.setStockupArea(String.join(",",goodsArea));
+				distributionStockupVO.setStockupUser(String.join(",",stockUser));
+				distributionStockupVO.setLoaderName(String.join(",",loaderName));
+				distributionStockupVO.setOutboundDate(outboundDate);
+				distributionStockupVO.setTeamResponsibility(distributionStockupVOList.get(0).getTeamResponsibility());
+				distributionDeliveryListVO.setStockupInfo(distributionStockupVO);
+
+			}else {
+				distributionDeliveryListVO.setStockupInfo(distributionStockupVOList.get(0));
+			}
+		}else {
 			DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());
 			distributionDeliveryListVO.setStockupInfo(deliveryStockupInfo);
+
+		}
+
 //		} else if (detail.getSource() == 2) {
 //			//查询订单信息
 //			List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -352,9 +352,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				/**
 				 * 如过是中心仓 是干仓配 如是转运车 非干干脆 0
 				 */
-				if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){
+				if ("中心仓".equals(mtFactoryOrderMain.getWarehouseType())) {
 					serviceNum.setIsOpai(1); //是否干仓配
-				}else { //转运仓或者其它情况
+				} else { //转运仓或者其它情况
 					serviceNum.setIsOpai(0); //是否干仓配
 				}
 
@@ -403,7 +403,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		for (FactoryOrderEntity factoryOrderEntity : factoryOrderEntities) {
 			// 需要从老系统进行订单数据查询
 			AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode(),carNumber);
-			if(ObjectUtils.isNull(advanceEntity)){
+			if (ObjectUtils.isNull(advanceEntity)) {
 				advanceEntity = new AdvanceEntity();
 				advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
 				advanceEntity.setSiteName(""); // 基地 TODO 需要映射
@@ -454,7 +454,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 					continue;
 				}
 				advanceEntity.setId(advanceId);
-			}else{
+			} else {
 				// 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
 
 
@@ -466,12 +466,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			List<FactoryPackageEntity> list = factoryPackageService.lambdaQuery().eq(FactoryPackageEntity::getOrderId, factoryOrderEntity.getId()).eq(FactoryPackageEntity::getTurnStatus, 0).list();
 			for (FactoryPackageEntity factoryPackageEntity : list) {
 
-				addAdvanceDetailEntityByOuPai(factoryPackageEntity,factoryOrderEntity,advanceEntity);
+				addAdvanceDetailEntityByOuPai(factoryPackageEntity, factoryOrderEntity, advanceEntity);
 
 			}
 
 
-
 		}
 		factoryOrderService.updateBatchById(factoryOrderEntities);
 
@@ -479,6 +478,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 	/**
 	 * 保存包件数据-- 欧派
+	 *
 	 * @param factoryPackageEntity
 	 * @param factoryOrderEntity
 	 * @param advanceEntity
@@ -504,10 +504,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			advanceDetailClient.updateAdvanceDetail(advanceDetailEntity);
 
 
-
-
-
-
 		} else {
 			advanceDetailEntity = new AdvanceDetailEntity();
 			advanceDetailEntity.setAdvanceId(advanceEntity.getId());//预仓id
@@ -540,7 +536,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			advanceDetailEntity.setVolume("");//体积
 			advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码
 			advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号
-			advanceDetailEntity.setMctsTruckNo(StringUtil.isBlank(advanceEntity.getMctsTruckNo())?"":advanceEntity.getMctsTruckNo());//车牌号
+			advanceDetailEntity.setMctsTruckNo(StringUtil.isBlank(advanceEntity.getMctsTruckNo()) ? "" : advanceEntity.getMctsTruckNo());//车牌号
 			advanceDetailEntity.setDate100(null);//基地发货日期
 			advanceDetailEntity.setDate2("");//预约到厂时间
 			advanceDetailEntity.setDate3("");//实际到厂时间
@@ -559,8 +555,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			// 物料明细
 
 			List<FactoryPackageDetailEntity> factoryPackageDetailEntities = factoryPackageDetailService.lambdaQuery().eq(FactoryPackageDetailEntity::getPackageId, factoryPackageEntity.getId()).list();
+			//  保存物料明细
+			saveDetailProductInforByOuPai(advanceDetailEntity, factoryPackageDetailEntities);
 
-			// todo 保存物料明细
 
 			if (detailId > 0) {
 				//修改数据状态
@@ -687,6 +684,47 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		}
 
 
+	}
+
+	/**
+	 * oupai保存包件物料信息
+	 *
+	 * @param advanceDetailEntity
+	 * @param factoryPackageDetailEntities
+	 */
+	private void saveDetailProductInforByOuPai(AdvanceDetailEntity advanceDetailEntity, List<FactoryPackageDetailEntity> factoryPackageDetailEntities) {
+
+		// 循环遍历
+		List<DetailProductEntity> saveList = new ArrayList<>();
+		Long packageId = null;
+		for (FactoryPackageDetailEntity zbPackageInfoEntity : factoryPackageDetailEntities) {
+			DetailProductEntity detailProductEntity = new DetailProductEntity();
+			detailProductEntity.setUnitNo(advanceDetailEntity.getUnitNo());
+			detailProductEntity.setProductcode(StringUtil.isBlank(zbPackageInfoEntity.getCode()) ? "" : zbPackageInfoEntity.getCode());
+			detailProductEntity.setProductname(StringUtil.isBlank(zbPackageInfoEntity.getName()) ? "" : zbPackageInfoEntity.getName());
+			detailProductEntity.setSalenum(0);
+			detailProductEntity.setDelivernum(1);
+			detailProductEntity.setProducttype("");
+			detailProductEntity.setBuyTime("");
+			detailProductEntity.setAdministratorsId(0);
+			detailProductEntity.setDeleteTime(0);
+			detailProductEntity.setCreateTime(LocalDate.now());
+			saveList.add(detailProductEntity);
+			packageId = zbPackageInfoEntity.getPackageId();
+		}
+
+		if (!saveList.isEmpty()) {
+			boolean flag = detailProductClient.addDetailProductList(saveList);
+			UpdateWrapper<FactoryPackageDetailEntity> listUpdateWrapper = new UpdateWrapper<>();
+			if (!flag) {
+				listUpdateWrapper.set("processing_status", 2).eq("package_id", packageId).eq("is_deleted", 0);
+			} else {
+				listUpdateWrapper.set("processing_status", 1).eq("package_id", packageId).eq("is_deleted", 0);
+			}
+			factoryPackageDetailService.update(listUpdateWrapper);
+		}
+
+
 	}
 
 	/**
@@ -921,10 +959,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			advanceDetailEntity.setOrderNum("");//MSCS单号  可以为空
 
 
-
-			if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){
+			if ("中心仓".equals(mtFactoryOrderMain.getWarehouseType())) {
 				advanceDetailEntity.setIsOpai(1); //是否干仓配
-			}else { //转运仓或者其它情况
+			} else { //转运仓或者其它情况
 				advanceDetailEntity.setIsOpai(0); //是否干仓配
 			}
 
@@ -974,9 +1011,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setDealerCode(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //商场编码
 
 
-		if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){
+		if ("中心仓".equals(mtFactoryOrderMain.getWarehouseType())) {
 			advanceEntity.setIsOpai(1); //是否干仓配
-		}else{ //转运仓或者其它情况
+		} else { //转运仓或者其它情况
 			advanceEntity.setIsOpai(0); //是否干仓配
 		}
 		advanceEntity.setDueDate(""); // 交期

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -153,9 +153,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getArgs());
 			JSONArray resultArray = jsonObject.getJSONArray("value");
 			log.info("############handlePackageData: 数据处理开始");
-
 			//TODO 这里需要添加处理配送发运单的逻辑
 
+
+
 			opOrderStatusLogEntity.setDataStatus(1);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -205,6 +205,7 @@
         ldsl.cargo_number cargoNumber,
         ldsl.cargo_norms cargoNorms,
         ldsl.cargo_unit cargoUnit,
+         ldsl.incoming_batch incomingBatch,
         lbm.product_code materialCode,
         ldsl.sku sku,
         ldsl.stock_list_code stockListCode,
@@ -266,16 +267,16 @@
         GROUP_CONCAT(lwtg.palletizing_type SEPARATOR ',') palletizingType
         FROM
         logpm_warehouse_tray lwt
-        JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tary_id
+        JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tray_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.tray_id =lwt.id
         <where>
             lwta.is_deleted =0
-            <if test="param.palletName!=null and param.palletName!=''">
-                and lwt.pallet_name like concat('%',#{param.palletName},'%')
-            </if>
-            <if test="param.palletCode!=null and param.palletCode!=''">
-                and lwt.pallet_code like concat('%',#{param.palletCode},'%')
-            </if>
+<!--            <if test="param.palletName!=null and param.palletName!=''">-->
+<!--                and lwt.pallet_name like concat('%',#{param.palletName},'%')-->
+<!--            </if>-->
+<!--            <if test="param.palletCode!=null and param.palletCode!=''">-->
+<!--                and lwt.pallet_code like concat('%',#{param.palletCode},'%')-->
+<!--            </if>-->
             and lwta.allocation_id =#{param.id}
         </where>
         GROUP BY lwt.id

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

@@ -211,14 +211,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
 			updownGoodsEntityQueryWrapper.eq("association_value",code);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper);
-			if(Objects.isNull(updownGoodsEntity)){
+			if(!Objects.isNull(updownGoodsEntity)){
 				log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);
 				throw new CustomerException(403,"包件已上架");
 			}
 			QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsEntityQueryWrapper = new QueryWrapper<>();
 			trayGoodsEntityQueryWrapper.eq("association_value",code);
 			WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
-			if(Objects.isNull(trayGoodsEntity)){
+			if(!Objects.isNull(trayGoodsEntity)){
 				log.warn("#################findUpShelfScanGoods: 包件已打托 code={}",code);
 				throw new CustomerException(403,"包件已打托");
 			}
@@ -1009,6 +1009,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				.eq("allocation_id",allocationId);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
 			Integer num = updownGoodsEntity.getNum();
+			if (enterNum>num){
+				stringBuffer.append("{").append(materialCode).append("}");
+				b =true;
+				continue;
+			}
 			Long updownGoodsId = updownGoodsEntity.getId();
 			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
 			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);

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

@@ -217,7 +217,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 			distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位（经销商）
 			distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人
-			distributionStockArticleEntity.setReserve1("zero");
+			distributionStockArticleEntity.setIsZero("1");
 			distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);
 			id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 			if (id == 0) {
@@ -236,7 +236,6 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			entity.setMaterialName(warehouseWayBillDetail.getProductName());
 			entity.setQuantity(warehouseWayBillDetail.getNum());
 			entity.setConditions(1);
-			entity.setReserve1("zero");
 			entity.setStockArticleId(id);
 			ls.add(entity);
 		}