diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java index abfaefe2..dc7e2ee5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java @@ -106,6 +106,6 @@ public class TransferissueRecordDetailPageReqVO extends PageParam { private String toBatch; @Schema(description = "主键ID") - private String masterId; + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java index b7edf895..96fe3537 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java @@ -54,7 +54,7 @@ public class ConsumeRecordDetailbDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java index 3bacb578..17413e9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java @@ -89,7 +89,7 @@ public class ProductrepairRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java index 8d5447a0..6bfb07a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java @@ -115,7 +115,7 @@ public class ScrapRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java index 23bf31c4..34f78713 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java @@ -107,7 +107,7 @@ public class TransferissueRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java index 1d2256dc..88834b55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java @@ -107,7 +107,7 @@ public class TransferreceiptRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java index 13e12760..d5eb55da 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java @@ -115,7 +115,7 @@ public class UnplannedissueRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java index 9ea295ef..fa9a415c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java @@ -133,7 +133,7 @@ public class UnplannedreceiptRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index b823e59f..f4af9678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -170,7 +170,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest List productrepairRequestDetailbDOList = productrepairRequestDetailbMapper.selectList(productrepairRequestDetailaDO.getId()); for(ProductrepairRequestDetailbDO productrepairRequestDetailbDO:productrepairRequestDetailbDOList){ ConsumeRecordDetailbDO consumeRecordDetailbDO = ConsumeRecordDetailbConvert.INSTANCE.convert(productrepairRequestDetailbDO); - consumeRecordDetailbDO.setMasterId(String.valueOf(productrepairRecordDetailDO.getId())); + consumeRecordDetailbDO.setMasterId(productrepairRecordDetailDO.getId()); consumeRecordDetailbMapper.insert(consumeRecordDetailbDO); } //添加库存事务list diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index 7d2c9e7f..c6146baa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -268,7 +268,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { if(isExists) { ScrapRecordDetailDO scrapRecordDetailDO = new ScrapRecordDetailDO(); BeanUtils.copyProperties(scrapJobDetailUpdateReqVO, scrapRecordDetailDO); - scrapRecordDetailDO.setMasterId(String.valueOf(scrapRecordMainDO.getId())); + scrapRecordDetailDO.setMasterId(scrapRecordMainDO.getId()); scrapRecordDetailDO.setNumber(number); scrapRecordDetailDO.setJobDetailId(String.valueOf(scrapJobDetailDO.getId())); LocationDO locationDO = locationService.selectLocation(scrapJobDetailDO.getFromLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 0c6178c9..2ec7fb76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -279,7 +279,7 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ TransferissueRecordDetailDO transferissueRecordDetailDO = new TransferissueRecordDetailDO(); BeanUtils.copyProperties(transferissueJobDetailUpdateReqVO, transferissueRecordDetailDO); // transferissueRecordDetailDO.setInterfaceType() - transferissueRecordDetailDO.setMasterId(String.valueOf(transferissueRecordMainDO.getId())); + transferissueRecordDetailDO.setMasterId(transferissueRecordMainDO.getId()); transferissueRecordDetailDO.setNumber(number); transferissueRecordDetailDO.setJobDetailId(String.valueOf(transferissueJobDetailDO.getId())); transferissueRecordDetailDO.setFromPackingNumber(transferissueJobDetailDO.getPackingNumber()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index 82d926f7..b88db8c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java @@ -127,7 +127,7 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa for(TransferissueRecordDetailCreateReqVO transferissueRecordDetailCreateReqVO : subList) { TransferissueRecordDetailDO recordDetailDO = TransferissueRecordDetailConvert.INSTANCE.convert(transferissueRecordDetailCreateReqVO); recordDetailDO.setNumber(number); - recordDetailDO.setMasterId(String.valueOf(transferissueRecordMainDO.getId())); + recordDetailDO.setMasterId(transferissueRecordMainDO.getId()); transferissueRecordDetailMapper.insert(recordDetailDO); } return transferissueRecordMainDO.getId(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index 4e95137b..32aff2e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -265,7 +265,7 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain if(isExists) { TransferreceiptRecordDetailDO transferreceiptRecordDetailDO = new TransferreceiptRecordDetailDO(); BeanUtils.copyProperties(transferreceiptJobDetailUpdateReqVO, transferreceiptRecordDetailDO); - transferreceiptRecordDetailDO.setMasterId(String.valueOf(transferreceiptRecordMainDO.getId())); + transferreceiptRecordDetailDO.setMasterId(transferreceiptRecordMainDO.getId()); transferreceiptRecordDetailDO.setNumber(number); transferreceiptRecordDetailDO.setJobDetailId(String.valueOf(transferreceiptJobDetailDO.getId())); transferreceiptRecordDetailDO.setFromPackingNumber(transferreceiptJobDetailDO.getPackingNumber()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 37ef316b..34693c54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -265,7 +265,7 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe UnplannedissueRecordDetailDO unplannedissueRecordDetailDO = new UnplannedissueRecordDetailDO(); BeanUtils.copyProperties(unplannedissueJobDetailUpdateReqVO, unplannedissueRecordDetailDO); // transferissueRecordDetailDO.setInterfaceType() - unplannedissueRecordDetailDO.setMasterId(String.valueOf(unplannedissueRecordMainDO.getId())); + unplannedissueRecordDetailDO.setMasterId(unplannedissueRecordMainDO.getId()); unplannedissueRecordDetailDO.setNumber(number); unplannedissueRecordDetailDO.setJobDetailId(String.valueOf(unplannedissueJobDetailDO.getId())); LocationDO locationDO1 = locationService.selectLocation(unplannedissueJobDetailDO.getFromLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 4db87034..ed4b9c7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -271,7 +271,7 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa if(isExists) { UnplannedreceiptRecordDetailDO unplannedreceiptRecordDetailDO = new UnplannedreceiptRecordDetailDO(); BeanUtils.copyProperties(unplannedreceiptJobDetailUpdateReqVO, unplannedreceiptRecordDetailDO); - unplannedreceiptRecordDetailDO.setMasterId(String.valueOf(unplannedreceiptRecordMainDO.getId())); + unplannedreceiptRecordDetailDO.setMasterId(unplannedreceiptRecordMainDO.getId()); unplannedreceiptRecordDetailDO.setNumber(number); unplannedreceiptRecordDetailDO.setJobDetailId(String.valueOf(unplannedreceiptJobDetailDO.getId())); LocationDO locationDO2 = locationService.selectLocation(unplannedreceiptJobDetailDO.getToLocationCode());