From 0f8733eea6f392d8a685f976e3e7f756d74f16a7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 25 Jul 2024 17:29:55 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1PDA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=81=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=BB=B4=E6=8A=A4ID=E5=92=8CCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionAddvalueAppController.java | 3 +- .../DistributionStockArticleController.java | 7 + .../mapper/DistributionReservationMapper.java | 28 +- .../mapper/DistributionReservationMapper.xml | 139 ++--- .../service/IDistributionAddvalueService.java | 3 +- .../impl/DistributionAddvalueServiceImpl.java | 555 ++++++++---------- 6 files changed, 349 insertions(+), 386 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java index ae93dfeb1..e4982723b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java @@ -2,6 +2,7 @@ package com.logpm.distribution.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.distribution.dto.DistributionAddvaluePackageDTO; import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; import com.logpm.distribution.vo.DistributionAddvaluePackageVO; @@ -67,7 +68,7 @@ public class DistributionAddvalueAppController { @ApiOperationSupport(order = 3) @ApiOperation(value = "查询该客户下的所有配送包件信息", notes = "DistributionAppDeliveryListDTO") public R getAllPackageList(@Valid @RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { - List allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO); + List allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO); return R.data(200,allPackageList,"成功"); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 0b70c73f9..289c1ee33 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -18,6 +18,7 @@ package com.logpm.distribution.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataClientUserEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataClientClient; @@ -411,7 +412,13 @@ public class DistributionStockArticleController extends BladeController { newStockArticle.setCustomerTelephone(stockArticleEntity.getCustomerTelephone()); newStockArticle.setCustomerAddress(stockArticleEntity.getCustomerAddress()); } else { + BasicdataClientEntity client = basicdataClientClient.findByName(mallName); + if (Func.isEmpty(client)){ + throw new RuntimeException("客户信息错误!!!"); + } newStockArticle.setMallName(mallName); + newStockArticle.setMallId(client.getId()); + newStockArticle.setMallCode(client.getClientCode()); newStockArticle.setConsigneeUnit(consigneeUnit); } String content = oldStockArticle.compareCustomerInfo(newStockArticle); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 20fad06f3..324bee0aa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -185,19 +185,19 @@ public interface DistributionReservationMapper extends BaseMapper selectInventoryListByReservation(@Param("reservationId") Long reservationId); - /** - * 查询客户下的库存品信息 - * @param reservationId - * @return - */ - List selectAppInventoryListByReservation(@Param("reservationId") Long reservationId); +// /** +// * 查询客户下的库存品信息 +// * @param reservationId +// * @return +// */ +// List selectAppInventoryListByReservation(@Param("reservationId") Long reservationId); - /** - * 查询客户下的包件信息 - * @param reservationId - * @return - */ - List selectAppPackageListByReservationId(@Param("reservationId")Long reservationId); +// /** +// * 查询客户下的包件信息 +// * @param reservationId +// * @return +// */ +// List selectAppPackageListByReservationId(@Param("reservationId")Long reservationId); /** * 查询出客户下的库存品订单维度信息 @@ -263,8 +263,8 @@ public interface DistributionReservationMapper extends BaseMapper selectZeroPackageListByReservationId(@Param("reservationId")Long reservationId); - //查询零担品类包件信息 - List selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId); +// //查询零担品类包件信息 +// List selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId); /** * 查询商场客户的预约单 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index c9d3e48e1..0193edefc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -900,57 +900,58 @@ WHERE ldr.id = #{reservationId} and ldsld.stock_package_status in ('1','3') - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - select * from mt_factory_node_push #{ew.customSqlSegment} + select * from mt_factory_node_push + + ${ew.sqlSegment} + - update mt_factory_node_push set send_status = 1 where id = #{id} + update mt_factory_node_push set send_status = 1 where id in + + #{id} + diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java index d5b21e80b..eccc14c7a 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java @@ -5,6 +5,8 @@ import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; +import java.util.List; + /** * 推送工厂节点数据 服务类 * @@ -15,7 +17,7 @@ public interface FactoryNodePushService extends BaseService pageNodePush(FactoryNodePushEntity vo, Query query); - Boolean cancel(String id); + Boolean cancel(List id); - Boolean rePush(String id); + Boolean rePush(List id); } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java index 42ee2a416..ae1927d17 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.mengtian.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; @@ -15,6 +16,7 @@ import com.logpm.factorydata.mengtian.service.FactoryNodePushService; import com.logpm.factorydata.mengtian.util.QueryUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -38,33 +40,44 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class); List deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper); - return null; + return page.setRecords(deliveryTrainPage); } @Override - public Boolean cancel(String id) { - return baseMapper.cancel(id); + public Boolean cancel(List ids) { + if(CollUtil.isEmpty(ids)){ + throw new ServiceException("参数为空"); + } + return baseMapper.cancel(ids); } @Override - public Boolean rePush(String id) { - FactoryNodePushEntity factoryNodePushEntity = baseMapper.selectById(id); - if(ObjectUtil.isNotEmpty(factoryNodePushEntity)){ - log.info("重新推送工厂：{}", JSONUtil.toJsonStr(factoryNodePushEntity)); - HttpRequest post = HttpUtil.createPost(factoryNodePushEntity.getSendUrl()); - post.header("ClientId", "mt.ht"); - post.header("OperationCode", factoryNodePushEntity.getOperationCode()); - post.body(factoryNodePushEntity.getContent()); - HttpResponse execute = post.execute(); - String resBody = execute.body(); - log.info("重新推送工厂结果：{}", resBody); - JSONObject entries = JSONUtil.parseObj(resBody); - int resultCode = entries.getInt("Result"); - // 存入日志表 - factoryNodePushEntity.setSendStatus(Convert.toStr(resultCode)); - baseMapper.updateById(factoryNodePushEntity); - return Boolean.TRUE; + public Boolean rePush(List ids) { + if(CollUtil.isEmpty(ids)){ + throw new ServiceException("参数为空"); + } + List factoryNodePushEntities = baseMapper.selectBatchIds(ids); + if(CollUtil.isNotEmpty(factoryNodePushEntities)){ + for (FactoryNodePushEntity factoryNodePushEntity : factoryNodePushEntities) { + if(ObjectUtil.isNotEmpty(factoryNodePushEntity)){ + log.info("重新推送工厂：{}", JSONUtil.toJsonStr(factoryNodePushEntity)); + HttpRequest post = HttpUtil.createPost(factoryNodePushEntity.getSendUrl()); + post.header("ClientId", "mt.ht"); + post.header("OperationCode", factoryNodePushEntity.getOperationCode()); + post.body(factoryNodePushEntity.getContent()); + HttpResponse execute = post.execute(); + String resBody = execute.body(); + log.info("重新推送工厂结果：{}", resBody); + JSONObject entries = JSONUtil.parseObj(resBody); + int resultCode = entries.getInt("Result"); + // 存入日志表 + factoryNodePushEntity.setSendStatus(Convert.toStr(resultCode)); + baseMapper.updateById(factoryNodePushEntity); + return Boolean.TRUE; + } + } } + return Boolean.FALSE; } } From a03d31aa72680fcd0a196bc9b601b7232b635fbf Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 25 Jul 2024 18:33:08 +0800 Subject: [PATCH 04/14] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/mengtian/mapper/FactoryNodePushMapper.xml | 8 +++++--- .../mengtian/service/impl/FactoryNodePushServiceImpl.java | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml index 9be1d82ca..f2a76d342 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml @@ -4,9 +4,11 @@ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java index ae1927d17..8047d8bc1 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java @@ -3,6 +3,7 @@ package com.logpm.factorydata.mengtian.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; @@ -39,6 +40,12 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl pageNodePush(FactoryNodePushEntity vo, Query query) { IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class); + if(StrUtil.isNotEmpty(vo.getType())){ + queryWrapper.eq("type", vo.getType()); + } + if(StrUtil.isNotEmpty(vo.getSendStatus())){ + queryWrapper.eq("send_status", vo.getSendStatus()); + } List deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper); return page.setRecords(deliveryTrainPage); } From 4e19254f3b2588794a276cc1f3bfa25d47433040 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 25 Jul 2024 18:58:23 +0800 Subject: [PATCH 05/14] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8C=85=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99=202.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9=E7=89=A9=E6=96=99=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=93=81=E7=B1=BB=203.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=8D=95=E7=9A=84=E5=8C=85=E6=9D=A1=E6=89=93?= =?UTF-8?q?=E5=8D=B0=204.=E4=BF=AE=E6=94=B9=E6=A2=A6=E5=A4=A9=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E7=9A=84=E6=95=B0=E6=8D=AE=E5=9B=9E=E4=BC=A0=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/utils/CommonUtil.java | 11 + .../springblade/common/utils/QRCodeUtil.java | 7 +- .../entity/BasicdataCodeRecordEntity.java | 1 + .../BasicdataFactoryCategoryEntity.java | 3 + .../warehouse/vo/WarehouseTrayQRCode.java | 2 + .../mapper/BasicdataCodeRecordMapper.java | 2 +- .../mapper/BasicdataCodeRecordMapper.xml | 1 + .../mapper/BasicdataFactoryCategoryMapper.xml | 25 +- .../basicdata/mapper/BasicdataTrayMapper.xml | 2 +- .../service/IBasicdataCodeRecordService.java | 2 +- .../service/IBasicdataCodeService.java | 2 +- .../impl/BasicdataCodeRecordServiceImpl.java | 4 +- .../impl/BasicdataCodeServiceImpl.java | 415 ++++++------------ .../impl/BasicdataTrayServiceImpl.java | 1 + .../impl/MtFactoryDataServiceImpl.java | 2 +- .../java/com/logpm/factory/TestService.java | 55 ++- .../TrunklineAdvanceDetailServiceImpl.java | 102 +++-- 17 files changed, 279 insertions(+), 358 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index ca8a9aca4..b8947397b 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -229,6 +229,15 @@ public class CommonUtil { return preMonth; } + /** + * 数字前面自动补零 + * @param number 数字 + * @return + */ + public static String geFourNumberByString(String number,int num){ + return geFourNumber(Long.parseLong(number),num); + } + /** * 数字前面自动补零 * @param number 数字 @@ -259,6 +268,8 @@ public class CommonUtil { } + + public static Date getEndByDateStr(String endDate) { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java index 3b9fea2b3..454d59cd9 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java @@ -105,6 +105,11 @@ public class QRCodeUtil { return null; } + /** + * 条形码 + * @param content + * @return + */ public static String createCodeToFileType(String content) { try { //getResource("/")等同于到resource文件夹下 @@ -167,7 +172,7 @@ public class QRCodeUtil { hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); //EncodeHintType.MARGIN：设置二维码边距，单位像素，值越小，二维码距离四周越近 - hints.put(EncodeHintType.MARGIN, 1); + hints.put(EncodeHintType.MARGIN, 0); MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, CODE_WIDTH, CODE_HEIGHT, hints); diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCodeRecordEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCodeRecordEntity.java index e46a15b4c..02eabab71 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCodeRecordEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCodeRecordEntity.java @@ -18,6 +18,7 @@ public class BasicdataCodeRecordEntity extends TenantEntity { private String warehouseCode; private String year; private String month; + private String day; private Integer num; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java index f757fc7f3..73561109f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java @@ -64,6 +64,9 @@ public class BasicdataFactoryCategoryEntity extends TenantEntity { @ApiModelProperty(value = "品牌id") private Long brandId; + @ApiModelProperty(value = "结算类型 1 收入 2 成本") + private Integer type; + diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayQRCode.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayQRCode.java index f29a7c69a..6709f7ba3 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayQRCode.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayQRCode.java @@ -14,6 +14,8 @@ public class WarehouseTrayQRCode { private String trayCode; + private String palletName; + public Map toMap() throws IllegalAccessException { Map map = new HashMap<>(); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java index 79af10590..69d362927 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java @@ -7,5 +7,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface BasicdataCodeRecordMapper extends BaseMapper { - BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(@Param("type") Integer type, @Param("warehouseCode") String warehouseCode, @Param("year") String year, @Param("month") String month); + BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(@Param("type") Integer type, @Param("warehouseCode") String warehouseCode, @Param("year") String year, @Param("month") String month,@Param("day") String day); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml index c830f2a2e..67783327a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml @@ -10,6 +10,7 @@ and warehouse_code = #{warehouseCode} and `year` = #{year} and `month` = #{month} + and `day` = #{day} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml index 7c950352a..9e7095f0c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml @@ -7,8 +7,23 @@ from logpm_basicdata_factory_category where 1=1 and is_deleted = 0 - - and brand = #{param.brand} + + and type = #{param.type} + + + and category = #{param.category} + + + + and firsts = #{param.firsts} + + + + and seconds = #{param.seconds} + + + + and thirds = #{param.thirds} @@ -18,6 +33,12 @@ where 1=1 and brand = #{param.brand} and is_deleted = 0 + + and type = #{param.type} + + + and category = #{param.category} + and (firsts is null or firsts = '') diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 3ff0cfc9a..6053b60ab 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -414,7 +414,7 @@ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java index 3cbf815e6..3544353e7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java @@ -4,5 +4,5 @@ import com.logpm.basicdata.entity.BasicdataCodeRecordEntity; import org.springblade.core.mp.base.BaseService; public interface IBasicdataCodeRecordService extends BaseService { - BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month); + BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java index e9637e558..b7534a05d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeService.java @@ -6,5 +6,5 @@ public interface IBasicdataCodeService { String getCodeByType(Integer type,String warehouseCode,String orderCode); - List getBatchPackageCodeByType(String warehouseCode, String orderCode, Integer num); + List getBatchPackageCodeByType(String warehouseCode, String orderCode, Integer num) ; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java index e1fef9497..f35f9d17e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class BasicdataCodeRecordServiceImpl extends BaseServiceImpl implements IBasicdataCodeRecordService { @Override - public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month) { - return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month); + public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day) { + return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month,day); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index cd31c6646..6fe073e11 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -7,6 +7,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.service.IBasicdataCodeRecordService; import com.logpm.basicdata.service.IBasicdataCodeService; import com.logpm.basicdata.service.IBasicdataWarehouseService; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.CodeDesEnum; @@ -38,15 +39,16 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { /** * 根据类型生成编号 + * * @param type * @return */ @Override - public String getCodeByType(Integer type,String warehouseCode,String orderCode) { + public String getCodeByType(Integer type, String warehouseCode, String orderCode) { String code = null; - switch (type){ + switch (type) { case CodeNumConstant.WAYBILL: - code = getWayBillNo(type,warehouseCode); + code = getWayBillNo(type, warehouseCode); break; // case CodeNumConstant.ORDER: // break; @@ -58,11 +60,11 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { // case CodeNumConstant.LOCATION: // break; case CodeNumConstant.TRAYS: - code = generateTraysCode(type,warehouseCode); + code = generateTraysCode(type, warehouseCode); break; case CodeNumConstant.PACKAGE: //包件号 - code = generatePackageCode(type,warehouseCode,orderCode); + code = generatePackageCode(type, warehouseCode, orderCode); break; // case CodeNumConstant.SHELF: // break; @@ -70,22 +72,22 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { // code = generateDeliveryCustomOrder(type,warehouseCode); // break; case CodeNumConstant.ABNORMAL_ORDER: - code = generateExOrderCode(type,warehouseCode,orderCode); + code = generateExOrderCode(type, warehouseCode, orderCode); break; case CodeNumConstant.TRUNKLINEBILLLADING: - code = generateTrunklineBillladingCode(type,warehouseCode,orderCode); + code = generateTrunklineBillladingCode(type, warehouseCode, orderCode); break; case CodeNumConstant.TRUNKLINE_CARS_LOAD: - code = generateTrunklineCarsLineCode(type,warehouseCode,orderCode); + code = generateTrunklineCarsLineCode(type, warehouseCode, orderCode); break; case CodeNumConstant.TRUNKLINE_TRIPARTITE_LOAD: - code = generateTrunklineTripartiteLoadCode(type,warehouseCode,orderCode); + code = generateTrunklineTripartiteLoadCode(type, warehouseCode, orderCode); break; case CodeNumConstant.TRUNKLINE_LOAD_SIGN: - code = generateTrunklineLoadSignCode(type,warehouseCode,orderCode); + code = generateTrunklineLoadSignCode(type, warehouseCode, orderCode); break; case CodeNumConstant.BALANCE_ORDER: - code = generateBalanceOrderCode(type,warehouseCode,orderCode); + code = generateBalanceOrderCode(type, warehouseCode, orderCode); break; default: log.info("##################getCodeByType: 暂不支持的编码类型 type={}", CodeDesEnum.getMes(type)); @@ -94,36 +96,23 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { } private String generateBalanceOrderCode(Integer type, String warehouseCode, String orderCode) { - if(!"BALANCE_ORDER".equals(warehouseCode)){ - log.warn("#########generateBalanceOrderCode: 仓库编码有误 warehouseCode={}",warehouseCode); + if (!"BALANCE_ORDER".equals(warehouseCode)) { + log.warn("#########generateBalanceOrderCode: 仓库编码有误 warehouseCode={}", warehouseCode); return null; } + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); + return null; + } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(CodeNumConstant.PACKAGE,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(CodeNumConstant.PACKAGE); - basicdataCodeRecordEntity.setWarehouseName("全仓"); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer oldNum = basicdataCodeRecordEntity.getNum(); oldNum = oldNum + 1; - String packageCode = "JSD" + year + CommonUtil.geFourNumber(month.longValue(),2) + CommonUtil.geFourNumber(oldNum.longValue(),6); + String packageCode = "JSD" + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumber(oldNum.longValue(), 6); basicdataCodeRecordEntity.setNum(oldNum); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); @@ -131,52 +120,38 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { } @Override - public List getBatchPackageCodeByType(String warehouseCode, String orderCode, Integer num) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############getBatchPackageCodeByType: 仓库编码为空warehouseCode={}",warehouseCode); + public List getBatchPackageCodeByType(String warehouseCode, String orderCode, Integer num) { + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############getBatchPackageCodeByType: 仓库编码为空warehouseCode={}", warehouseCode); return null; } - if(!StringUtil.hasLength(orderCode)){ - log.warn("############getBatchPackageCodeByType: 订单号为空orderCode={}",orderCode); + if (!StringUtil.hasLength(orderCode)) { + log.warn("############getBatchPackageCodeByType: 订单号为空orderCode={}", orderCode); return null; } - - //包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引 - String haxCodeByLong = CommonUtil.getHaxCodeByLong(orderCode, 8); - BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } + //包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引CodeNumConstant.PACKAGE + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(CodeDesEnum.PACKAGE.getCodeNum(), basicdataWarehouseEntity); - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(CodeNumConstant.PACKAGE,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(CodeNumConstant.PACKAGE); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer oldNum = basicdataCodeRecordEntity.getNum(); List packageCodes = new ArrayList<>(); + int year =Integer.parseInt(basicdataCodeRecordEntity.getYear())%100; for (int i = 0; i < num; i++) { + //获取时间戳后面的时分秒 + try { + Thread.sleep(1); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + String time = new String(System.currentTimeMillis() + ""); + time=time.substring(4); oldNum = oldNum + 1; - String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumber(month.longValue(),2) + haxCodeByLong + CommonUtil.geFourNumber(oldNum.longValue(),6); + String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + basicdataCodeRecordEntity.getDay() + time; packageCodes.add(packageCode); } basicdataCodeRecordEntity.setNum(oldNum); @@ -187,328 +162,231 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { private String generateTrunklineLoadSignCode(Integer type, String warehouseCode, String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTrunklineLoadSignCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTrunklineLoadSignCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } + + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); + + + Integer inrc = basicdataCodeRecordEntity.getNum() + 1; + + basicdataCodeRecordEntity.setNum(inrc); + basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); + + return warehouseCode + "ZFQS" + basicdataCodeRecordEntity.getYear() + basicdataCodeRecordEntity.getMonth() + CommonUtil.geFourNumber(inrc.longValue(), 5); + + } + + /** + * 获取编码生成记录 + * + * @param type + * @param basicdataWarehouseEntity + * @return + */ + private BasicdataCodeRecordEntity getBasicdataCodeRecordEntity(Integer type, BasicdataWarehouseEntity basicdataWarehouseEntity) { Calendar calendar = Calendar.getInstance(); //获取年份 Integer year = calendar.get(Calendar.YEAR); // 获取月份（注意月份从0开始计数） Integer month = calendar.get(Calendar.MONTH) + 1; + Integer day = calendar.get(Calendar.DAY_OF_MONTH); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type, basicdataWarehouseEntity.getWarehouseCode(), year + "", month + "", day + ""); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ + if (Objects.isNull(basicdataCodeRecordEntity)) { basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); basicdataCodeRecordEntity.setCodeType(type); basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); + basicdataCodeRecordEntity.setWarehouseCode(basicdataWarehouseEntity.getWarehouseCode()); + basicdataCodeRecordEntity.setYear(year + ""); + basicdataCodeRecordEntity.setMonth(month + ""); + basicdataCodeRecordEntity.setDay(day + ""); basicdataCodeRecordEntity.setNum(0); basicdataCodeRecordService.save(basicdataCodeRecordEntity); } - Integer inrc = basicdataCodeRecordEntity.getNum() + 1; - - basicdataCodeRecordEntity.setNum(inrc); - basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - - return warehouseCode+"ZFQS"+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(), 5); - + return basicdataCodeRecordEntity; } private String generateTrunklineTripartiteLoadCode(Integer type, String warehouseCode, String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } String f = "ZZ"; BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return warehouseCode+f+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(),5); + return warehouseCode + f + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumber(inrc.longValue(), 5); } private String generateTrunklineCarsLineCode(Integer type, String warehouseCode, String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } String f = ""; - if("1".equals(orderCode)){ + if ("1".equals(orderCode)) { f = "GX"; - }else if ("2".equals(orderCode)){ + } else if ("2".equals(orderCode)) { f = "ZX"; - }else if ("3".equals(orderCode)){ + } else if ("3".equals(orderCode)) { f = "ZC"; - }else { + } else { return null; } BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return warehouseCode+f+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(), 5); + return warehouseCode + f + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumber(inrc.longValue(), 5); } private String generateTrunklineBillladingCode(Integer type, String warehouseCode, String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return warehouseCode+"TH"+year+CommonUtil.geFourNumber(month.longValue(),2)+CommonUtil.geFourNumber(inrc.longValue(),5); + return warehouseCode + "TH" + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumber(inrc.longValue(), 5); } private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } //HTEX+仓库code+年月日+（仓库当天的数量+1） BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - // 获取日期 - Integer day = calendar.get(Calendar.DAY_OF_MONTH); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return "HTEX"+warehouseCode+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(day.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(),5); + return "HTEX" + warehouseCode + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getDay(), 2) + CommonUtil.geFourNumber(inrc.longValue(), 5); } private String generateTraysCode(Integer type, String warehouseCode) { BasicTenantCodeEntity basicTenantCode = tenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.TRAY_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue()); - if(Objects.isNull(basicTenantCode)){ - log.warn("############generateTraysCode: 租户信息不存在basicTenantCode={}",basicTenantCode); + if (Objects.isNull(basicTenantCode)) { + log.warn("############generateTraysCode: 租户信息不存在basicTenantCode={}", basicTenantCode); return null; } String desName = basicTenantCode.getDesName(); String code = basicTenantCode.getCode(); - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } //托盘 HT+仓库拼音+ 年月 +【当前仓库总数+1（五位数 不足补零）】 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } String abbreviation = basicdataWarehouseEntity.getAbbreviation(); - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(100000); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - String trayCode = code+ warehouseCode + (year%100) + inrc; + String trayCode = code + warehouseCode + (Integer.parseInt(basicdataCodeRecordEntity.getYear()) % 100) + inrc; String trayName = desName + abbreviation + inrc; - return trayCode+"&&"+trayName; + return trayCode + "&&" + trayName; } /** * 生成仓库对应的运单号 + * * @param type * @param warehouseCode * @return */ private String getWayBillNo(Integer type, String warehouseCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############getWayBillNo: 仓库编码为空warehouseCode={}",warehouseCode); + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############getWayBillNo: 仓库编码为空warehouseCode={}", warehouseCode); return null; } BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return warehouseCode+year+CommonUtil.geFourNumber(month.longValue(),2)+CommonUtil.geFourNumber(inrc.longValue(),5); + return warehouseCode + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + CommonUtil.geFourNumber(inrc.longValue(), 5); } @@ -521,22 +399,23 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { String tenantCode = basicTenantCodeClient.shelfCode(tenantId, String.valueOf(type));//租户编码 //获得年月日短字符串 String dateShort = CommonUtil.dateToStringShort(new Date()); - String key = tenantId + ":" + warehouseCode + ":" + des+":"+dateShort; + String key = tenantId + ":" + warehouseCode + ":" + des + ":" + dateShort; //获得序号 Long incr = bladeRedis.incr(key); - if(1 == incr){ + if (1 == incr) { //如果为1就是刚刚才建立，给他一个过期时间 - bladeRedis.expireAt(key,CommonUtil.getDayEnd()); + bladeRedis.expireAt(key, CommonUtil.getDayEnd()); } - return tenantCode+warehouseCode+dateShort+CommonUtil.geFourNumber(incr,5); + return tenantCode + warehouseCode + dateShort + CommonUtil.geFourNumber(incr, 5); } /** * 生成配送车次号编码 + * * @param type */ - private String generateDeliveryTrainNumber(Integer type,String warehouseCode) { + private String generateDeliveryTrainNumber(Integer type, String warehouseCode) { String des = CodeDesEnum.getMes(type);//摘要 String tenantId = AuthUtil.getTenantId();//租户号 // String tenantId = "627683";//租户号 @@ -545,25 +424,25 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { String dateShort = CommonUtil.dateToStringShort(new Date()); //redis的key - String key = tenantId + ":" + warehouseCode + ":" + des+":"+dateShort; + String key = tenantId + ":" + warehouseCode + ":" + des + ":" + dateShort; //获得序号 Long incr = bladeRedis.incr(key); - if(1 == incr){ + if (1 == incr) { //如果为1就是刚刚才建立，给他一个过期时间 - bladeRedis.expireAt(key,CommonUtil.getDayEnd()); + bladeRedis.expireAt(key, CommonUtil.getDayEnd()); } - return warehouseCode + des + dateShort + CommonUtil.geFourNumber(incr,5); + return warehouseCode + des + dateShort + CommonUtil.geFourNumber(incr, 5); } - private String generatePackageCode(Integer type,String warehouseCode,String orderCode) { - if(!StringUtil.hasLength(warehouseCode)){ - log.warn("############generatePackageCode: 仓库编码为空warehouseCode={}",warehouseCode); + private String generatePackageCode(Integer type, String warehouseCode, String orderCode) { + if (!StringUtil.hasLength(warehouseCode)) { + log.warn("############generatePackageCode: 仓库编码为空warehouseCode={}", warehouseCode); return null; } - if(!StringUtil.hasLength(orderCode)){ - log.warn("############generatePackageCode: 订单号为空orderCode={}",orderCode); + if (!StringUtil.hasLength(orderCode)) { + log.warn("############generatePackageCode: 订单号为空orderCode={}", orderCode); return null; } @@ -571,37 +450,17 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { String haxCodeByLong = CommonUtil.getHaxCodeByLong(orderCode, 8); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}", warehouseCode); return null; } - Calendar calendar = Calendar.getInstance(); - //获取年份 - Integer year = calendar.get(Calendar.YEAR); - - // 获取月份（注意月份从0开始计数） - Integer month = calendar.get(Calendar.MONTH) + 1; - - - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); - - if(Objects.isNull(basicdataCodeRecordEntity)){ - basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); - basicdataCodeRecordEntity.setCodeType(type); - basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId()); - basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName()); - basicdataCodeRecordEntity.setWarehouseCode(warehouseCode); - basicdataCodeRecordEntity.setYear(year+""); - basicdataCodeRecordEntity.setMonth(month+""); - basicdataCodeRecordEntity.setNum(0); - basicdataCodeRecordService.save(basicdataCodeRecordEntity); - } + BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(type, basicdataWarehouseEntity); Integer inrc = basicdataCodeRecordEntity.getNum() + 1; basicdataCodeRecordEntity.setNum(inrc); basicdataCodeRecordService.updateById(basicdataCodeRecordEntity); - return "HT" + warehouseCode + year + CommonUtil.geFourNumber(month.longValue(),2) + haxCodeByLong + CommonUtil.geFourNumber(inrc.longValue(),6); + return "HT" + warehouseCode + basicdataCodeRecordEntity.getYear() + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + haxCodeByLong + CommonUtil.geFourNumber(inrc.longValue(), 6); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index d43c25166..50d9c6329 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -228,6 +228,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(trayQRCode), Map.class); String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); map.put("qrCode", QRCodeUtil.getEmpAutograph(filename)); + map.put("palletName", trayQRCode.getPalletName()); String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode()); map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName)); map.put("tenant","汇通物流"); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java index ac084a41c..6176a9ded 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java @@ -715,7 +715,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { Integer PUSH_STATUS_FAIL = 2; JSONObject jsonObject = JSONObject.parseObject(result); - if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("code")) { + if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) { mtOrderLogEntity.setPushStatus(PUSH_STATUS_FAIL); } else { mtOrderLogEntity.setPushStatus(PUSH_STATUS_SUCCESS); diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index e42abf179..d1a15041a 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -62,6 +62,7 @@ import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.test.BladeBootTest; import org.springblade.core.test.BladeSpringExtension; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.resource.feign.IOssClient; @@ -76,6 +77,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.crypto.spec.PSource; +import javax.xml.crypto.Data; import java.io.*; import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; @@ -1100,34 +1102,43 @@ public class TestService { public static void main(String[] args) throws IOException, InterruptedException { + Date data1 = DateUtil.parse("2024-07-23 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); + Date data2 = DateUtil.parse("2024-07-24 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); - File file = new File("D:\\新建文件夹\\444.txt"); + System.out.println(data1.getTime()); + System.out.println(data2.getTime()); - BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); - List list = new ArrayList<>(); - while (bufferedReader.ready()) { - String line = bufferedReader.readLine(); - if(!list.contains(line)){ - list.add(line); - System.out.println(line); - } - } - // 获取token - String s = buildToken(); - - - for (String string : list) { - Thread.sleep(500); - System.out.println(string); - String url = "https://timsapi.oppein.com/tims_odata_api/api/odata/PackageFeedbackRecord"; - HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", s).body(string).execute(); - String result = httpResponse.body(); - System.out.println(result); - } +// File file = new File("D:\\新建文件夹\\444.txt"); +// +// BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); +// +// List list = new ArrayList<>(); +// +// while (bufferedReader.ready()) { +// String line = bufferedReader.readLine(); +// if(!list.contains(line)){ +// list.add(line); +// System.out.println(line); +// } +// } +// +// // 获取token +// String s = buildToken(); +// +// +// +// for (String string : list) { +// Thread.sleep(500); +// System.out.println(string); +// String url = "https://timsapi.oppein.com/tims_odata_api/api/odata/PackageFeedbackRecord"; +// HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", s).body(string).execute(); +// String result = httpResponse.body(); +// System.out.println(result); +// } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 6e72ba080..8bc0cc346 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -53,16 +53,16 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_package_code",orderPackageCode) - .eq("warehouse_id",warehouseId) - .eq("is_deleted",0); + queryWrapper.eq("order_package_code", orderPackageCode) + .eq("warehouse_id", warehouseId) + .eq("is_deleted", 0); return baseMapper.selectOne(queryWrapper); } @@ -93,7 +93,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl pageList = baseMapper.advanceDetailPageList(page,advanceDetailDTO); + IPage pageList = baseMapper.advanceDetailPageList(page, advanceDetailDTO); return pageList; } @@ -101,7 +101,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_package_code",orderPackageCode); + queryWrapper.eq("order_package_code", orderPackageCode); return baseMapper.selectOne(queryWrapper); } @@ -113,10 +113,10 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_package_code",orderPackageCode) - .eq("order_code",orderCode) - .eq("train_number",trainNumber) - .eq("service_num",serviceNum); + queryWrapper.eq("order_package_code", orderPackageCode) + .eq("order_code", orderCode) + .eq("train_number", trainNumber) + .eq("service_num", serviceNum); return baseMapper.selectOne(queryWrapper); } @@ -129,6 +129,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl params) throws Exception { OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO(); List data = new ArrayList<>(); + List values = new ArrayList<>(); BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_10.getValue()); if (ObjectUtil.isEmpty(template)) { throw new ServiceException("模板内容未找到"); @@ -140,14 +141,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl Map map = BeanUtil.beanToMap(vo); - if(!Objects.isNull(advanceDetailEntity)){ - map.put("id",advanceDetailEntity.getId()); + if (!Objects.isNull(advanceDetailEntity)) { + map.put("id", advanceDetailEntity.getId()); } String filename = QRCodeUtil.createCodeToFile(vo.getQrCode()); map.put("img", QRCodeUtil.getEmpAutograph(filename)); @@ -203,9 +204,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findListByAdvanceId(Long advanceId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("advance_id",advanceId); + queryWrapper.eq("advance_id", advanceId); return baseMapper.selectList(queryWrapper); } @@ -225,8 +231,8 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("advance_id",advanceId) - .eq("is_deleted",0); + queryWrapper.eq("advance_id", advanceId) + .eq("is_deleted", 0); baseMapper.delete(queryWrapper); } @@ -241,12 +247,12 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl strings = baseMapper.findOrderPackageCodesByAdvanceId(advanceId); - if(0 == strings.size()){ + if (0 == strings.size()) { //删除暂存单 List advanceIds = new ArrayList<>(); advanceIds.add(advanceId); advanceMapper.deletedAdvance(advanceIds); - }else{ + } else { //数量减一 advanceMapper.subTotalNumByAdvanceId(advanceId); } @@ -263,7 +269,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findPackageCodeByCodes(Set orderPackageCodes) { + @Override + public Map findPackageCodeByCodes(Set orderPackageCodes) { List> packageCodeByCodes = baseMapper.findPackageCodeByCodes(orderPackageCodes); - if(CollUtil.isNotEmpty(packageCodeByCodes)){ + if (CollUtil.isNotEmpty(packageCodeByCodes)) { return packageCodeByCodes.stream().collect(Collectors.toMap(map -> map.get("code"), map -> String.valueOf(map.get("id")))); } return null; - } + } @Override public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) { //判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值 - if(StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())){ + if (StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) { return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值"); } @@ -306,7 +312,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl pageList = baseMapper.findOrderDetails(page,orderDetailsDTO); + IPage pageList = baseMapper.findOrderDetails(page, orderDetailsDTO); return R.data(pageList); } @@ -327,7 +333,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl Date: Fri, 26 Jul 2024 10:06:21 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B8=82=E9=85=8D?= =?UTF-8?q?=E5=B7=B2=E9=A2=84=E7=BA=A6=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 67828271f..0459b20e3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -37,6 +37,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; @@ -385,10 +386,13 @@ public class DistributionStockArticleController extends BladeController { List entityList = distributionStockArticleDTO.getEntityList(); if (!realStockArticleList.isEmpty()) { - boolean flag = realStockArticleList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus())); - if (flag) { - String orderCode = realStockArticleList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(",")); - return R.fail(orderCode + "存在预约信息"); + boolean isCheck = realStockArticleList.stream().allMatch(r -> DistributionTypeConstant.shipie.getValue().equals(r.getTypeService())); + if (!isCheck){ + boolean flag = realStockArticleList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus())); + if (flag) { + String orderCode = realStockArticleList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(",")); + return R.fail(orderCode + "存在预约信息"); + } } } From 546e480d899d3c00c139da8f49b13973bf22a941 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jul 2024 11:04:08 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=A3=85=E8=BD=A6BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 606bd204a..c59cdecbb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -674,16 +674,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) .eq(DistributionLoadscanAbnormalEntity::getPackageId, parcelList.getId()) + .notIn(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.daishenhe.getValue()) ); if (!abnormalEntities.isEmpty()) { //判断异常是否属于自身 boolean flag = abnormalEntities.stream().allMatch(a -> !distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId())); if (flag) { - //该异常属于其他车次 - String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); - log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}", distributionDeliveryListEntity.getTrainNumber(), collect); - return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); + //校验是否还存在装车 如若存在则是无效装车，如若不存在则有效 + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) + .eq(DistributionLoadscanEntity::getWarehouseId, myCurrentWarehouse.getId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + if (!Func.isEmpty(loadscanEntityList)) { + //该异常属于其他车次 + String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); + log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}", distributionDeliveryListEntity.getTrainNumber(), collect); + return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); + } } else { //这里需要判定文员是否对该异常进行驳回操作 List collect = abnormalEntities.stream().filter(f -> distributionDeliveryListEntity.getId().equals(f.getDeliveryListId()) && distrilbutionloadingscanDTO.getReservationId().equals(f.getReservationId())).collect(Collectors.toList()); From e2f4b6b814b6affa96ad34a76e890dafa5626692 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jul 2024 11:20:48 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E4=BD=8DBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockArticleController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 0459b20e3..9493e7933 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -419,8 +419,8 @@ public class DistributionStockArticleController extends BladeController { throw new RuntimeException("客户信息错误!!!"); } newStockArticle.setMallName(mallName); - newStockArticle.setMallId(client.getId()); - newStockArticle.setMallCode(client.getClientCode()); + stockArticleEntity.setMallId(client.getId()); + stockArticleEntity.setMallCode(client.getClientCode()); newStockArticle.setConsigneeUnit(consigneeUnit); } String content = oldStockArticle.compareCustomerInfo(newStockArticle); From 2e490ac9cbf79c5f5da8a6184d606f53c3f4c899 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 11:34:16 +0800 Subject: [PATCH 09/14] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factorydata/mengtian/mq/NodeDataPushListener.java | 2 ++ .../factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java | 4 ++++ .../factorydata/mengtian/vo/SignForConfirmPackageVO.java | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index e947686d6..cf5c132af 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java @@ -160,6 +160,7 @@ public class NodeDataPushListener { mtPushDataDTOS1.stream().map(mtPushDataDTO -> { return CentralStkInConfirmOrderVO.builder() .orderCode(mtPushDataDTO.getOrderCode()) + .outWarehouseType(mtPushDataDTO.getOutWarehouseType()) .packageVOS( content.stream() .filter(pushData -> StrUtil.equals(pushData.getOrderCode(), mtPushDataDTO.getOrderCode())) @@ -268,6 +269,7 @@ public class NodeDataPushListener { pushData -> { return SignForConfirmPackageVO.builder() .orderCode(pushData.getOrderCode()) + .outWarehouseType(mtPushDataDTOMap.get(pushData.getOrderCode()).getOutWarehouseType()) .packageCode(pushData.getPackageCode()) .operatingTime(operatorTime) .warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode()) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java index 1ca739414..b8cb451fc 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/CentralStkInConfirmOrderVO.java @@ -24,6 +24,10 @@ public class CentralStkInConfirmOrderVO implements Serializable { @JsonProperty("订单号") private String orderCode; + @ApiModelProperty("工厂出库方式") + @JsonProperty("工厂出库方式") + private String outWarehouseType; + @ApiModelProperty("包件列表") @JsonProperty("包件列表") private List packageVOS; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java index 9cf13170e..1525311dd 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForConfirmPackageVO.java @@ -27,6 +27,10 @@ public class SignForConfirmPackageVO implements Serializable { @JsonProperty("订单编号") private String orderCode; + @ApiModelProperty("工厂出库方式") + @JsonProperty("工厂出库方式") + private String outWarehouseType; + @ApiModelProperty("包条码") @JsonProperty("包条码") private String packageCode; From ff9a50732b4d18395f7a80c192fcb2a8ba1cd885 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 11:59:01 +0800 Subject: [PATCH 10/14] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/mengtian/entity/FactoryNodePushEntity.java | 5 +++++ .../logpm/factorydata/mengtian/mq/NodeDataPushListener.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java index ba295edb2..51de31170 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java @@ -55,6 +55,11 @@ public class FactoryNodePushEntity extends BaseEntity { */ @ApiModelProperty(value = "发货单编号") private String senderCode; + /** + * 作业仓库 + */ + @ApiModelProperty(value = "作业仓库") + private String warehouse; /** * 订单号 */ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index cf5c132af..194793e1c 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java @@ -132,6 +132,7 @@ public class NodeDataPushListener { throw new RuntimeException(e); } FactoryNodePushEntity entity = FactoryNodePushEntity.builder() + .warehouse(warehouse) .senderCode(centralStkInVO.getSenderCode()) .orderCode(centralStkInVO.getOrderCode()) .packageCode(centralStkInVO.getPackageCode()) @@ -190,6 +191,7 @@ public class NodeDataPushListener { return pushData.getPackageCode(); }).collect(Collectors.toSet()), ","); FactoryNodePushEntity entity = FactoryNodePushEntity.builder() + .warehouse(warehouse) .senderCode(senderCode) .orderCode(orderCodes) .packageCode(packageCodes) @@ -239,6 +241,7 @@ public class NodeDataPushListener { return pushData.getSenderCode(); }).collect(Collectors.toSet()), ","); FactoryNodePushEntity entity = FactoryNodePushEntity.builder() + .warehouse(warehouse) .senderCode(signForVO.getSenderCode()) .orderCode(signForVO.getOrderCode()) .packageCode(signForVO.getPackageCode()) @@ -297,6 +300,7 @@ public class NodeDataPushListener { return pushData.getSenderCode(); }).collect(Collectors.toSet()), ","); FactoryNodePushEntity entity = FactoryNodePushEntity.builder() + .warehouse(warehouse) .senderCode(senderCodes) .orderCode(orderCodes) .packageCode(packageCodes) From 7d9d7ff2dc6df4036c60e62c3c0145eb9e37c6ad Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jul 2024 14:41:28 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=8E=A8=E9=80=81BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 80ec6dd2f..9f65286b7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -893,7 +893,7 @@ IFNULL(SUM(ldbls.quantity),0) AS actual_plan, IFNULL(SUM(ldbls.quantity),0) AS delivery, IFNULL(SUM(ldbls.quantity),0) AS sign, - (SELECT GROUP_CONCAT(site) FROM logpm_distribution_print WHERE bill_lading_id = ldbl.id GROUP BY bill_lading_id) AS image + IFNULL((SELECT GROUP_CONCAT(site) FROM logpm_distribution_print WHERE bill_lading_id = ldbl.id GROUP BY bill_lading_id),'无图片信息') AS image FROM logpm_distrilbution_bill_lading AS ldbl LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbls.bill_lading_id = ldbl.id AND ldbls.is_deleted = 0 From 3af3e70cd800ef381e37b5a29f60d275ebb849c3 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 14:52:12 +0800 Subject: [PATCH 12/14] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml index f2a76d342..762f7c0da 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml @@ -9,6 +9,7 @@ ${ew.sqlSegment} + order by create_time desc From bfa69def8c13d0bfb3e2f2276568669bb3d11320 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 15:25:21 +0800 Subject: [PATCH 13/14] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mengtian/controller/OrderController.java | 4 +-- .../mengtian/query/FactoryNodePushQuery.java | 32 +++++++++++++++++++ .../service/FactoryNodePushService.java | 4 +-- .../impl/FactoryNodePushServiceImpl.java | 16 ++++++++-- .../factorydata/mengtian/util/QueryUtil.java | 28 ++++++++++++++++ 5 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java index eaba9ef43..438b181ed 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java @@ -4,13 +4,13 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import com.logpm.factorydata.mengtian.service.FactoryNodePushService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.factorydata.FactoryDataConstants; -import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -54,7 +54,7 @@ public class OrderController { @GetMapping @ApiOperationSupport(order = 2) @ApiOperation(value = "推送记录", notes = "推送记录") - public R> pageNodePush(FactoryNodePushEntity vo, Query query) { + public R> pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) { IPage pages = nodePushService.pageNodePush(vo, query); return R.data(pages); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java new file mode 100644 index 000000000..4b4a81a98 --- /dev/null +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java @@ -0,0 +1,32 @@ +package com.logpm.factorydata.mengtian.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.Query; + +import java.util.Date; + +/** + * 节点数据推送成功数据查询对象 query + * + * @author zhaoqiaobo + * @create 2024-03-13 14:21 + */ +@ApiModel(value = "节点数据推送成功数据查询对象", description = "节点数据推送成功数据查询对象") +@Data +public class FactoryNodePushQuery extends Query { + + @ApiModelProperty(value = "创建时间开始（范围）", position = 1) + private Date startCreateTime; + + @ApiModelProperty(value = "创建时间结束（范围）", position = 2) + private Date endCreateTime; + + @ApiModelProperty(value = "修改时间开始（范围）", position = 3) + private Date startUpdateTime; + + @ApiModelProperty(value = "修改时间结束（范围）", position = 4) + private Date endUpdateTime; + +} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java index eccc14c7a..1cc101fbf 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java @@ -2,8 +2,8 @@ package com.logpm.factorydata.mengtian.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.support.Query; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; **/ public interface FactoryNodePushService extends BaseService { - IPage pageNodePush(FactoryNodePushEntity vo, Query query); + IPage pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query); Boolean cancel(List id); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java index 8047d8bc1..444acd26d 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; import com.logpm.factorydata.mengtian.mapper.FactoryNodePushMapper; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import com.logpm.factorydata.mengtian.service.FactoryNodePushService; import com.logpm.factorydata.mengtian.util.QueryUtil; import lombok.AllArgsConstructor; @@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; import org.springframework.stereotype.Service; import java.util.List; @@ -37,7 +37,7 @@ import java.util.List; public class FactoryNodePushServiceImpl extends BaseServiceImpl implements FactoryNodePushService { @Override - public IPage pageNodePush(FactoryNodePushEntity vo, Query query) { + public IPage pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) { IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class); if(StrUtil.isNotEmpty(vo.getType())){ @@ -46,10 +46,22 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper); return page.setRecords(deliveryTrainPage); } + private void customQuery(FactoryNodePushQuery query, QueryWrapper queryWrapper) { + // 配送时间开始 + QueryUtil.timeGe("create_time", query.getStartCreateTime(), queryWrapper); + // 配送时间结束 + QueryUtil.timeLe("create_time", query.getEndCreateTime(), queryWrapper); + // 配送时间开始 + QueryUtil.timeGe("update_time", query.getStartUpdateTime(), queryWrapper); + // 配送时间结束 + QueryUtil.timeLe("update_time", query.getEndUpdateTime(), queryWrapper); + } + @Override public Boolean cancel(List ids) { if(CollUtil.isEmpty(ids)){ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java index d366260d3..bfecd3ca6 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java @@ -1,9 +1,11 @@ package com.logpm.factorydata.mengtian.util; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springblade.core.mp.support.Condition; +import java.util.Date; import java.util.Map; /** @@ -26,4 +28,30 @@ public class QueryUtil { return Condition.getQueryWrapper(stringObjectMap, classz); } + /** + * QueryWrapper 查询大于指定时间范围 + * + * @param field 字段名 + * @param value 时间值 + * @param wrapper mybatisplus查询对象 + */ + public static void timeGe(String field, Date value, QueryWrapper wrapper) { + if (ObjectUtil.isNotEmpty(value)) { + wrapper.ge(field, value); + } + } + + /** + * QueryWrapper 查询小于指定时间范围 + * + * @param field 字段名 + * @param value 时间值 + * @param wrapper mybatisplus查询对象 + */ + public static void timeLe(String field, Date value, QueryWrapper wrapper) { + if (ObjectUtil.isNotEmpty(value)) { + wrapper.le(field, value); + } + } + } From f26158f0cc158fb7ed7e068ecf830083d7a8fd95 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Jul 2024 16:19:28 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9F=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobhandle/DistributionDatarepair.java | 20 +++++++++++++++++++ .../mapper/WarehouseMappingDataMapper.java | 1 + .../mapper/WarehouseMappingDataMapper.xml | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index aae4e8158..b26320df5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -205,6 +205,26 @@ public class DistributionDatarepair { return ReturnT.SUCCESS; } + + + /** + * 推送单个 老系统系统 + * @return + */ + @XxlJob("pushNotification") + public ReturnT pushSingleNotification(String params) { + + + Boolean b = distributionSignforClient.clerkCheckPushData(Long.parseLong(params)); + if(b!=null&&b){ + warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1); + log.info(">>> 推送成功 {}",Long.parseLong(params)); + }else{ + log.error(">>> 推送失败 id="+Long.parseLong(params)); + } + return ReturnT.SUCCESS; + } + /** * 推送自提签收老系统系统 * @return diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index 01f043e41..877736ec5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -122,5 +122,6 @@ public interface WarehouseMappingDataMapper { List findStockAllocationInfo(); + void updateClearSignforStatusBysignforId(@Param("singnforId")Long singnforId, @Param("dealStatus") Integer dealStatus); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index 1d31d9ead..dc64f4186 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -348,6 +348,11 @@ set total_num = #{num} where id = #{aLong} + + update clear_singnfor_status_record + set deal_status = #{dealStatus} + where singnfor_id = #{singnforId} +