java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.装车数量调整

dev-warehouse
0.0 2 years ago
parent
24e04a2811
commit
5d484d88ec
15 changed files with 100 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
  3. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
  4. 23
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  5. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  6. 23
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java
  8. 35
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
  9. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
  10. 29
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  11. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  12. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
  13. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
  14. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  15. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

5
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
Unescape View File

@ -50,6 +50,11 @@ public class DistributionAppParcelListVO extends DistributionParcelListEntity {
*/
@ApiModelProperty(value = "物品名称")
private String materialName;
/**
* 包装号
*/
@ApiModelProperty(value = "包装号")
private String packetBarCode;
/**
* 是否扫描

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
Unescape View File

@ -115,8 +115,8 @@ public class DistributionDeliveryAppController {
@GetMapping("/wrapIn")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppStockListVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockListVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
public R<IPage<DistributionAppStockArticleVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockArticleVO> page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
return R.data(page);
}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
Unescape View File

@ -101,8 +101,8 @@ public class DistributionSignforAppController {
@GetMapping("/wrapIn")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "查看签收库存品明细", notes = "DistributionAppDeliveryListDTO")
public R<IPage<DistributionAppStockListVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockListVO> page = distributionSignforService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
public R<IPage<DistributionAppStockArticleVO>> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
IPage<DistributionAppStockArticleVO> page = distributionSignforService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO);
return R.data(page);
}

23
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
Unescape View File

@ -150,9 +150,9 @@
</select>
<select id="selectDistributionDeliverypackdetailPage" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
SELECT
distinct ldpl.order_package_code orderPackageCode,
ldpl.warehouse warehouse,
ldpl.conditions conditions,
ldpl.order_package_code orderPackageCode,
ldpl.goods_allocation goodsAllocation,
ldpl.pallet pallet,
ldpl.firsts firsts,
@ -304,17 +304,22 @@
</select>
<select id="selectDistributionAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
lds.coding coding,
ldr.reservation_stock_list_num reservationStockListNum,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscaninvn ldl WHERE ldl.inventory_id =lds.stock_list_id and ldl.scan_status !=1 ) loadingNub
distinct ldsl.id id,
ldsl.sku sku,
ldsl.cargo_number cargoNumber,
ldsl.description_goods descriptionGoods,
ldl.signfor_state signforState,
ldl.order_package_code coding,
lbm.specification specification,
lbm.logpm_unit logpmUnit
FROM
logpm_distribution_reservation ldr
join logpm_distribution_stock lds on ldr.id = lds.reservation_id
logpm_distribution_reservation ldr
join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
join logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id
LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
<where>
ldr.is_deleted = 0
<if test="param.coding != null and param.coding!=''">
and lds.coding = #{param.coding}
</if>
AND ldr.id = #{param.reservationId}
</where>
</select>

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
Unescape View File

@ -231,11 +231,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
*/
List<DistributionAppParcelListVO> selectListbypack(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 查询库存
* 车次查询库存
*
* @return
*/
List<DistributionAppStockListVO> selectListbyink(IPage page,Long id);
List<DistributionAppStockArticleVO> selectListbyink(IPage page,Long id);
/**
* 签收完成数
*

23
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
Unescape View File

@ -797,14 +797,23 @@
join logpm_distribution_stock_article ldsa on ldsa.id =ldr.stock_article_id
where lds.delivery_id = #{param.id}
</select>
<select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockListVO">
select
ldsk.coding coding,
ldls.scan_status scanStatus
<select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
distinct ldsl.id id,
ldsl.sku sku,
ldsl.cargo_number cargoNumber,
ldsl.description_goods descriptionGoods,
ldl.signfor_state signforState,
ldl.order_package_code coding,
lbm.specification specification,
lbm.logpm_unit logpmUnit
FROM
logpm_distribution_signfor lds
JOIN logpm_distribution_stock ldsk on ldsk.reservation_id = lds.reservation_id
left join logpm_distribution_loadscaninvn ldls on ldsk.stock_list_id = ldls.inventory_id
logpm_distribution_signfor lds join
logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
join logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id
LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
where lds.delivery_id = #{id}
</select>
<select id="selectdeliveryworkVnScande" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java
Unescape View File

@ -56,7 +56,7 @@ public interface DistributionSigndetailMapper extends BaseMapper<DistributionSig
DistributionSigndetailVO selectVOById(Long id);
/**
* 通过配送包条
* 通过订单查询包条
*
* @return
*/

35
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
Unescape View File

@ -115,11 +115,11 @@
<!-- </select>-->
<select id="selectDistributionSigndetailPage" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">
SELECT
ldsa.id id,
distinct ldsa.id id,
ldr.service_number serviceNumber,
ldsa.order_code orderCode,
lddl.train_number trainNumber,
lddl.type type,
ldsa.order_code orderCode,
ldsa.mall_name mallName,
ldsa.warehouse warehouse,
ldsa.brand brand,
@ -131,8 +131,8 @@
ldr.delivery_address deliveryAddress,
lds.signing_time signingTime,
lds.sjsigning_time sjsigningTime,
(SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.id = ldrp.parce_list_id) materialName,
(SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldr.id = ldrpp.reservation_id) totalNumber,
(SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName,
(SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber,
(select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum
FROM
logpm_distribution_delivery_list lddl
@ -227,22 +227,21 @@
</select>
<select id="selectDistributionDeliverypackdetailPage" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
SELECT
ldsa.warehouse warehouse,
ldpl.order_package_code orderPackageCode,
ldpl.goods_allocation goodsAllocation,
ldpl.pallet pallet,
ldpl.material_name materialName,
ldpl.material_code materialCode,
ldpl.firsts firsts,
ldpl.SECOND SECOND,
ldpl.third_product thirdProduct,
COALESCE (ldl.received_quantity ,0) receivedQuantity
distinct ldpl.id id,
ldpl.order_package_code orderPackageCode,
ldpl.goods_allocation goodsAllocation,
ldpl.pallet pallet,
ldpl.material_name materialName,
ldpl.material_code materialCode,
ldpl.firsts firsts,
ldpl.SECOND SECOND,
ldpl.third_product thirdProduct,
(select COALESCE (ldl.received_quantity ,0) from logpm_distribution_loadscan ldl WHERE ldl.package_id =ldpl.id) receivedQuantity
FROM
logpm_distribution_stock_article ldsa
JOIN logpm_distribution_parcel_list ldpl ON ldpl.stock_article_id = ldsa.id
LEFT JOIN logpm_distribution_loadscan ldl ON ldl.package_id = ldpl.id
logpm_distribution_reservation_package ldrp
JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
<where>
ldsa.id = #{param.id}
ldrp.stock_article_id = #{param.id}
</where>
</select>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
Unescape View File

@ -154,7 +154,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
*
* @return
*/
List<DistributionAppStockListVO> selectListbyink(IPage<DistributionAppStockListVO> page, Long id);
List<DistributionAppStockArticleVO> selectListbyink(IPage<DistributionAppStockArticleVO> page, Long id);
/**
* 部分扫
*

29
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
Unescape View File

@ -650,20 +650,23 @@
AND ldr.id = #{param.reservationId}
</where>
</select>
<select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockListVO">
select
distinct ldsk.coding coding,
ldsk.unit cargoUnit,
ldsk.goods_name goodsName,
ldls.scan_status scanStatus,
lbm.sku sku,
lbm.specification specification
<select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
SELECT
distinct ldsl.id id,
ldsl.sku sku,
ldsl.cargo_number cargoNumber,
ldsl.description_goods descriptionGoods,
ldl.signfor_state signforState,
ldl.order_package_code coding,
lbm.specification specification,
lbm.logpm_unit logpmUnit
FROM
logpm_distribution_signfor lds
JOIN logpm_distribution_stock ldsk on ldsk.reservation_id = lds.reservation_id
left join logpm_distribution_loadscaninvn ldls on ldsk.stock_list_id = ldls.inventory_id
left join logpm_distribution_parcel_list ldpl on ldsk.parcel_list_id = ldpl.id
left join logpm_basicdata_material lbm on lbm.id = ldpl.material_id
logpm_distribution_signfor lds join
logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
join logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id
LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
where lds.delivery_id = #{id}
</select>
<select id="selectorda" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
Unescape View File

@ -150,7 +150,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*/
IPage<DistributionAppReservationVO> getAppDeliveryreservationListPage(IPage<DistributionAppReservationVO> page,DistributionAppDeliveryListDTO distributionDeliveryList);
IPage<DistributionAppStockListVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* 修改配送任务

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
Unescape View File

@ -112,7 +112,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
/**
* App-签收管理 查看详情库存品
*/
IPage<DistributionAppStockListVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
* App-签收管理 定位打卡
*/

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
Unescape View File

@ -115,6 +115,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
@Override
public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliveryInventory(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryInventoryPage(page, distributionAppDeliveryListDTO);
return page.setRecords(distributionAppStockArticleVOS);
}

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -667,6 +667,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//查询所有的库存品(拆包)
List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntitiesopen = baseMapper.selectdeliverOnevnopen(distrilbutionloadingscanDTO.getReservationId(),distrilbutionloadingscanDTO.getDeliveryId());
//将该客户所有的物品上该车辆
Integer flag =0;
Integer flag2 =0;
if (distributionLoadscanEntities.size() > 0) {
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//查询是否重复扫码
@ -675,9 +677,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
.ne(DistributionLoadscanEntity::getScanStatus, 1)
);
if (distributionLoadscanEntitiesflag.size() > 0) {
continue;
}
flag +=1;
//依次插入该装车记录,设置车辆
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
@ -733,6 +737,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// }
if (distributionLoadscanvnEntitiesopen.size() > 0) {
for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntitiesopen) {
//查询是否重复扫码
List<DistributionLoadscaninvnEntity> distributionLoadscanEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
.eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId())
.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
.ne(DistributionLoadscaninvnEntity::getScanStatus, 1)
);
if (distributionLoadscanEntitiesflag.size() > 0) {
continue;
}
flag2 +=1;
//依次插入该装车记录,设置车辆
if (null != distributionDeliverySelfEntity.getDriverId()) {
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
@ -759,6 +774,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntitiesopen);
}
if (flag==0 && flag2 ==0){return R.fail(4002,"无数据进行装车");}
// if (distributionLoadscanEntitiesno.size() > 0) {
// for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntitiesno) {
// //查询是否重复扫码
@ -1181,8 +1197,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public IPage<DistributionAppStockListVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockListVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockArticleVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
return page.setRecords(distributionAppStockListVOS);
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -298,7 +298,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
for (DistributionAppSignforVO distributionAppReservationVO : customList) {
//查询配送状态
distributionAppReservationVO.setDeliveryStatus("配送中");
if (distributionAppReservationVO.getDriverSigning().equals("2")){distributionAppReservationVO.setDeliveryStatus("完成配送");}
if (distributionAppReservationVO.getDriverSigning().equals("2") || distributionAppReservationVO.getSigningStatus().equals("2") ){distributionAppReservationVO.setDeliveryStatus("完成配送");}
}
return page.setRecords(customList);
}
@ -443,8 +443,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
@Override
public IPage<DistributionAppStockListVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockListVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
public IPage<DistributionAppStockArticleVO> selectDistributionAppDeliverywrapIn(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
List<DistributionAppStockArticleVO> distributionAppStockListVOS = baseMapper.selectListbyink(page, distributionAppDeliveryListDTO.getId());
return page.setRecords(distributionAppStockListVOS);
}

Write Preview
Loading…
Cancel
Save