diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 4998ae6..5534c35 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -164,36 +164,89 @@ https://juejin.cn/post/6844903775631572999 - + + + + + - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + - + - - + + - - + + - - + + - - + + + + + diff --git a/nladmin-system/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-system/nladmin-ui/src/views/wms/sch/point/index.vue index 46ca214..1c0bf9e 100644 --- a/nladmin-system/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/nladmin-system/nladmin-ui/src/views/wms/sch/point/index.vue @@ -128,8 +128,8 @@ size="mini" type="warning" icon="el-icon-circle-close" - :loading="downloadLoading" - @click="relse" + :disabled="crud.selections.length === 0" + @click="relse(crud.selections)" >一键解锁出库点 r.point_code) + crudSchBasePoint.relse(ids).then(res => { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) }, getPointTypeList(id, flag) { crudSchBaseRegion.getPointTypeSelectById(id).then(res => { diff --git a/nladmin-system/nladmin-ui/src/views/wms/sch/point/schBasePoint.js b/nladmin-system/nladmin-ui/src/views/wms/sch/point/schBasePoint.js index cb06aff..a050cab 100644 --- a/nladmin-system/nladmin-ui/src/views/wms/sch/point/schBasePoint.js +++ b/nladmin-system/nladmin-ui/src/views/wms/sch/point/schBasePoint.js @@ -56,4 +56,12 @@ export function changeLock(data) { }) } -export default { add, edit, del, changeUsed, getPointList, getRegionPoints, changeLock } +export function relse(data) { + return request({ + url: 'api/schBasePoint/relse', + method: 'post', + data + }) +} + +export default { add, edit, del, changeUsed, getPointList, getRegionPoints, changeLock, relse } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java index 5ed4100..0858733 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java @@ -197,9 +197,9 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl insertList = new ArrayList<>(); Set existCodesInFile = new HashSet<>(); - final String SECT_ID = "1985610807760785408"; - final String SECT_CODE = "1BC"; - final String SECT_NAME = "1楼半成品"; + final String SECT_ID = "2005471899915784192"; + final String SECT_CODE = "1BCDJQ"; + final String SECT_NAME = "1楼半成品待检区"; final String STOR_ID = "1985609997907791872"; final String STOR_CODE = "firstfloorBC"; final String STOR_NAME = "1楼半成品"; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index e433ffa..5ace741 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -37,6 +37,7 @@ import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.record.service.IStIvtStructivtflowService; import org.nl.wms.warehouse_manage.record.service.dao.StIvtStructivtflow; +import org.nl.wms.warehouse_manage.record.service.dao.mapper.StIvtStructivtflowMapper; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; import org.springframework.beans.factory.annotation.Autowired; @@ -82,10 +83,11 @@ public class StructattrServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { - String search = (String) whereJson.get("search"); String stor_id = (String) whereJson.get("stor_id"); String sect_id = (String) whereJson.get("sect_id"); @@ -146,6 +148,29 @@ public class StructattrServiceImpl extends ServiceImpl(page.getPage() + 1, page.getSize()), queryWrapper); } + @Transactional(rollbackFor = Exception.class) + public void syncStorageVehicleCode() { + //查询st_ivt_structivtflow表范围为update_time大于'2026-06-14 10:18:00'的数据, + //根据update_time升序遍历集合,如果growth=true则代表新增库存,把vehicle_code更新到st_ivt_structattr表的storagevehicle_code字段中; + //如果growth==false则代表减少库存,把vehicle_code更新到st_ivt_structattr表的storagevehicle_code字段为NULL; + List list = stIvtStructivtflowMapper.selectList( + new LambdaQueryWrapper() + .gt(StIvtStructivtflow::getUpdate_time, "2026-06-14 10:18:00") + .orderByAsc(StIvtStructivtflow::getUpdate_time) + ); + for (StIvtStructivtflow r : list) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(Structattr::getUpdate_time, DateUtil.now()); + if (Boolean.TRUE.equals(r.getGrowth())) { + updateWrapper.set(Structattr::getStoragevehicle_code, r.getVehicle_code()); + } else { + updateWrapper.set(Structattr::getStoragevehicle_code, null); + } + updateWrapper.eq(Structattr::getStruct_code, r.getStruct_code()); + this.update(updateWrapper); + } + } + /** * 超托库位搜索条件 */ @@ -255,6 +280,9 @@ public class StructattrServiceImpl extends ServiceImpl(HttpStatus.NO_CONTENT); } + + @Log("释放出库点") + @PostMapping("/relse") + public ResponseEntity relse(@RequestBody List pointCodes) { + schBasePointService.relse(pointCodes); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java index 6ff47bd..f514784 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java @@ -113,4 +113,11 @@ public interface ISchBasePointService extends IService { */ List checkEndPointTask(String regionCode, String getLockType, String sortType, String pointType, String pointCode, String vehicleIsNull, boolean isFourPoint); + + /** + * 释放出库点 + * + * @param pointCodes 点位编码列表 + */ + void relse(List pointCodes); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index 59e2293..d971e27 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -217,6 +217,25 @@ public class SchBasePointServiceImpl extends ServiceImpl pointCodes) { + String now = DateUtil.now(); + String userId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(SchBasePoint::getPoint_code, pointCodes) + .set(SchBasePoint::getLock_up, false) + .set(SchBasePoint::getPoint_status, "1") + .set(SchBasePoint::getIs_has_workder,"0") + .set(SchBasePoint::getVehicle_code, null) + .set(SchBasePoint::getUpdate_id, userId) + .set(SchBasePoint::getUpdate_name, nickName) + .set(SchBasePoint::getUpdate_time, now); + this.update(wrapper); + log.info(nickName+"在:"+now+",手动一键解锁了出库区点位:"+pointCodes); + } + @Override public void unLockPoint(String point_code) { this.update(