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

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java

@@ -26,6 +26,12 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity {
 	 * 操作人
 	 */
 	@ApiModelProperty(value = "操作人")
+	private Long operatorId;
+
+	/**
+	 * 操作人(Name)
+	 */
+	@ApiModelProperty(value = "操作人(Name)")
 	private String operatorName;
 
 	/**
@@ -33,4 +39,16 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity {
 	 */
 	@ApiModelProperty(value = "扫描相亲")
 	private String scanNodeMsg;
+
+	/**
+	 * 二级扫描类型(扫描详情)
+	 */
+	@ApiModelProperty(value = "扫描详情")
+	private String scanNodeType;
+
+//	/**
+//	 * 二级扫描类型（name）
+//	 */
+//	@ApiModelProperty(value = "二级扫描类型(name)")
+//	private String scanNodeTypeName;
 }

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

@@ -167,11 +167,13 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		//查询当前登陆用户能够操作的仓库列表
 //		BladeUser user = AuthUtil.getUser();
 		List<BasicdataWarehouseVO> myWarehouseList = basicdataWarehouseService.getMyWarehouseList();
-		myWarehouseList.forEach(w->{
-			LambdaQueryWrapper<BasicdataGoodsAreaEntity> qw = Wrappers.<BasicdataGoodsAreaEntity>query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId());
-			List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw);
-			w.setChildren(basicdataGoodsAreaEntities);
-		});
+		if (Func.isNotEmpty(myWarehouseList)){
+			myWarehouseList.forEach(w->{
+				LambdaQueryWrapper<BasicdataGoodsAreaEntity> qw = Wrappers.<BasicdataGoodsAreaEntity>query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId());
+				List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw);
+				w.setChildren(basicdataGoodsAreaEntities);
+			});
+		}
 //		//查询一级仓库节点信息
 //		List<BasicdataNodeVO> basicdataWarehouseVOList = baseMapper.selectFirstNode();
 //		//获取二节点的货区

blade-service/logpm-distribution/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>logpm-distribution</artifactId>
-    <version>3.1.0.RELEASE</version>
+    <version>${bladex.project.version}</version>
 
     <dependencies>
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-distribution-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-basic-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-warehouse-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <!--Sms-->
         <dependency>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-basicdata-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -85,6 +85,12 @@
             <version>${bladex.project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
 
 
     </dependencies>

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

@@ -327,7 +327,6 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
 	public R<IPage<DistributionStockArticleVO>> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map<String, Object> params, Query query) {
-
 		IPage<DistributionStockArticleVO> distributionStockArticle =  distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query);
 		return R.data(distributionStockArticle);
 	}

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

@@ -312,7 +312,6 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入distrbutionReservation")
 	public R<IPage<DistributionStockArticleVO>> selectUpdateAvailableStockArticle(@ApiIgnore @RequestParam Long id, Query query,@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle) {
 		IPage<DistributionStockArticleVO> page = Condition.getPage(query);
-
 		List<DistributionStockArticleVO>  stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id,distributionStockArticle);
 		page.setRecords(stockArticleVOS);
 		page.setTotal(stockArticleVOS.size());

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

@@ -1384,7 +1384,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		DistributionStockupVO stockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId());
 		Date date = new Date();
 		BladeUser user = AuthUtil.getUser();
+		AtomicInteger clientNum = new AtomicInteger();
+		AtomicInteger orderNum = new AtomicInteger();
 		mallClient.forEach((k, v) -> {
+			clientNum.getAndIncrement();
 			//判断原始客户中是否存在
 			if (Func.isEmpty(originalClient.get(k))) {
 				//不存在，意味这里应该进行客户的新增
@@ -1417,6 +1420,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				AtomicInteger packageTotal = new AtomicInteger();
 
 				v.forEach(s -> {
+					orderNum.getAndIncrement();
 					mallName.add(s.getMallName());
 					DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class);
 					List<DistributionParcelListEntity> packageListInfo = stockArticleDTO.getPackageListInfo();
@@ -1479,6 +1483,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId,k);
 				Map<Long, List<DistributionReservationStockarticleEntity>> oldStockArticle = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId));
 				v.forEach(s -> {
+					orderNum.getAndIncrement();
 					//根据配送和客户名称查询预约
 					AtomicInteger packageNum = new AtomicInteger();
 					AtomicInteger reduceNum = new AtomicInteger();
@@ -1628,6 +1633,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionStockArticleService.updateById(stockArticleEntity);
 				//修改预约状态和包件状态
 			});
+			List<DistributionReservationEntity> reservationEntities = originalClient.get(f);
+			reservationEntities.forEach(r->{
+				distributionSignforMapper.deleteByReservationAndDeliveryId(r.getId(),deliveryListEntityId);
+			});
 		});
 		String kind = deliveryListEntity.getKind();
 		switch (kind) {
@@ -1675,6 +1684,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListEntity.setDriverName(driverNames.deleteCharAt(driverNames.length() - 1).toString());
 			deliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
+		deliveryListEntity.setOrderNumber(orderNum.get());
+		deliveryListEntity.setCustomersNumber(clientNum.get());
 		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);

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

@@ -12,12 +12,10 @@ import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
 import com.logpm.factory.mt.service.IMtFactoryOrderService;
 import com.logpm.factory.mt.service.IMtPackageInfoService;
 import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.entity.FactoryPackageDetailEntity;
 import com.logpm.factory.oupai.entity.FactoryPackageEntity;
 import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
-import com.logpm.factory.oupai.service.IFactoryOrderService;
-import com.logpm.factory.oupai.service.IFactoryPackageService;
-import com.logpm.factory.oupai.service.IOuPaiFactoryService;
-import com.logpm.factory.oupai.service.IReceivingOrderService;
+import com.logpm.factory.oupai.service.*;
 import com.logpm.factory.pan.service.IPanFactoryOrderService;
 import com.logpm.factory.pan.service.IPanPackageInfoService;
 import com.logpm.factory.pan.service.IPanPackageListService;
@@ -93,6 +91,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 	private final IReceivingOrderService receivingOrderService;
 
+	private final IFactoryPackageDetailService factoryPackageDetailService;
+
 	//工厂查询
 	private final IOuPaiFactoryService ouPaiFactoryService;
 
@@ -509,6 +509,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			//更新包件
 			advanceDetailClient.updateAdvanceDetail(advanceDetailEntity);
 
+
+
+
+
+
 		} else {
 			advanceDetailEntity = new AdvanceDetailEntity();
 			advanceDetailEntity.setAdvanceId(advanceEntity.getId());//预仓id
@@ -556,6 +561,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			advanceDetailEntity.setRemark("");//备注
 			advanceDetailEntity.setOldId(0);//
 			Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity);
+			advanceDetailEntity.setId(detailId);
+			// 物料明细
+
+			List<FactoryPackageDetailEntity> factoryPackageDetailEntities = factoryPackageDetailService.lambdaQuery().eq(FactoryPackageDetailEntity::getPackageId, factoryPackageEntity.getId()).list();
+
+			// todo 保存物料明细
+
 			if (detailId > 0) {
 				//修改数据状态
 				factoryPackageEntity.setTurnStatus(2);

blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java

@@ -1,11 +1,21 @@
 package com.logpm.factory;
 
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.alibaba.excel.metadata.Sheet;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.logpm.factory.comfac.controller.FactoryCommonController;
 import com.logpm.factory.comfac.dto.UnloadCarDTO;
+import com.logpm.factory.excel.ExcelMode;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;
 import com.logpm.factory.mt.entity.MtPushData;
 import com.logpm.factory.mt.service.IMtFactoryDataService;
@@ -17,6 +27,7 @@ import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
 import com.logpm.oldproject.feign.IAdvanceDetailClient;
 import com.rabbitmq.client.Channel;
+import lombok.Data;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springblade.core.test.BladeBootTest;
@@ -28,13 +39,12 @@ import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @ExtendWith(BladeSpringExtension.class)
@@ -47,10 +57,40 @@ public class TestService {
 //
 //
 //
-//	@Test
-//	public void test2() {
+	public void test2() {
 //		ouPaiFactoryService.findOuPaiFactoryOrderDTOByCarCarNumber("LCD230505047");
-//
-//	}
+
+		// 获取Excle
+		Sheet sheet = new Sheet(1, 1, ExcelMode.class);
+
+		try {
+			List<Object> readList = EasyExcelFactory.read(new FileInputStream("f://order_status_log.xlsx"), sheet);
+
+
+			List<ExcelMode> list = new ArrayList<ExcelMode>();
+			for (Object obj : readList) {
+				ExcelMode t = (ExcelMode) obj;
+
+				JSONObject json = JSONObject.parseObject(t.getArgs());
+
+				System.out.println(json.getString("unitNo"));
+				//HttpResponse execute = HttpUtil.createPost("http://h5u.huitongys.com/api/logpm-factory/factory/common/sendOrderStatus").body(t.getArgs()).execute();
+				//System.out.println(execute.body());
+
+
+			}
+
+
+
+
+
+
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+
+
+	}
 
 }
+

blade-service/logpm-factory/src/test/java/com/logpm/factory/excel/ExcelMode.java

@@ -0,0 +1,13 @@
+package com.logpm.factory.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import lombok.Data;
+
+@Data
+public class ExcelMode extends BaseRowModel {
+
+	@ExcelProperty(index = 1)
+	private String  args;
+
+}

blade-service/logpm-warehouse/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-warehouse-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
             <scope>compile</scope>
         </dependency>
         <!--mq-->
@@ -48,13 +48,13 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-basicdata-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-distribution-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -70,9 +70,16 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-old-project-api</artifactId>
-            <version>3.1.0.RELEASE</version>
+            <version>${bladex.project.version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

@@ -46,9 +46,42 @@
 
 
     <select id="selectWarehouseStockPage" resultType="com.logpm.warehouse.vo.WarehouseScanRecordVO">
-        select * from view_scan_record
+        select * from view_scan_record vsr
         <where>
-           is_deleted =0
+            is_deleted =0
+            <if test="param.nodeName != null and param.nodeName != '' ">
+                and vsr.nodeName like concat('%',#{param.nodeName},'%')
+            </if>
+            <if test="param.scanNodeType != null and param.scanNodeType != '' ">
+                and vsr.scanNodeType like concat('%',#{param.scanNodeType},'%')
+            </if>
+            <if test="param.orderCode != null and param.orderCode != '' ">
+                and vsr.order_code like concat('%',#{param.orderCode},'%')
+            </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != '' ">
+                and vsr.order_package_code like concat('%',#{param.orderPackageCode},'%')
+            </if>
+            <if test="param.serviceNumber != null and param.serviceNumber != '' ">
+                and vsr.service_number like concat('%',#{param.serviceNumber},'%')
+            </if>
+            <if test="param.brandName != null and param.brandName != '' ">
+                and vsr.brand_name like concat('%',#{param.brandName},'%')
+            </if>
+            <if test="param.materialCode != null and param.materialCode != '' ">
+                and vsr.material_code like concat('%',#{param.materialCode},'%')
+            </if>
+            <if test="param.materialName != null and param.materialName != '' ">
+                and vsr.material_name like concat('%',#{param.materialName},'%')
+            </if>
+            <if test="param.firsts != null and param.firsts != '' ">
+                and vsr.firsts like concat('%',#{param.firsts},'%')
+            </if>
+             <if test="param.second != null and param.second != '' ">
+                and vsr.second like concat('%',#{param.second},'%')
+            </if>
+             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
+                and vsr.third_product like concat('%',#{param.thirdProduct},'%')
+            </if>
         </where>
     </select>
 

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

@@ -22,11 +22,13 @@ import com.logpm.warehouse.vo.WarehouseStockVO;
 import com.logpm.warehouse.excel.WarehouseStockExcel;
 import com.logpm.warehouse.mapper.WarehouseStockMapper;
 import com.logpm.warehouse.service.IWarehouseStockService;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import org.springblade.system.feign.IUserClient;
 
 /**
  * 备货扫描记录 服务实现类
@@ -39,7 +41,13 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 
 	@Override
 	public IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseStockVO WarehouseStock) {
-		return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock));
+		List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, WarehouseStock);
+		IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
+		for (WarehouseScanRecordVO warehouseScanRecordVO : warehouseScanRecordVOS) {
+			warehouseScanRecordVO.setOperatorName(userCliient.userInfoById(warehouseScanRecordVO.getOperatorId()).getData().getName());
+			warehouseScanRecordVO.getNodeName().equals("上下架");
+		}
+		return page.setRecords(warehouseScanRecordVOS);
 	}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  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.warehouse.wrapper;
+
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.vo.WarehouseScanRecordVO;
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+/**
+ * 备货扫描记录 包装类,返回视图层所需的字段
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@Log4j2
+public class WarehouseStockRecordWrapper extends BaseEntityWrapper<WarehouseScanRecordVO, WarehouseScanRecordVO>  {
+
+	public static WarehouseStockRecordWrapper build() {
+		return new WarehouseStockRecordWrapper();
+ 	}
+
+	@Override
+	public WarehouseScanRecordVO entityVO(WarehouseScanRecordVO WarehouseStock) {
+		log.info("WarehouseStock>>>>>>>>>>>{}",WarehouseStock);
+
+		return WarehouseStock;
+	}
+
+
+}