diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 88c503866..6e469ec6f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -34,6 +34,12 @@ public class OldSystemDataPushConfig { warehourseIds.add("123"); // 武汉 warehourseIds.add("48"); + // 泸州 + warehourseIds.add("43"); + // 十堰 + warehourseIds.add("64"); + + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java index 21408f174..c3c1c3ab7 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java @@ -21,6 +21,7 @@ public enum PrintTemplateStatusConstant { daiqueren_11("库存品包件模板","11"), daiqueren_12("配送任务打印模板-商配","12"), peisongtask_ziti("配送任务打印模板-自提","13"), + daiqueren_14("订单模版","15"), daiqueren_1("配送任务打印模板-市配","1"); /** * 状态 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 44266d556..cd4c213fa 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -450,6 +450,9 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "配载件数") private Integer carsLoadNum; + + @ApiModelProperty(value = "备注") + private String remark; /** /* * 未入库数量 *//* diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderCodeDataVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderCodeDataVO.java new file mode 100644 index 000000000..3410ca6c4 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderCodeDataVO.java @@ -0,0 +1,23 @@ +package com.logpm.distribution.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * 返回订单码页面 内容 + */ +@Data +public class OrderCodeDataVO { + + @ApiModelProperty(value = "模板ID") + private Long templateId; + @ApiModelProperty(value = "模板内容") + private String templateHtml; + + @ApiModelProperty(value = "模板填充内容") + private List> dataList; + +} 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 6795a0ad5..b177ac64b 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 @@ -26,10 +26,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.excel.DistributionStockArticleImporter; import com.logpm.distribution.service.IDistributionStockArticleService; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionParcelNumberVO; -import com.logpm.distribution.vo.DistributionStockArticleVO; -import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -485,6 +482,20 @@ public class DistributionStockArticleController extends BladeController { + @GetMapping("/showOrderCode") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "展示订单码") + public R showOrderCode(@ApiIgnore @RequestParam Map params){ + + OrderCodeDataVO orderCodeDataVO= null; + try { + orderCodeDataVO = distributionStockArticleService.showOrderCode(params); + } catch (Exception e) { + return R.fail(e.getMessage()); + } + return R.data(orderCodeDataVO); + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 4dacf217c..209a3ed9b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -486,4 +486,12 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectDeliveryDriverInfo(@Param("deliveryId")Long deliveryId); Integer selectOrderNumByDeliveryId(@Param("deliveryId")Long deliveryId); + + /** + * 查询配送对应的签收信息 + * @param deliveryId + * @return + */ + List selectSignforByDeliveryId(@Param("deliveryId")Long deliveryId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 9bd8b0a27..8de57a821 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -206,10 +206,12 @@ lddl.id = lds.delivery_id ) signingNumber, GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName, - GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName + GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName, + (SELECT group_concat( DISTINCT ldsa.order_code SEPARATOR ',' ) FROM logpm_distribution_delivery_list lddll LEFT JOIN logpm_distribution_signfor lds ON lddll.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON lds.reservation_id = ldrs.reservation_id AND ldrs.stock_article_status != 2 LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id WHERE lddll.id = lddl.id GROUP BY lddl.id ) AS orderCode FROM logpm_distribution_delivery_list lddl left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id + LEFT JOIN (SELECT lddl.id,ldsa.order_code FROM logpm_distribution_delivery_list lddl LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON lds.reservation_id = ldrs.reservation_id AND ldrs.stock_article_status != 2 LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id ) AS y ON y.id = lddl.id lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0 AND (lddl.customers_number > 0 AND ldr.reservation_num + ldr.reservation_stock_list_num) >0 @@ -239,6 +241,9 @@ and lddl.loading_team_name like concat('%',#{param.loadingTeamName},'%') + + and y.order_code like concat('%',#{param.orderCode},'%') + and lddl.kind = #{param.kind} @@ -2023,5 +2028,10 @@ AND reservation_num > 0 AND stock_article_status IN ('1','3') + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java index 87e7de041..2fd00333b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java @@ -81,4 +81,13 @@ public interface DistributionReservationStocklistMapper extends BaseMapper selectInventory(@Param("reservationId") Long id); + + /** + * 扣减计划库存品数量 + * @param reservationId + * @param stockListId + * @param num + * @return + */ + int deductionStockListReservationNum(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId,@Param("num") Integer num); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml index 6968fb003..c80d5e64a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml @@ -22,6 +22,9 @@ + + UPDATE logpm_distribution_reservation_stocklist SET reservation_num = (reservation_num -#{num}) WHERE reservation_id = #{reservationId} AND stocklist_id = #{stockListId} + DELETE FROM logpm_distribution_reservation_stocklist WHERE reservation_id=#{id} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index 41c29358c..10d707bd9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -181,4 +181,6 @@ public interface DistributionStockArticleMapper extends BaseMapper findListByOrderCodeLike(@Param("orderCode") String orderCode); void submitHandleNumAndTotalNumberByOrderId(@Param("subNum") Integer subNum, @Param("articleId") Long articleId); + + JSONObject findShowOrderCodeData(@Param("orderId") Long orderId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index b56bf8f37..e2c1bc3cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -522,6 +522,9 @@ and ldsa.customer_name like concat('%',#{param.customerName},'%') + + and ldsa.is_zero = #{param.isZero} + and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%') @@ -1081,4 +1084,20 @@ where id = #{articleId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index a8df6f014..7bd25f6d3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -530,7 +530,7 @@ + select id, train_number, @@ -514,14 +514,15 @@ LEFT JOIN logpm_distribution_parcel_list dpl ON dpl.id = drp.parcel_list_id left join logpm_distribution_reservation obj on drp.reservation_id = obj.id - LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = drp.reservation_id + LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = obj.id LEFT JOIN logpm_distribution_delivery_list lddl ON lds.delivery_id = lddl.id - LEFT JOIN logpm_warehouse_waybill wi ON wi.id = obj.waybill_id + LEFT JOIN logpm_warehouse_waybill wi ON wi.id = dpl.waybill_id LEFT JOIN logpm_distribution_loadscan ldl - ON ldl.order_package_code = dpl.order_package_code + ON ldl.package_id = dpl.id AND ldl.type = 2 LEFT JOIN logpm_distribution_loadscan_abnormal ldla - ON ldla.package_code = dpl.order_package_code + ON ldla.package_id = dpl.id + where drp.zero_package_status != 2 ) t ${ew.customSqlSegment} @@ -534,6 +535,10 @@ SELECT obj.id FROM logpm_distribution_reservation obj WHERE obj.id = t.id) + order by t.id desc + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index c37999c00..f97714c54 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.impl; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.mapper.ReportDeliverMapeer; @@ -23,6 +24,7 @@ import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * @author zhaoqiaobo @@ -109,10 +111,31 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public IPage detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) { + Integer current = query.getCurrent(); + Integer size = query.getSize(); IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); detailsCustomQuery(query, queryWrapper); - return page.setRecords(reportDeliverMapeer.getDetailsPage(page, queryWrapper)); + List detailsPage = reportDeliverMapeer.getDetailsPage(page, queryWrapper); + // 包件总数 + long total = page.getTotal(); + // 零件总数 + Long detailsZeroPageCount = reportDeliverMapeer.getDetailsZeroPageCount(queryWrapper); + long allTotal = total + detailsZeroPageCount; + // 包件没数据查零担 + if (detailsPage.size() < size) { + int zeroSize = size - detailsPage.size(); + double div = NumberUtil.div(allTotal, size.doubleValue()); + long zeroCurrent = current - (int) Math.ceil(div) + 1; + page.setCurrent(zeroCurrent); + page.setSize(zeroSize); + List zeroPage = reportDeliverMapeer.getDetailsZeroPage(page, queryWrapper); + page.setCurrent(current); + page.setSize(size); + detailsPage.addAll(zeroPage); + } + page.setTotal(allTotal); + return page.setRecords(detailsPage); } private void detailsCustomQuery(DevilerDetailsQuery query, QueryWrapper queryWrapper) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index ecf69e780..052369ba1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -430,6 +430,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl products = splitOrderDTO.getProducts(); StringBuffer stringBuffer = new StringBuffer(); Integer allNum = 0;