mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
1、cad拆单新增plateno生成规则,追加5位组织号在前;2、小程序解析新plateno号;
This commit is contained in:
+3
-3
@@ -1306,7 +1306,7 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
@Override
|
@Override
|
||||||
public OrderPlateWechatMiniProgramCadInfoRespVO getPlateInfoByPlateNo(String plateNo) {
|
public OrderPlateWechatMiniProgramCadInfoRespVO getPlateInfoByPlateNo(String plateNo) {
|
||||||
// 1、解析组织id,查询板件信息
|
// 1、解析组织id,查询板件信息
|
||||||
Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16);
|
Integer organId = Integer.parseInt(plateNo.substring(0, 5));
|
||||||
organApi.validOrgan(organId.longValue()).checkError();
|
organApi.validOrgan(organId.longValue()).checkError();
|
||||||
|
|
||||||
PlateDO plateDO = plateMapper.selectOne(new LambdaQueryWrapper<PlateDO>()
|
PlateDO plateDO = plateMapper.selectOne(new LambdaQueryWrapper<PlateDO>()
|
||||||
@@ -1372,7 +1372,7 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
public OrderWechatMiniProgramCadInfoRespVO getOrderInfoByPlateNo(String plateNo) {
|
public OrderWechatMiniProgramCadInfoRespVO getOrderInfoByPlateNo(String plateNo) {
|
||||||
OrderWechatMiniProgramCadInfoRespVO result = new OrderWechatMiniProgramCadInfoRespVO();
|
OrderWechatMiniProgramCadInfoRespVO result = new OrderWechatMiniProgramCadInfoRespVO();
|
||||||
// 1、解析组织id,查询板件信息
|
// 1、解析组织id,查询板件信息
|
||||||
Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16);
|
Integer organId = Integer.parseInt(plateNo.substring(0, 5));
|
||||||
Long organIdLong = organId.longValue();
|
Long organIdLong = organId.longValue();
|
||||||
organApi.validOrgan(organId.longValue()).checkError();
|
organApi.validOrgan(organId.longValue()).checkError();
|
||||||
|
|
||||||
@@ -1403,7 +1403,7 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
@Override
|
@Override
|
||||||
public OrdersViewCadViewInfoRespVO getOrderDetailsByPlateNo(String plateNo, OrderWechatMiniProgramDetailReqVO reqVO) {
|
public OrdersViewCadViewInfoRespVO getOrderDetailsByPlateNo(String plateNo, OrderWechatMiniProgramDetailReqVO reqVO) {
|
||||||
// 1、解析组织id,查询板件信息
|
// 1、解析组织id,查询板件信息
|
||||||
Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16);
|
Integer organId = Integer.parseInt(plateNo.substring(0, 5));
|
||||||
Long organIdLong = organId.longValue();
|
Long organIdLong = organId.longValue();
|
||||||
organApi.validOrgan(organId.longValue()).checkError();
|
organApi.validOrgan(organId.longValue()).checkError();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -780,7 +780,7 @@ public class WebCadOrderImportAsyncFactory {
|
|||||||
.id(plateId)
|
.id(plateId)
|
||||||
.orderId(orderId)
|
.orderId(orderId)
|
||||||
.name(block.getName())
|
.name(block.getName())
|
||||||
.plateNo(obtainingTime + Long.toString(plateNo).substring(2))
|
.plateNo(String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2))
|
||||||
.type(block.getType())
|
.type(block.getType())
|
||||||
.goodsId(goodsDO.getId())
|
.goodsId(goodsDO.getId())
|
||||||
.width(getBigDecimalOrNull(block.getWidth()))
|
.width(getBigDecimalOrNull(block.getWidth()))
|
||||||
|
|||||||
+1
-1
@@ -977,7 +977,7 @@ public class WebCadOrderImportFactory {
|
|||||||
.id(plateId)
|
.id(plateId)
|
||||||
.orderId(orderId)
|
.orderId(orderId)
|
||||||
.name(block.getName())
|
.name(block.getName())
|
||||||
.plateNo(obtainingTime + Long.toString(plateNo).substring(2))
|
.plateNo(String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2))
|
||||||
.type(block.getType())
|
.type(block.getType())
|
||||||
.goodsId(goodsDO.getId())
|
.goodsId(goodsDO.getId())
|
||||||
.width(getBigDecimalOrNull(block.getWidth()))
|
.width(getBigDecimalOrNull(block.getWidth()))
|
||||||
|
|||||||
Reference in New Issue
Block a user