1.增加仓库的货位码展示

2.增加数据同步

blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java

@@ -10,13 +10,16 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.common.constant.CommonConstant;
+import sun.misc.BASE64Encoder;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import javax.swing.filechooser.FileSystemView;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,14 +49,37 @@ public class QRCodeUtil {
 	private static final String path="qrCodeImg";
 
 
+	/**
+	 * 文件转换base64
+	 * @param filePath
+	 * @return
+	 */
+	public static String getEmpAutograph(String filePath) {
+		String img = null;
+		if (StringUtils.isNotEmpty(filePath)) {
+			InputStream in = null;
+			byte[] picdata = null;
+			try {
+				in = new FileInputStream(filePath);
+				picdata = new byte[in.available()];
+				in.read(picdata);
+				BASE64Encoder encoder = new BASE64Encoder();
+				img = encoder.encode(picdata);
+			} catch (Exception e) {
+				e.printStackTrace();
+			} finally {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return "data:image/png;base64," + img;
+	}
+
 	public static String createCodeToFile(String content) {
 		try {
-			//getResource("/")等同于到resource文件夹下
-//			String imgPath = QRCodeUtil.class.getResource("").getPath()+path;
-//			InputStream inputStream = QRCodeUtil.class.getClassLoader().getResourceAsStream("test.properties");
-//			ClassLoader classLoader = QRCodeUtil.class.getClassLoader();
-//			URL resource = classLoader.getResource("resources/static/");
-//			File file = new File(resource.getFile());
 			String imgPath = CommonConstant.SYSTEMFILEPATH;
 			File codeImgFileSaveDir = new File(imgPath);
 			//1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java

@@ -63,7 +63,7 @@ public interface IBasicPrintTemplateClient {
 	 * @return
 	 */
 	@GetMapping(TOPPRINTTEMPLATE)
-	BasicPrintTemplateEntity getPrintTemplate();
+	BasicPrintTemplateEntity getPrintTemplate(@RequestParam("tempTypeValue") String tempTypeValue);
 
 
 

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/FreightSpaceVO.java

@@ -0,0 +1,19 @@
+package com.logpm.basicdata.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class FreightSpaceVO {
+
+	@ApiModelProperty(value = "模板ID")
+	private Long templateId;
+	@ApiModelProperty(value = "模板内容")
+	private String templateHtml;
+
+	@ApiModelProperty(value = "模板填充内容")
+	private List<WarehouseAllocationInfoVO> dataList;
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseAllocationInfoVO.java

@@ -0,0 +1,30 @@
+package com.logpm.basicdata.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 货位信息
+ */
+@Data
+public class WarehouseAllocationInfoVO {
+
+	@ApiModelProperty(value = "货位编码二维码")
+	private String allocationImage;
+
+	@ApiModelProperty(value = "货位编码")
+	private String allocationCode;
+
+	@ApiModelProperty(value = "货位名称")
+	private String allocationName;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	@ApiModelProperty(value = "区域名称")
+	private String areaName;
+
+
+
+}

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java

@@ -265,6 +265,13 @@ public class AdvanceEntity  {
 	@ApiModelProperty(value = "车次号")
 	@TableField("mctsTruck")
 	private String mctsTruck;
+
+	/**
+	 * 车牌号
+	 */
+	@ApiModelProperty(value = "车牌号")
+	@TableField("mctsTruckNo")
+	private String mctsTruckNo;
 	/**
 	 * 导入人仓库id
 	 */

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java

@@ -88,4 +88,6 @@ public interface IAdvanceDetailClient {
 	@GetMapping(API_PREFIX + "/getByCarNum")
 	List<String> getByCarNum(@RequestParam String unloadCarNum);
 
+	@PostMapping(API_PREFIX + "/updateAdvanceDetail")
+	void updateAdvanceDetail(AdvanceDetailEntity advanceDetailEntity);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPrintTemplateClient.java

@@ -66,10 +66,10 @@ public class BasicPrintTemplateClient implements IBasicPrintTemplateClient {
 	}
 
 	@Override
-	public BasicPrintTemplateEntity getPrintTemplate() {
+	public BasicPrintTemplateEntity getPrintTemplate(String tempTypeValue) {
 		return basicPrintTemplateService.getOne(Wrappers.<BasicPrintTemplateEntity>query().lambda()
 			.eq(BasicPrintTemplateEntity::getKnifeSwitch,true)
-			.eq(BasicPrintTemplateEntity::getTemplateType, PrintTemplateStatusConstant.daiqueren_10.getValue())
+			.eq(BasicPrintTemplateEntity::getTemplateType, tempTypeValue)
 		);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java

@@ -22,6 +22,7 @@ import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
+import com.logpm.basicdata.vo.FreightSpaceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -77,6 +78,7 @@ public class BasicdataGoodsAllocationController extends BladeController {
 		BasicdataGoodsAllocationEntity detail = basicdataGoodsAllocationService.getOne(Condition.getQueryWrapper(BasicdataGoodsAllocation));
 		return R.data(detail);
 	}
+
 	/**
 	 * 货位 分页
 	 */
@@ -173,31 +175,14 @@ public class BasicdataGoodsAllocationController extends BladeController {
 	/**
 	 * 货位获取模板信息
 	 */
-	@PostMapping("/getTemplate")
+	@PostMapping("/getPrintTemplate")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "生成模板图片返回前端渲染", notes = "传入模板参数")
-	public R<?> getPrintTemplate(@ApiIgnore  @RequestBody Map<String,Object> params,HttpServletResponse response) {
+	public R<?> getPrintTemplate(@ApiIgnore @RequestParam("ids") String ids) {
-		boolean result =  basicdataGoodsAllocationService.getPrintTemplate(params,response);
+		FreightSpaceVO result = basicdataGoodsAllocationService.getPrintTemplate(ids);
-		if (result){
+		return R.data(result);
-			return R.status(result);
-		}else {
-			return R.fail("操作失败");
-		}
-	}
 
-	/**
-	 * 获取二维码图片
-	 */
-	@GetMapping("/QRCodeImg")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "生成二维码图片返回前端渲染", notes = "传入二维码信息")
-	public R<?> getQRCodeImg(@ApiIgnore  @RequestParam String qrCode,HttpServletResponse response) {
-		boolean result =  basicdataGoodsAllocationService.getQRCodeImg(qrCode,response);
-		if (result){
-			return R.status(result);
-		}else {
-			return R.fail("操作失败");
-		}
 	}
 
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java

@@ -23,6 +23,7 @@ import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
+import com.logpm.basicdata.vo.WarehouseAllocationInfoVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
@@ -59,4 +60,10 @@ public interface BasicdataGoodsAllocationMapper extends BaseMapper<BasicdataGood
 
 	IPage<BasicdataGoodsAllocationVO> selectGoodsAllocationList(IPage<Object> page,@Param("po") Map<String, Object> basicdataGoodsAllocation);
 
+	/**
+	 * 根基货位ID 查询货位信息
+	 * @param id
+	 * @return
+	 */
+	WarehouseAllocationInfoVO selectAllocationInfo(@Param("id") String id);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -113,4 +113,18 @@
         </where>
     </select>
 
+        <select id="selectAllocationInfo" resultType="com.logpm.basicdata.vo.WarehouseAllocationInfoVO">
+        SELECT
+        lwga.id as allocationCode,
+        CONCAT(lwga1.headline,'-',lwga.goods_allocation_name) as allocationName
+        ,
+        lww.`name` as warehouseName,
+        lwga1.headline as areaName
+         from logpm_warehouse_goods_allocation lwga
+        LEFT JOIN logpm_warehouse_goods_area lwga1 ON lwga1.id=lwga.goods_area_id
+        LEFT JOIN logpm_warehouse_warehouse lww on lww.id = lwga1.warehouse_id
+
+         where lwga.id=#{id}
+    </select>
+
 </mapper>

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

@@ -23,6 +23,7 @@ import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
+import com.logpm.basicdata.vo.FreightSpaceVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
@@ -85,18 +86,9 @@ public interface IBasicdataGoodsAllocationService extends BaseService<BasicdataG
 
 	/**
 	 * 获取货位模板，转换图片至前端
-	 * @param params 货位信息
-	 * @param response 响应流
 	 * @return 渲染成功的模板图片
 	 */
-    boolean getPrintTemplate(Map<String, Object> params, HttpServletResponse response);
+    FreightSpaceVO getPrintTemplate(String ids);
 
-	/**
-	 * 生成二维码图片并返回
-	 * @param qrCode 二维码信息
-	 * @param response 响应流
-	 * @return 生成的二维码图片
-	 */
-	boolean getQRCodeImg(String qrCode, HttpServletResponse response);
 
 }

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

@@ -17,26 +17,34 @@
 package com.logpm.basicdata.service.impl;
 
 import cn.hutool.extra.qrcode.QrCodeUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
+import com.logpm.basicdata.vo.FreightSpaceVO;
+import com.logpm.basicdata.vo.WarehouseAllocationInfoVO;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -50,9 +58,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 货位 服务实现类
@@ -64,13 +70,13 @@ import java.util.Map;
 @AllArgsConstructor
 public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<BasicdataGoodsAllocationMapper, BasicdataGoodsAllocationEntity> implements IBasicdataGoodsAllocationService {
 
-	private BasicdataGoodsAllocationMapper goodsAllocationMapper;
+	private final BasicdataGoodsAllocationMapper goodsAllocationMapper;
 
-	private BasicdataGoodsAreaMapper goodsAreaMapper;
+	private final BasicdataGoodsAreaMapper goodsAreaMapper;
 
-	private IBasicTenantCodeClient tenantCodeClient;
+	private final IBasicTenantCodeClient tenantCodeClient;
 
-	private IBasicPrintTemplateClient printTemplateClient;
+	private final IBasicPrintTemplateClient printTemplateClient;
 
 
 	@Override
@@ -169,45 +175,42 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 
 	@Override
-	public boolean getPrintTemplate(Map<String, Object> params, HttpServletResponse response) {
+	public FreightSpaceVO getPrintTemplate(String ids) {
-		//查询模板信息
+		FreightSpaceVO orderPackgeCodeDataVO = new FreightSpaceVO();
-		String tenantId = AuthUtil.getTenantId();
+		List<WarehouseAllocationInfoVO> data = new ArrayList<>();
-//		BasicPrintTemplateEntity template = printTemplateClient.getTemplate(tenantId, "8","1");
+		BasicPrintTemplateEntity template = printTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_8.getValue());
-		String templateId = (String) params.get("templateId");
+
-		BasicPrintTemplateEntity template = printTemplateClient.getTemplate(templateId);
+		if (ObjectUtil.isEmpty(template)) {
-		String qrCode = (String) params.get("qrCode");
+			throw new ServiceException("模板信息未找到！！");
-		if (Func.isBlank(qrCode)){
-			log.error("qrCode参数异常：+{"+qrCode+"}");
-			return false;
 		}
-		//生成二维码至本地并获取文件路径
+		String html = null;
-		String fileName = QRCodeUtil.createCodeToFile(qrCode);
-		params.put("img",fileName);
 		try {
-			//模板渲染
+			html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
-			BufferedImage bufferedImage = TemplateUtil.turnImage(template.getFileName(), params, template.getTemplateUrl(), template.getTemplateWidth(), template.getTemplateHeight());
+			orderPackgeCodeDataVO.setTemplateHtml(html);
-			ServletOutputStream os = response.getOutputStream();
+			orderPackgeCodeDataVO.setTemplateId(template.getId());
-			ImageIO.write(bufferedImage,"png",os);
+
-		} catch (IOException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
-			return false;
-		}finally {
-			File file = new File(fileName);
-			file.delete();
 		}
-		return true;
+
+		String[] idArray = ids.split(",");
+		if (ObjectUtils.isNull(idArray)) {
+			throw new ServiceException("参数错误");
 		}
+		for (String id : idArray) {
+			// 查询货位信息
+			WarehouseAllocationInfoVO basicdataGoodsAllocationEntity = baseMapper.selectAllocationInfo(id);
+			String filename = QRCodeUtil.createCodeToFile(basicdataGoodsAllocationEntity.getAllocationCode());
+			String fileString = QRCodeUtil.getEmpAutograph(filename);
+			basicdataGoodsAllocationEntity.setAllocationImage(fileString);
+			data.add(basicdataGoodsAllocationEntity);
 
-	@Override
-	public boolean getQRCodeImg(String qrCode, HttpServletResponse response) {
-		try {
-			org.springblade.common.utils.QRCodeUtil.createCodeToOutputStream(qrCode,response);
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("二维码图片创建失败+{"+e.getMessage()+"}");
-			return false;
 		}
-		return true;
+		orderPackgeCodeDataVO.setDataList(data);
+		return orderPackgeCodeDataVO;
+
+
 	}
 
+
 }

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

@@ -318,16 +318,6 @@ public class DistributionStockArticleController extends BladeController {
 	}
 
 
-	/**
-	 * 模板渲染，打印
-	 */
-	@GetMapping("/getPrintTemplate")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "获取模板")
-	public R<?> getPrintTemplate(@ApiIgnore  @RequestParam Map<String,Object> params,HttpServletResponse response) {
-		R<?> result = distributionStockArticleService.getPrintTemplates(params,response);
-		return result;
-	}
 
 
 

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

@@ -44,6 +44,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
@@ -411,7 +412,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public void getShowTemplate(Map<String, Object> params, HttpServletResponse response) throws IllegalAccessException {
 //		String tenantId = AuthUtil.getTenantId();
 //		String templateId = (String) params.get("templateId");
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_10.getValue());
 		if (ObjectUtil.isEmpty(template)) {
 			throw new ServiceException("模板信息未找到！！");
 		}
@@ -460,29 +461,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 	}
 
-	private String getEmpAutograph(String filePath) {
+
-		String img = null;
-		if (StringUtils.isNotEmpty(filePath)) {
-			InputStream in = null;
-			byte[] picdata = null;
-			try {
-				in = new FileInputStream(filePath);
-				picdata = new byte[in.available()];
-				in.read(picdata);
-				BASE64Encoder encoder = new BASE64Encoder();
-				img = encoder.encode(picdata);
-			} catch (Exception e) {
-				e.printStackTrace();
-			} finally {
-				try {
-					in.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return "data:image/png;base64," + img;
-	}
 
 
 
@@ -492,7 +471,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		StringBuffer buffer = new StringBuffer();
 		//待删除文件列表
 		List<String> list = new ArrayList<>();
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_10.getValue());
 		if (ObjectUtil.isEmpty(template)) {
 			return R.fail("模板信息未找到！！");
 		}
@@ -502,9 +481,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		String qrCode = (String) map.get("qrCode");
 		String filename = QRCodeUtil.createCodeToFile(qrCode);
 		list.add(filename);
-		map.put("img", getEmpAutograph(filename));
+		map.put("img", QRCodeUtil.getEmpAutograph(filename));
 		String filetypeName = QRCodeUtil.createCodeToFileType(qrCode);
-		map.put("imgType", getEmpAutograph(filetypeName));
+		map.put("imgType", QRCodeUtil.getEmpAutograph(filetypeName));
 		list.add(filetypeName);
 		try {
 			templateByUrl = TemplateUtil.getTemplateByUrl(template.getFileName(), map, template.getTemplateUrl());
@@ -522,7 +501,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public OrderPackgeCodeDataVO showOrderPackgeCode(Map<String, Object> params) throws Exception {
 		OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();
 		List<Map> data = new ArrayList<>();
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_10.getValue());
 		if (ObjectUtil.isEmpty(template)) {
 			throw new ServiceException("模板内容未找到");
 		}
@@ -542,9 +521,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null, id);
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class);
 			String filename = QRCodeUtil.createCodeToFile(orderNoList.getQrCode());
-			map.put("img", getEmpAutograph(filename));
+			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			String fileTypeName = QRCodeUtil.createCodeToFileType(orderNoList.getQrCode());
-			map.put("imgType", getEmpAutograph(fileTypeName));
+			map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
 			data.add(map);
 		}
 

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

@@ -25,6 +25,9 @@ import com.logpm.oldproject.feign.IDetailProductClient;
 import com.logpm.oldproject.feign.IServiceNumClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.jetbrains.annotations.Nullable;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -269,10 +272,110 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		MtFactoryOrderMain mtFactoryOrderMain = mtFactoryOrderMainService.getById(mainId);
 		for (MtFactoryOrder mtFactoryOrder : mtFactoryOrders) {
 			Long orderId = mtFactoryOrder.getId();
+			Integer advanceId = null;
 
 			log.info("#########handlerMtDataToHt: 当前处理的订单id={}", orderId);
-
 			//添加订单信息
+			advanceId = addAdvanceEntity(mtFactoryOrderMain, mtFactoryOrder);
+			if (advanceId == null) continue;
+
+			//通过订单id查询对应的包件
+			QueryWrapper<MtPackageInfo> packageQueryWrapper = new QueryWrapper<>();
+			packageQueryWrapper.eq("order_id", orderId)
+				.eq("status", 1)
+				.eq("is_deleted", 0);
+			List<MtPackageInfo> packages = mtPackageInfoService.list(packageQueryWrapper);
+			for (MtPackageInfo mtPackageInfo : packages) {
+				//添加订单明细
+				addAdvanceDetailEntity(mtFactoryOrderMain, mtFactoryOrder, advanceId, mtPackageInfo);
+
+			}
+			String sn = StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode();
+			ServiceNumEntity serviceNum = serviceNumClient.findByserviceNum(sn);
+			if (Objects.isNull(serviceNum)) {
+				serviceNum = new ServiceNumEntity();
+				serviceNum.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode()); //服务号
+				serviceNum.setTotal("1"); //订单数量
+				serviceNum.setDetailTotal(Objects.isNull(mtFactoryOrder.getQuantity()) ? "" : mtFactoryOrder.getQuantity() + ""); // 包数量
+				serviceNum.setStoreName(StringUtil.isBlank(mtFactoryOrder.getExclusiveName()) ? "" : mtFactoryOrder.getExclusiveName()); //商场名
+				serviceNum.setStoreNo(StringUtil.isBlank(mtFactoryOrder.getExclusiveCode()) ? "" : mtFactoryOrder.getExclusiveCode()); // 商场编号
+				serviceNum.setCustomerName(StringUtil.isBlank(mtFactoryOrder.getCustomName()) ? "" : mtFactoryOrder.getCustomName());//顾客姓名
+				serviceNum.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); //顾客电话
+				serviceNum.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress()); //顾客地址
+				serviceNum.setIsOpai(1); //是否干仓配
+				serviceNum.setCompleteSet("V"); //齐套标识：Y=齐套，N=未齐套，V=未知
+//				 serviceNum.setCreateTime(LocalDate.now());
+				serviceNum.setDeleteTime(0);
+				serviceNumEntityList.add(serviceNum);
+				serviceNumClient.addServiceNum(serviceNumEntityList);
+			} else {
+				log.info("#############handlerMtDataToHt: 当前服务号已存在数据serviceNum={}", sn);
+				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal()) + 1 + "");
+				serviceNumClient.updateServiceNum(serviceNum);
+			}
+
+		}
+		log.info("##############handlerMtDataToHt: 处理数据完成");
+	}
+
+	/**
+	 * 添加订单包件
+	 *
+	 * @param mtFactoryOrderMain
+	 * @param mtFactoryOrder
+	 * @param advanceId
+	 * @param mtPackageInfo
+	 */
+	private void addAdvanceDetailEntity(MtFactoryOrderMain mtFactoryOrderMain, MtFactoryOrder mtFactoryOrder, Integer advanceId, MtPackageInfo mtPackageInfo) {
+		AdvanceDetailEntity advanceDetailEntity = advanceDetailClient.getOneByUnitNo(mtPackageInfo.getPackageCode());
+
+		if (ObjectUtil.isNotEmpty(advanceDetailEntity)) {
+
+			// 当这个包条存在老系统的时候
+			advanceDetailEntity.setMctsTruckNo(mtFactoryOrderMain.getInvoiceOrderCode());
+			//更新包件
+			advanceDetailClient.updateAdvanceDetail(advanceDetailEntity);
+
+		} else {
+			advanceDetailEntity = new AdvanceDetailEntity();
+			advanceDetailEntity.setAdvanceId(advanceId);//预仓id
+			advanceDetailEntity.setIsPay(Byte.parseByte("0"));//
+			advanceDetailEntity.setLineID("");//线下订单明细标时 可以为空
+			advanceDetailEntity.setSerialKey("");//序列号 可以为空
+			advanceDetailEntity.setArea("");//区域
+			advanceDetailEntity.setOrderSelfNum(mtFactoryOrder.getOrderCode());//订单自编号
+			advanceDetailEntity.setType(FactoryConstant.MENGT);//订单来源
+			advanceDetailEntity.setSystemType("线上");//订单类型
+			advanceDetailEntity.setOrderNum("");//MSCS单号  可以为空
+			advanceDetailEntity.setIsOpai(0);//是否干仓配：1=是，0=否
+			advanceDetailEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());//MTDS单号 可以为空
+			advanceDetailEntity.setFirstPackName("门");//一级品类
+//				advanceDetailEntity.setFirstPackName(StringUtil.isBlank(mtPackageInfo.getBigType())?"":mtPackageInfo.getBigType());//一级品类
+			advanceDetailEntity.setFirstPackCode("");//二级品类
+			advanceDetailEntity.setSiteName("");//基地名称  基地 TODO 需要映射
+			advanceDetailEntity.setSiteCode("");//基地编码
+			advanceDetailEntity.setProductCode(StringUtil.isBlank(mtPackageInfo.getPackageType()) ? "" : mtPackageInfo.getPackageType());//货品名称 可以为空
+			advanceDetailEntity.setSecondPackName("");//二级品类名称
+			advanceDetailEntity.setSecondPackCode("");//二级品类
+			advanceDetailEntity.setThirdPackName("");//三级品类名称
+			advanceDetailEntity.setThirdPackCode("");//三级品类
+			advanceDetailEntity.setGoodName("");//v产品类型 可以为空
+			advanceDetailEntity.setIsAddin("Y");//例放：N=正常，Y=例放
+			advanceDetailEntity.setIsThirdAddin("N");//三级例放：N=正常，Y=例放
+			advanceDetailEntity.setIsSuppin("N");//补进：N=正常，Y=例放
+			advanceDetailEntity.setMscsNum("1");//发货数量
+			advanceDetailEntity.setMtdsNum(0);//销售数量
+			advanceDetailEntity.setVolume("");//体积
+			advanceDetailEntity.setUnitNo(StringUtil.isBlank(mtPackageInfo.getPackageCode()) ? "" : mtPackageInfo.getPackageCode());//包条码
+			advanceDetailEntity.setMctsTruck(mtFactoryOrderMain.getInvoiceOrderCode());//车次号
+			buildAdvanceDetailEntity(mtFactoryOrder, mtPackageInfo, advanceDetailEntity);
+		}
+
+
+	}
+
+	@Nullable
+	private Integer addAdvanceEntity(MtFactoryOrderMain mtFactoryOrderMain, MtFactoryOrder mtFactoryOrder) {
 		AdvanceEntity advanceEntity = new AdvanceEntity();
 		advanceEntity.setOrderSelfNum(StringUtil.isBlank(mtFactoryOrder.getOrderCode()) ? "" : mtFactoryOrder.getOrderCode()); //订单自编号
 		advanceEntity.setSiteName(""); // 基地 TODO 需要映射
@@ -282,10 +385,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setType(FactoryConstant.MENGT);
 		advanceEntity.setTotal(Integer.parseInt(mtFactoryOrder.getQuantity())); //订单总数据
 		advanceEntity.setMctsTruck(mtFactoryOrderMain.getInvoiceOrderCode()); //车次
-			advanceEntity.setMtdsNo("");// MTDS单号 可以为空
+		advanceEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());// 生产单号
+		advanceEntity.setMctsTruckNo(mtFactoryOrderMain.getSendCarNumber());// 车牌//字段没有了
 		advanceEntity.setFirstPackName(""); //一级品类
 		advanceEntity.setFirstPackCode(""); //一级品类
-			advanceEntity.setDealerName(""); //商场名称
+		advanceEntity.setDealerName(mtFactoryOrder.getDealerName()); //商场名称
 		advanceEntity.setDealerCode(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //商场编码
 		advanceEntity.setDueDate(""); // 交期
 		advanceEntity.setIsOpai(0); //是否干仓配
@@ -295,10 +399,10 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); // 顾客电话
 		advanceEntity.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress());//顾客地址
 		advanceEntity.setSystemType("线上"); //订单类型
-			advanceEntity.setStoreNo(""); //门店编码
+		advanceEntity.setStoreNo(mtFactoryOrder.getExclusiveCode()); //门店编码
-			advanceEntity.setStoreName(""); //门店名称
+		advanceEntity.setStoreName(mtFactoryOrder.getExclusiveName()); //门店名称
 		advanceEntity.setSerialKey(""); //序列号
-			advanceEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrderMain.getInvoiceOrderCode()) ? "" : mtFactoryOrderMain.getInvoiceOrderCode()); //服务号
+		advanceEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode()); //服务号
 		advanceEntity.setMatingCode("");//齐套模式 可以为空
 		advanceEntity.setContractNum("");//合同号 可以为空
 		advanceEntity.setLeaveBehind("");//遗留：Y=是，N=否
@@ -326,77 +430,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			//修改订单状态为失败
 			mtFactoryOrder.setStatus(2);
 			mtFactoryOrderService.saveOrUpdate(mtFactoryOrder);
-				continue;
+			return null;
-			}
-
-			//通过订单id查询对应的包件
-			QueryWrapper<MtPackageInfo> packageQueryWrapper = new QueryWrapper<>();
-			packageQueryWrapper.eq("order_id", orderId)
-				.eq("status", 1)
-				.eq("is_deleted", 0);
-			List<MtPackageInfo> packages = mtPackageInfoService.list(packageQueryWrapper);
-			for (MtPackageInfo mtPackageInfo : packages) {
-				//添加订单明细
-				AdvanceDetailEntity advanceDetailEntity = new AdvanceDetailEntity();
-				advanceDetailEntity.setAdvanceId(advanceId);//预仓id
-				advanceDetailEntity.setIsPay(Byte.parseByte("0"));//
-				advanceDetailEntity.setLineID("");//线下订单明细标时 可以为空
-				advanceDetailEntity.setSerialKey("");//序列号 可以为空
-				advanceDetailEntity.setArea("");//区域
-				advanceDetailEntity.setOrderSelfNum(mtFactoryOrder.getOrderCode());//订单自编号
-				advanceDetailEntity.setType(FactoryConstant.MENGT);//订单来源
-				advanceDetailEntity.setSystemType("线上");//订单类型
-				advanceDetailEntity.setOrderNum("");//MSCS单号  可以为空
-				advanceDetailEntity.setIsOpai(0);//是否干仓配：1=是，0=否
-				advanceDetailEntity.setMtdsNo("");//MTDS单号 可以为空
-				advanceDetailEntity.setFirstPackName("门");//一级品类
-//				advanceDetailEntity.setFirstPackName(StringUtil.isBlank(mtPackageInfo.getBigType())?"":mtPackageInfo.getBigType());//一级品类
-				advanceDetailEntity.setFirstPackCode("");//二级品类
-				advanceDetailEntity.setSiteName("");//基地名称  基地 TODO 需要映射
-				advanceDetailEntity.setSiteCode("");//基地编码
-				advanceDetailEntity.setProductCode(StringUtil.isBlank(mtPackageInfo.getPackageType()) ? "" : mtPackageInfo.getPackageType());//货品名称 可以为空
-				advanceDetailEntity.setSecondPackName("");//二级品类名称
-				advanceDetailEntity.setSecondPackCode("");//二级品类
-				advanceDetailEntity.setThirdPackName("");//三级品类名称
-				advanceDetailEntity.setThirdPackCode("");//三级品类
-				advanceDetailEntity.setGoodName("");//v产品类型 可以为空
-				advanceDetailEntity.setIsAddin("Y");//例放：N=正常，Y=例放
-				advanceDetailEntity.setIsThirdAddin("N");//三级例放：N=正常，Y=例放
-				advanceDetailEntity.setIsSuppin("N");//补进：N=正常，Y=例放
-				advanceDetailEntity.setMscsNum("1");//发货数量
-				advanceDetailEntity.setMtdsNum(0);//销售数量
-				advanceDetailEntity.setVolume("");//体积
-				advanceDetailEntity.setUnitNo(StringUtil.isBlank(mtPackageInfo.getPackageCode()) ? "" : mtPackageInfo.getPackageCode());//包条码
-				advanceDetailEntity.setMctsTruck(mtFactoryOrderMain.getInvoiceOrderCode());//车次号
-				buildAdvanceDetailEntity(mtFactoryOrder, mtPackageInfo, advanceDetailEntity);
-			}
-
-			String sn = StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode();
-			ServiceNumEntity serviceNum = serviceNumClient.findByserviceNum(sn);
-			if (Objects.isNull(serviceNum)) {
-				serviceNum = new ServiceNumEntity();
-				serviceNum.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode()); //服务号
-				serviceNum.setTotal("1"); //订单数量
-				serviceNum.setDetailTotal(Objects.isNull(mtFactoryOrder.getQuantity()) ? "" : mtFactoryOrder.getQuantity() + ""); // 包数量
-				serviceNum.setStoreName(StringUtil.isBlank(mtFactoryOrder.getExclusiveName()) ? "" : mtFactoryOrder.getExclusiveName()); //商场名
-				serviceNum.setStoreNo(StringUtil.isBlank(mtFactoryOrder.getExclusiveCode()) ? "" : mtFactoryOrder.getExclusiveCode()); // 商场编号
-				serviceNum.setCustomerName(StringUtil.isBlank(mtFactoryOrder.getCustomName()) ? "" : mtFactoryOrder.getCustomName());//顾客姓名
-				serviceNum.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); //顾客电话
-				serviceNum.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress()); //顾客地址
-				serviceNum.setIsOpai(1); //是否干仓配
-				serviceNum.setCompleteSet("V"); //齐套标识：Y=齐套，N=未齐套，V=未知
-//				 serviceNum.setCreateTime(LocalDate.now());
-				serviceNum.setDeleteTime(0);
-				serviceNumEntityList.add(serviceNum);
-				serviceNumClient.addServiceNum(serviceNumEntityList);
-			} else {
-				log.info("#############handlerMtDataToHt: 当前服务号已存在数据serviceNum={}", sn);
-				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal()) + 1 + "");
-				serviceNumClient.updateServiceNum(serviceNum);
-			}
-
 		}
-		log.info("##############handlerMtDataToHt: 处理数据完成");
+		return advanceId;
 	}
 
 	private void buildAdvanceDetailEntity(MtFactoryOrder mtFactoryOrder, MtPackageInfo mtPackageInfo, AdvanceDetailEntity advanceDetailEntity) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java

@@ -62,7 +62,7 @@ public class MtFactoryDataController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "通常数据推送", notes = "传入factoryOrderDTO")
 	public R data(@Validated @RequestBody MtFactoryDataDTO mtFactoryDataDTO, HttpServletRequest request) {
-		log.info("############data: ");
+		log.info("############data:{} ",mtFactoryDataDTO);
 		String corpId = request.getHeader("corpId");
 
 		//先保存原始请求数据

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java

@@ -90,4 +90,9 @@ public class AdvanceDetailClient implements IAdvanceDetailClient {
 	public List<String> getByCarNum(String unloadCarNum) {
 		return advanceDetailService.getByCarNum(unloadCarNum);
 	}
+
+	@Override
+	public void updateAdvanceDetail(AdvanceDetailEntity advanceDetailEntity) {
+		advanceDetailService.updateAdvanceDetail(advanceDetailEntity);
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml

@@ -29,13 +29,16 @@
                                  `customerName`, `customerPhone`, `customerRoad`, `systemType`, `storeNo`, `storeName`, `serialKey`, `serviceNum`,
                                  `matingCode`, `contractNum`, `leaveBehind`, `senderName`, `senderMobile`, `senderAddress`, `administrators_id`, `create_time`,`update_time`,
                                   `delete_time`, `cars_num`, `waybill_status`, `waybill_no`, `mctsTruck`, `warehouse_id`, `old_id`, `freeze`,
-                                 `delete_reason`, `delete_administrators_id`)
+                                 `delete_reason`, `delete_administrators_id`,`mctsTruckNo`,`siteName`,`siteCode`,`dealerName`,`dealerCode`)
         VALUES ( #{param.orderSelfNum}, #{param.siteName}, #{param.area}, #{param.orderTypeName}, #{param.orderClassName},#{param.type}, #{param.total}, #{param.mtdsNo},
                 #{param.firstPackName}, #{param.firstPackCode}, #{param.dealerCode}, #{param.dealerName}, #{param.dueDate},#{param.isOpai}, #{param.orderNum},
                 #{param.carrierName}, #{param.customerName},#{param.customerPhone}, #{param.customerRoad}, #{param.systemType}, #{param.storeNo}, #{param.storeName},
                 #{param.serialKey}, #{param.serviceNum},#{param.matingCode}, #{param.contractNum}, #{param.leaveBehind}, #{param.senderName},
                 #{param.senderMobile}, #{param.senderAddress}, #{param.administratorsId},NOW(),NOW(), #{param.deleteTime}, #{param.carsNum}, #{param.waybillStatus},
-                #{param.waybillNo}, #{param.mctsTruck}, #{param.warehouseId}, #{param.oldId},#{param.freeze}, #{param.deleteReason}, #{param.deleteAdministratorsId});
+                #{param.waybillNo}, #{param.mctsTruck}, #{param.warehouseId}, #{param.oldId},#{param.freeze}, #{param.deleteReason},
+                #{param.deleteAdministratorsId},
+                #{param.mctsTruckNo},   #{param.siteName},   #{param.siteCode},#{param.dealerName},#{param.dealerCode},
+                );
     </insert>
 
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java

@@ -33,6 +33,13 @@ public interface IAdvanceDetailService {
 
 	Boolean addAdvanceDetail(AdvanceDetailEntity advanceDetailEntity);
 
+	/**
+	 * 更新
+	 * @param advanceDetailEntity
+	 * @return
+	 */
+	Integer updateAdvanceDetail(AdvanceDetailEntity advanceDetailEntity);
+
 	Map<String, String> getSupplyData(String unitNo);
 
     AdvanceDetailEntity getOneByUnitNo(String unitNo);

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java

@@ -44,6 +44,12 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService {
 		return advanceDetailMapper.addAll(advanceDetailEntity);
 	}
 
+	@Override
+	public Integer updateAdvanceDetail(AdvanceDetailEntity advanceDetailEntity) {
+		return advanceDetailMapper.updateById(advanceDetailEntity);
+
+	}
+
 	@Override
 	public Map<String, String> getSupplyData(String unitNo) {
 		//查询补充数据