diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java index 80cc63016..a9e77c376 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java @@ -224,6 +224,12 @@ public class DistributionSignforStockArticleVO implements Serializable { @ApiModelProperty(value = "创建人") private String createUserName; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建人") + private String reservationIds; + /** * 创建时间 @@ -232,6 +238,13 @@ public class DistributionSignforStockArticleVO implements Serializable { private Date signinTime; + /** + * 创建时间 + */ + @ApiModelProperty(value = "签收时间") + private List> info; + + diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml index 925854e8e..04c4f8c33 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml @@ -25,7 +25,7 @@ and t.is_deleted = 0 SELECT * FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId} + 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 c2c79af28..23f14b1c5 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 @@ -1163,8 +1163,8 @@ IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND scan_status != 1 ), 0 ) AS deliveryNumber, IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND scan_status != 1 ), 0 ) AS signForNumber, IFNULL(( SELECT SUM( stock_quantity ) FROM logpm_distribution_stock WHERE stock_article = ldsa.id ), 0 ) AS stockUpNumber, - IFNULL(( SELECT SUM( reservation_num ) FROM logpm_distribution_reservation_stockarticle WHERE stock_article_id = ldsa.id ), 0 ) AS reservationNumber, - CONCAT(GROUP_CONCAT(DISTINCT IFNULL(t.msg,'')),GROUP_CONCAT(DISTINCT IFNULL(y.msg,''))) AS reservationInfo, + IFNULL(( SELECT SUM( reservation_num ) FROM logpm_distribution_reservation_stockarticle WHERE stock_article_id = ldsa.id AND stock_article_status!= 2), 0 ) AS reservationNumber, + IF(GROUP_CONCAT(t.msg) is not null,GROUP_CONCAT(t.msg),IFNULL(GROUP_CONCAT(y.msg),null)) AS reservationInfo, GROUP_CONCAT(DISTINCT IFNULL( m.mssg,'')) AS deliveryListInfo, ldsa.create_time As createTime, ldsa.create_user As createUser, @@ -1173,6 +1173,7 @@ GROUP_CONCAT(DISTINCT IFNULL( m.vehicleName,'')) AS vehicleName, GROUP_CONCAT(DISTINCT IFNULL( m.examine_user_name,'')) AS examineUserNames, k.earliestWarehouseEntryTime AS earliestWarehouseEntryTime, + GROUP_CONCAT(t.reservation_id) AS reservationIds, j.scanSigningTime AS scanSigningTime FROM logpm_distribution_stock_article AS ldsa @@ -1183,7 +1184,10 @@ CONCAT( ldr.reservation_code, '(', ldrs.reservation_num, ')' ) AS msg FROM logpm_distribution_reservation_stockarticle AS ldrs - LEFT JOIN logpm_distribution_reservation ldr ON ldrs.reservation_id = ldr.id AND ldrs.stock_article_status != 2 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 + LEFT JOIN logpm_distribution_reservation ldr ON ldrs.reservation_id = ldr.id + AND ldrs.stock_article_status != 2 + AND ldr.reservation_status != 40 + AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 ) AS t ON ldsa.id = t.stock_article_id LEFT JOIN ( SELECT diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index 9b84521e2..ba332c5fe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -329,4 +329,10 @@ public interface IDistributionSignforService extends BaseService> getByReservationIds(List longList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index d6281b97f..85a04eb00 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -126,6 +126,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> getByReservationIds(List longList) { + return baseMapper.getByReservationIds(longList); + } + private List handleStockUp(DistributionStockupEntity distributionStockupEntity) { List nodeVos = new ArrayList<>(); try { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index eed503779..7de83320a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -141,6 +141,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { @@ -2025,6 +2026,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(a.getCreateUser()); a.setCreateUserName(userR.getData().getName()); } + if (!Func.isEmpty(a.getReservationIds())){ + //构建签收信息 + List> mapList = distributionSignforMapper.getByReservationIds(Func.toLongList(a.getReservationIds())); + if (!mapList.isEmpty()){ + a.setInfo(mapList); + } + } }); return distributionStockArticleEntityIPage; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 37991fc78..5ce8d8385 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -603,21 +603,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = taskQuest.getList(); -// for (TaskQuestChildEntity taskQuestChildEntity : list) { -// taskQuestChildEntity.setWarehouseId(id); -// taskQuestChildEntity.setQuestId(taskQuest.getId()); -// -// } -// taskQuestChildService.saveBatch(list); -// //添加包件信息 -// List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); -// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); - } else { - addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); - } +// 存入子表 todo 暂时不要商场 +// if (!taskQuest.getList().isEmpty()) { +//// List list = taskQuest.getList(); +//// for (TaskQuestChildEntity taskQuestChildEntity : list) { +//// taskQuestChildEntity.setWarehouseId(id); +//// taskQuestChildEntity.setQuestId(taskQuest.getId()); +//// +//// } +//// taskQuestChildService.saveBatch(list); +//// //添加包件信息 +//// List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); +//// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); +// } else { +// addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); +// } + + addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); return save ? R.success("添加成功") : R.fail("添加失败"); }