Browse Source

feat: 出库单确认

master
李永德 2 weeks ago
parent
commit
07a05debcb
  1. 8
      lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
  2. 6
      lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@ -756,7 +756,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// 查询所有明细 // 查询所有明细
List<StIvtIostorinvdtl> dtlDaoList = iStIvtIostorinvdtlService.list( List<StIvtIostorinvdtl> dtlDaoList = iStIvtIostorinvdtlService.list(
new QueryWrapper<StIvtIostorinvdtl>().lambda() new QueryWrapper<StIvtIostorinvdtl>().lambda()
.eq(StIvtIostorinvdtl::getIostorinv_id, mstDao.getIostorinv_id().toString()) .eq(StIvtIostorinvdtl::getIostorinv_id, mstDao.getIostorinv_id())
); );
// 判断是否有生成状态的 // 判断是否有生成状态的
@ -780,7 +780,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
// 查询此单据下所有分配明细 // 查询此单据下所有分配明细
List<StIvtIostorinvdis> disDaoList = iStIvtIostorinvdisService.list( List<StIvtIostorinvdis> disDaoList = iStIvtIostorinvdisService.list(
new QueryWrapper<StIvtIostorinvdis>().lambda() new QueryWrapper<StIvtIostorinvdis>().lambda()
.eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id().toString()) .eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id())
); );
//判断分配明细中是否有未生成状态的分配明细 //判断分配明细中是否有未生成状态的分配明细
@ -824,13 +824,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
jsonIvt.put("quality_scode", disDao.getQuality_scode()); jsonIvt.put("quality_scode", disDao.getQuality_scode());
// 判断木箱是否是主存区的,如果是主存区的则不更新库存 // 判断木箱是否是主存区的,如果是主存区的则不更新库存
if (disDao.getSect_id().toString().equals(RegionTypeEnum.TWO_BZC01.getId())) { if (disDao.getSect_id().equals(RegionTypeEnum.TWO_BZC01.getId())) {
continue; continue;
} }
needUpdateIvtList.add(jsonIvt); needUpdateIvtList.add(jsonIvt);
if (disDao.getTask_id() != null) { if (disDao.getTask_id() != null) {
needUpdateTaskList.add(disDao.getTask_id().toString()); needUpdateTaskList.add(disDao.getTask_id());
} }
} }

6
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@ -114,4 +114,10 @@ public class CheckOutBillController {
iStIvtIostorinvOutService.allSetPoint(whereJson); iStIvtIostorinvOutService.allSetPoint(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
@PostMapping("/confirm")
@Log("出库单强制确认")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
iStIvtIostorinvOutService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
} }

Loading…
Cancel
Save