|
|
|
@ -1749,7 +1749,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
DistributionBillLadingScanEntity distributionBillLadingScan = new DistributionBillLadingScanEntity(); |
|
|
|
|
distributionBillLadingScan.setMaterialType((String) type); |
|
|
|
|
distributionBillLadingScan.setBillLadingId(Long.parseLong(billLadingId.toString())); |
|
|
|
|
distributionBillLadingScan.setScanType(1); //扫描
|
|
|
|
|
distributionBillLadingScan.setScanType(1); |
|
|
|
|
//扫描
|
|
|
|
|
if ("1".equals(type)) { |
|
|
|
|
//库存品
|
|
|
|
|
DistrilbutionBillLadingInventoryAppVO inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding)); |
|
|
|
@ -1878,16 +1879,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
distributionAsyncService.getStockUPstate(Long.parseLong(a)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*long count = list.stream().filter(e -> e.getConditions().equals("2")).count(); // 订 已签收的数
|
|
|
|
|
long count2 = list1.stream().filter(e -> e.getConditions().equals("2")).count(); // 库 已签收的数
|
|
|
|
|
if (Integer.parseInt(String.valueOf(count)) == list.size() && Integer.parseInt(String.valueOf(count2)) == list1.size()) { |
|
|
|
|
//修改提货任务状态
|
|
|
|
|
DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); |
|
|
|
|
String bill = (String) billLadingId; |
|
|
|
|
billLadingEntity.setId(Long.valueOf(bill)); |
|
|
|
|
billLadingEntity.setConditions("20"); |
|
|
|
|
baseMapper.updateById(billLadingEntity); |
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
|
log.info(coding + " > > 签收成功!!"); |
|
|
|
|
return Resp.scanSuccess("签收成功", ""); |
|
|
|
|
} |
|
|
|
|