Merge branch 'dev' into pre-production

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java

@@ -144,7 +144,7 @@ public class BasicMaterialEntity extends TenantEntity {
 	private Integer hide;
 
 	@ApiModelProperty(value = "包装数量")
-	private String packageNum;
+	private Integer packageNum;
 
 	@ApiModelProperty(value = "图片")
 	private String picture;

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -89,6 +89,14 @@ public class BasicMaterialController extends BladeController {
 		return R.data(pages);
 	}
 
+	@GetMapping("/materialList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "物料新查询列表", notes = "传入basicMaterial")
+	public R materialList(@ApiIgnore @RequestParam Map<String, Object> basicMaterial) {
+		List<BasicMaterialVO> pages = basicMaterialService.materialList(basicMaterial);
+		return R.data(pages);
+	}
+
 
 	/**
 	 * 查询子物料

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java

@@ -24,6 +24,7 @@ import com.logpm.basic.vo.BasicMaterialVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 物料基础信息 服务类
@@ -60,4 +61,6 @@ public interface IBasicMaterialService extends BaseService<BasicMaterialEntity>
     Boolean saveOrUpdateOwn(BasicMaterialEntity basicMaterial);
 
     BasicMaterialEntity findEntityByCodeAndName(String materialCode, String materialName);
+
+    List<BasicMaterialVO> materialList(Map<String, Object> basicMaterial);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -18,6 +18,7 @@ package com.logpm.basic.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.ObjectUtils;
@@ -30,6 +31,7 @@ import com.logpm.basic.service.IBasicMaterialService;
 import com.logpm.basic.vo.BasicMaterialVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
@@ -37,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -128,4 +131,30 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 		return baseMapper.findEntityByCodeAndNameg(materialCode,materialName);
 	}
 
+	@Override
+	public List<BasicMaterialVO> materialList(Map<String, Object> basicMaterial) {
+		List<BasicMaterialVO> basicMaterialVOList =null;
+		try {
+			LambdaQueryWrapper<BasicMaterialEntity> queryWrapper = new LambdaQueryWrapper<>();
+			if(basicMaterial.get("productCode") != null){
+				queryWrapper.like(BasicMaterialEntity::getProductCode,basicMaterial.get("productCode"));
+			}
+			if(basicMaterial.get("name") != null){
+				queryWrapper.like(BasicMaterialEntity::getName,basicMaterial.get("name"));
+			}
+			queryWrapper.eq(BasicMaterialEntity::getHide,1);
+			queryWrapper.eq(BasicMaterialEntity::getIsDeleted,0);
+			queryWrapper.last("limit 30");
+			basicMaterialVOList = baseMapper.selectList(queryWrapper).stream().map(basicMaterialEntity -> {
+			   BasicMaterialVO basicMaterialVO = new BasicMaterialVO();
+			   BeanUtil.copy(basicMaterialEntity,basicMaterialVO);
+			   return basicMaterialVO;
+		   }).collect(Collectors.toList());
+		} catch (Exception e) {
+			log.error("查询物料列表异常",e);
+			throw new ServiceException("服务器异常，请联系管理员");
+		}
+
+		return basicMaterialVOList;
+	}
 }

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

@@ -342,12 +342,12 @@ public class DistributionSignforController extends BladeController {
 		R r= distributionSignforService.recheck(distributionSignfor);
 		if (r.isSuccess()){
 			//维护配送状态
-			distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignfor.getDeliveryId());
 			DistributionSignforDTO distributionSignforDTO = new DistributionSignforDTO();
 			distributionSignforDTO.setId(distributionSignfor.getId());
 			distributionSignforDTO.setClerkSignRemarks(distributionSignfor.getClerkSignRemarks());
 			distributionSignforDTO.setMap(distributionSignfor.getMap());
 			distributionSignforService.updateSign(distributionSignforDTO);
+			distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignfor.getDeliveryId());
 			distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
 		}
 //		return R.status(distributionSignforService.updateById(distributionSignfor));

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

@@ -124,7 +124,7 @@
     <select id="pageOwn" resultType="com.logpm.distribution.vo.DistributionStockListVO">
         <include refid="stockList"></include>
         <where>
-            ldsi.is_deleted = 0
+            ldsi.is_deleted = 0 and ldsi.hide=1
             <if test=" param.serviceNumber != null and param.serviceNumber != ''">and ldsi.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>

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

@@ -6208,12 +6208,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R updateSign(DistributionSignforDTO distributionSignfor) {
-		distributionSignfor.setSigneeId(AuthUtil.getUser().getUserId());
-		distributionSignfor.setSigneeName(AuthUtil.getUser().getNickName());
+		BladeUser user = AuthUtil.getUser();
+		distributionSignfor.setSigneeId(user.getUserId());
+		distributionSignfor.setSigneeName(user.getNickName());
 		distributionSignfor.setClerkSignRemarks(distributionSignfor.getClerkSignRemarks());
 		Date date = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		BladeUser user = AuthUtil.getUser();
 		distributionSignfor.setExamineUserId(user.getUserId());
 		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
 		//复核时间为签收时间
@@ -6227,7 +6227,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (isSuccess) {
 			this.updateById(distributionSignfor);
 			// 创建异步队列推送老系统的的签收信息 构建请求参数
-
 			return R.status(true);
 		}
 

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

@@ -96,12 +96,9 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	@Autowired
 	private  IBasicMaterialClient  basicMaterialClient;
 	@Autowired
-
 	private  IDistributionStockListInfoService distributionStockListInfoService;
 
-//	private final IBasicdataWarehouseClient basicdataWarehouseClient;
-	@Autowired
-	private  IDistributionReservationStocklistService reservationStocklistService;
+
 	@Autowired
 	private  IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 	@Autowired
@@ -128,7 +125,6 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 
 
-
 	@Override
 	public IPage<DistributionStockListVO> selectDistributionStockListPage(IPage<DistributionStockListVO> page, DistributionStockListVO distributionStockList) {
 		return page.setRecords(baseMapper.selectDistributionStockListPage(page, distributionStockList));
@@ -185,7 +181,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			//查询包装数量
 			BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(stockList.getMaterialId());
 			if(ObjectUtils.isNotNull(materialOwnId)){
-				distributionStockListExcel.setPackNum(materialOwnId.getPackageNum());
+				distributionStockListExcel.setPackNum(materialOwnId.getPackageNum()+"");
 			}
 			//查询托盘信息
 			WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = new WarehouseTrayGoodsEntity();
@@ -244,7 +240,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			//查询包装数量
 			BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(stockList.getMaterialId());
 			if(ObjectUtils.isNotNull(materialOwnId)){
-				distributionStockListExcel.setPackNum(materialOwnId.getPackageNum());
+				distributionStockListExcel.setPackNum(materialOwnId.getPackageNum()+"");
 			}
 			//查询托盘信息
 			WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = new WarehouseTrayGoodsEntity();
@@ -363,7 +359,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			//有修改
 			DistributionStockListEntity d = one2;
 			d.setId(one2.getId());
-			int i = one2.getQuantityStock() +  (distributionStockListDTO.getUnpackingQuantity()* Integer.parseInt(materialEntity.getPackageNum())) ;
+			int i = one2.getQuantityStock() +  (distributionStockListDTO.getUnpackingQuantity()* materialEntity.getPackageNum()) ;
 			log.info(one2.getIncomingBatch()+"拆包剩余在库数量:{}",i);
 			d.setQuantityStock(i);
 			d.setWarehouseId(myCurrentWarehouse.getId());
@@ -374,7 +370,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			distributionStockListInfo.setId(null);
 			distributionStockListInfo.setStockListId(d.getId());
 			distributionStockListInfo.setGroundingTime(new Date());
-			distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
+			distributionStockListInfo.setQuantityStock(distributionStockListDTO.getStoreNum() * materialEntity.getPackageNum());
 			distributionStockListInfo.setPid(distributionStockListDTO.getId());
 			distributionStockListInfo.setSourceType("2");
 			distributionStockListInfoService.save(distributionStockListInfo);
@@ -401,7 +397,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				basicMaterialEntity.setProductCode(one.getCargoNumber()+"-"+a);
 				basicMaterialEntity.setPackingSpecification(distributionStockListDTO.getCargoNorms());
 				basicMaterialEntity.setSku(distributionStockListDTO.getSku());
-				basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum());
+				basicMaterialEntity.setPackageNum(Integer.parseInt(distributionStockListDTO.getPackageNum()));
 				basicMaterialEntity.setLogpmUnit(distributionStockListDTO.getCargoUnit());
 				basicMaterialEntity.setSpecification(distributionStockListDTO.getCargoNorms());
 				basicMaterialEntity.setExtent("0");
@@ -423,7 +419,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				distributionStockListEntity.setPid(one.getId());
 				distributionStockListEntity.setCargoNumber(basicMaterialEntity.getProductCode());
 				distributionStockListEntity.setSku(distributionStockListDTO.getSku());
-				distributionStockListEntity.setQuantityStock((distributionStockListDTO.getUnpackingQuantity() * Integer.parseInt(materialEntity.getPackageNum())));
+				distributionStockListEntity.setQuantityStock((distributionStockListDTO.getUnpackingQuantity() * materialEntity.getPackageNum()));
 				distributionStockListEntity.setUnpackingQuantity(0);
 				distributionStockListEntity.setOutboundQuantity(0);
 				distributionStockListEntity.setMaterialId(aLong);
@@ -446,7 +442,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				distributionStockListInfo.setGroundingTime(new Date());
 				distributionStockListInfo.setPid(distributionStockListDTO.getId());
 				distributionStockListInfo.setSourceType("2");
-				distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(materialEntity.getPackageNum())));
+				distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * materialEntity.getPackageNum()));
 				distributionStockListInfoService.save(distributionStockListInfo);
 			} else {
 				log.error("#################查询库存品失败");

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

@@ -147,7 +147,7 @@ public class DistributionUnpackingDetailsServiceImpl extends BaseServiceImpl<Dis
 						for (DistributionUnpackingDetailsEntity detailsEntity : v) {
 							DistributionStockListEntity distributionStockListEntity = distributionStockListService.getById(detailsEntity.getAimStockListId());
 							distributionStockListEntity.setId(detailsEntity.getAimStockListId());
-							distributionStockListEntity.setQuantityStock(distributionStockListEntity.getQuantityStock() - (detailsEntity.getUnpackingQuantity() * Integer.parseInt(basicMaterialEntity.getPackageNum())) );
+							distributionStockListEntity.setQuantityStock(distributionStockListEntity.getQuantityStock() - (detailsEntity.getUnpackingQuantity() * basicMaterialEntity.getPackageNum()));
 							if (distributionStockListEntity.getQuantityStock() - distributionStockListEntity.getOutboundQuantity() < 0){
 								//收集无法进行拆包的库存品
 								throw new RuntimeException("在库数量不足取消拆包操作");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -47,7 +47,6 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.feign.IRegionFeign;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -94,11 +93,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final IBasicdataOpenIncomingClient basicdataOpenIncomingClient;
 	private final ITrunklineCarsLoadService carsLoadService;
 	private final ITrunklineCarsLoadScanService trunklineCarsLoadScanService;
-	private final IBasicdataStoreContactClient basicdataStoreContactClient;
 	private final IAsyncService asyncService;
 	private final ICarsLoadAsyncService carsLoadAsyncService;
 
-	private final RabbitTemplate rabbitTemplate;
 
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {
@@ -548,7 +545,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//绑定订单和运单的关系
 		List<TrunklineAdvanceEntity> advanceEntityList = advanceService.findListByIds(advanceIds);
 		List<TrunklineWaybillOrderEntity> waybillOrderEntities = new ArrayList<>();
-		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity : advanceEntityList) {
 			Long advanceId = advanceEntity.getId();
 			String waybillStatus = advanceEntity.getWaybillStatus();
@@ -988,7 +984,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		ls.forEach(basicdataClientJson -> {
 			Long clientId = basicdataClientJson.getLong("clientId");
-			List<String> destinationArray = new ArrayList<>();
 			String badeRegionAreaId = basicdataClientJson.getString("areaId");
 			String bladeRegionProvinceId = basicdataClientJson.getString("provinceId");
 			String bladeRegionCityId = basicdataClientJson.getString("cityId");
@@ -1410,7 +1405,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 									basicMaterialEntity.setPackingSpecification("1件/箱");
 									basicMaterialEntity.setLogpmUnit("箱");
 									basicMaterialEntity.setSku(materialCode);
-									basicMaterialEntity.setPackageNum("1");
+									basicMaterialEntity.setPackageNum(1);
 									basicMaterialEntity.setHide(1);
 									Long aLong = basicMaterialClient.addMaterial(basicMaterialEntity);
 									basicMaterialEntity.setId(aLong);
@@ -1667,7 +1662,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		List<TrunklineAdvanceDetailEntity> advanceDetailEntityList = advanceDetailService.list(queryWrapper);
 		//把advanceDetailEntityList通过advanceId分组并且把集合转化为orderPackageCode的集合
 		Map<Long, List<String>> map = advanceDetailEntityList.parallelStream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getAdvanceId, Collectors.mapping(TrunklineAdvanceDetailEntity::getOrderPackageCode, Collectors.toList())));
-		Map<String,Long> materialMap = new HashMap<>();
 
 
 		listMap.keySet().forEach(str -> {
@@ -2015,7 +2009,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 									basicMaterialEntity.setPackingSpecification("1件/箱");
 									basicMaterialEntity.setLogpmUnit("箱");
 									basicMaterialEntity.setSku(materialCode);
-									basicMaterialEntity.setPackageNum("1");
+									basicMaterialEntity.setPackageNum(1);
 									basicMaterialEntity.setHide(1);
 									Long aLong = basicMaterialClient.addMaterial(basicMaterialEntity);
 									basicMaterialEntity.setId(aLong);
@@ -2291,7 +2285,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		importOrderNoPackageExcelDTOMap.remove("null&null");
 
-		List<TrunklineAdvanceEntity> detailEntities = new ArrayList<>();
 
 		//把orderCodes转成List
 //		List<String> orderCodeList = new ArrayList<>(orderCodes);
@@ -2309,7 +2302,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 //			detailEntities.addAll(entities);
 //		}
 
-		Map<String,TrunklineAdvanceEntity> advanceEntityMap = new HashMap<>();
 
 		//把detailEntities转化成以orderCode和trainNumber为key的map
 //		detailEntities.forEach(advanceEntity -> {
@@ -2924,7 +2916,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//绑定订单和运单的关系
 		List<TrunklineAdvanceEntity> advanceEntityList = advanceService.findListByIds(advanceIds);
 		List<TrunklineWaybillOrderEntity> waybillOrderEntities = new ArrayList<>();
-		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){
 			Long advanceId = advanceEntity.getId();
 			String waybillStatus = advanceEntity.getWaybillStatus();
@@ -3273,7 +3264,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
-		StringBuilder stringBuilder = new StringBuilder();
+//		StringBuilder stringBuilder = new StringBuilder();
 		List<EditOrderMsgVO> msgList = new ArrayList<>();
 
 		String newBrand = openOrderDTO.getBrand();
@@ -3847,7 +3838,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String newRemark = openOrderDTO.getRemark();
 		String remark = waybillEntity.getRemark();
 		if(!ObjectUtil.equals(remark,newRemark)){
-			stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";");
+//			stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";");
 			EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
 			editOrderMsgVO.setItemName("备注");
 			editOrderMsgVO.setOldValue(remark);

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

@@ -474,7 +474,7 @@
         select lbm.product_code materialCode,
                lbm.`name` materialName
         from logpm_basicdata_material lbm
-        where lbm.is_deleted = 0
+        where lbm.is_deleted = 0 and lbm.`hide` = 1
         <if test="param.materialCode != null and param.materialCode != '' ">
             and (lbm.product_code like concat('%',#{param.materialCode},'%') or lbm.`name` like concat('%',#{param.materialCode},'%'))
         </if>

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

@@ -926,17 +926,30 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 
 		List<Map<String,Object>> ls = new ArrayList<>();
+		Integer sumNumber=0;
+		BigDecimal sumWEIGHT = new BigDecimal("0.00");
+		BigDecimal sumVOLUME = new BigDecimal("0.00");
 		for (WarehouseWayBillDetail warehouseWayBillDetail : warehouseWayBillDetails) {
 			Map<String,Object> t = new HashMap<>();
 			t.put("货物名称",warehouseWayBillDetail.getProductName());
 			t.put("件数",warehouseWayBillDetail.getNum());
+			sumNumber = sumNumber + warehouseWayBillDetail.getNum();
 			t.put("包装","");
 			t.put("重量",warehouseWayBillDetail.getWeight());
+			sumWEIGHT = sumWEIGHT.add(warehouseWayBillDetail.getWeight());
 			t.put("体积",warehouseWayBillDetail.getVolume());
+			sumVOLUME = sumVOLUME.add(warehouseWayBillDetail.getVolume());
 			ls.add(t);
 		}
 		map.put("货物明细", ls);
 
+		// 增加合计
+		map.put("合计件数",sumNumber);
+		map.put("合计重量",formatToTwoDecimalPlaces(sumWEIGHT));
+		map.put("合计体积",formatToTwoDecimalPlaces(sumVOLUME));
+
+
+
 		String popHtml = TemplateUtil.popTemplate("运单", map, html);
 		printPreviewVO.setTemplateHtml(popHtml);
 		return printPreviewVO;