diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/TableDataInfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/TableDataInfo.java index bfef3b4..b68ba2b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/TableDataInfo.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/TableDataInfo.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -27,7 +28,7 @@ public class TableDataInfo implements Serializable { /** * 列表数据 */ - private List content; + private List content = new ArrayList<>(); /** * 消息状态码 @@ -56,7 +57,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(IPage page) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg("操作成功"); rspData.setContent(page.getRecords()); rspData.setTotalElements(page.getTotal()); return rspData; @@ -65,7 +66,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build(List list) { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg("操作成功"); rspData.setContent(list); rspData.setTotalElements(list.size()); return rspData; @@ -74,7 +75,7 @@ public class TableDataInfo implements Serializable { public static TableDataInfo build() { TableDataInfo rspData = new TableDataInfo<>(); rspData.setCode(String.valueOf(HttpStatus.HTTP_OK)); - rspData.setMsg("查询成功"); + rspData.setMsg("操作成功"); return rspData; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java index 43e7996..a7a07de 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -10,7 +10,6 @@ import org.nl.common.utils.MapOf; import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; import java.lang.reflect.Type; -import java.util.Date; import java.util.Map; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 3c90cfa..9aef26c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -2,9 +2,11 @@ package org.nl.config.mybatis; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.github.pagehelper.PageInterceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -37,13 +39,18 @@ public class MybatisPlusConfig { public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 分页插件 +// // 分页插件 interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //乐观锁插件 interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); return interceptor; } + + @Bean + ConfigurationCustomizer mybatisConfigurationCustomizer() { + return configuration -> configuration.addInterceptor(new PageInterceptor()); + } @PostConstruct public void datainnit() { String url = ((DruidDataSource) dataSource).getUrl(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java index d98c8a3..1df7308 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java @@ -2,7 +2,9 @@ package org.nl.wms.basedata_manage.controller; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,6 +19,7 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; +import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -24,8 +27,11 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** @@ -46,6 +52,8 @@ public class GroupController { private final IMdPbGroupplateService iMdPbGroupplateService; @Autowired private final IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; + @Autowired + private final MdPbGroupplateMapper mdPbGroupplateMapper; @GetMapping @Log("分页查询") @@ -56,25 +64,31 @@ public class GroupController { @PostMapping @Log("新增组盘组盘") - public ResponseEntity create(@RequestBody JSONObject group) { - Assert.noNullElements(new Object[]{group,group.get("material_id"),group.get("storagevehicle_code"),group.get("qty")},"请求参数不能为空"); - GroupPlate groupPlate = group.toJavaObject(GroupPlate.class); - String storagevehicleCode = groupPlate.getStoragevehicle_code(); + public ResponseEntity createSingle(@RequestBody JSONObject group) { + Assert.noNullElements(new Object[]{group, group.get("tableData"), group.get("storagevehicle_code")}, "请求参数不能为空"); + String storagevehicleCode = group.getString("storagevehicle_code"); { iMdPbStoragevehicleinfoService.getByCode(storagevehicleCode); int has = iMdPbGroupplateService.count(new LambdaUpdateWrapper() - .eq(GroupPlate::getStoragevehicle_code, groupPlate.getStoragevehicle_code()) + .eq(GroupPlate::getStoragevehicle_code, storagevehicleCode) .lt(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))); - if (has>0){ + if (has > 0) { throw new BadRequestException("当前载具组盘信息已存在"); } } - groupPlate.setGroup_id(IdUtil.getStringId()); - groupPlate.setCreate_id(SecurityUtils.getCurrentUserId()); - groupPlate.setCreate_name(SecurityUtils.getCurrentUsername()); - groupPlate.setCreate_time(DateUtil.now()); - groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘")); - iMdPbGroupplateService.save(groupPlate); + JSONArray rows = group.getJSONArray("tableData"); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + GroupPlate groupPlate = row.toJavaObject(GroupPlate.class); + groupPlate.setStoragevehicle_code(storagevehicleCode); + groupPlate.setGroup_id(IdUtil.getStringId()); + groupPlate.setCreate_id(SecurityUtils.getCurrentUserId()); + groupPlate.setCreate_name(SecurityUtils.getCurrentUsername()); + groupPlate.setCreate_time(DateUtil.now()); + groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘")); + iMdPbGroupplateService.save(groupPlate); + } + return new ResponseEntity<>(HttpStatus.OK); } @@ -84,4 +98,18 @@ public class GroupController { iMdPbGroupplateService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @PostMapping(value = "/getAllGroupInfo") + @Log("通过载具号获取全部组盘信息") + public ResponseEntity getAllGroupInfo(@RequestBody JSONArray rows) { + List vehicle_list = rows.stream() + .map(obj -> (HashMap) obj) + .map(json -> json.get("storagevehicle_code")) + .distinct() + .collect(Collectors.toList()); + List list = mdPbGroupplateMapper.getVehicleMaterial(new JSONObject() {{ + put("vehicle_codes", vehicle_list); + }}); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java index 54406b9..a800c0c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java @@ -45,7 +45,7 @@ public class MaterialbaseController { @Log("新增物料") public ResponseEntity create(@Validated @RequestBody MdMeMaterialbase dto) { iMdMeMaterialbaseService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.CREATED); } @PutMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/ISectattrService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/ISectattrService.java index a686c53..b921b45 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/ISectattrService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/ISectattrService.java @@ -35,6 +35,7 @@ public interface ISectattrService extends IService { * @return Sectattr */ Sectattr findById(String sect_id); + Sectattr findByCode(String sect_code); /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java index a019e9c..b2ee031 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java @@ -113,6 +113,8 @@ public interface IStructattrService extends IService { /** * 生成库存变动记录表，更新载具冻结数量 + * 如果是拣选出库，则库存数为0的变成出库状态 + * 拣选的，扣减冻结数之后变成组盘状态，如果需要回库则通过余料回库回去 * @param changeDto */ void changeStruct(StructattrChangeDto changeDto); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java index 01783b4..76899c9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java @@ -38,7 +38,7 @@ public class MdMeMaterialbase implements Serializable { private String material_code; /** - * 物料名称 + * 物料名称 */ private String material_name; @@ -60,7 +60,12 @@ public class MdMeMaterialbase implements Serializable { /** * 基本计量单位 */ - private String base_unit_id; + private String qty_unit_id; + + /** + * 基本计量单位名称 + */ + private String qty_unit_name; /** * 辅助计量单位 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index 40c9132..9ef4770 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -216,7 +216,7 @@ SELECT - dis.*, - mb.material_code, - mb.material_name, - task.task_code, - task.task_status + dis.*, + mb.material_code, + mb.material_name, + task.task_code, + task.task_status FROM - st_ivt_iostorinvdis dis - LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id - LEFT JOIN sch_base_task task ON task.task_id = dis.task_id + st_ivt_iostorinvdis dis + LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN sch_base_task task ON task.task_id = dis.task_id where - dis.iostorinvdtl_id = #{iostorinvdtl_id} + dis.iostorinvdtl_id = #{iostorinvdtl_id} SELECT DISTINCT ios.* FROM st_ivt_iostorinv ios - LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id + LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id LEFT JOIN st_ivt_iostorinvdis dis ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id ios.is_delete = '0' AND ios.io_type = '0' @@ -49,12 +49,16 @@ SELECT - late.*, - mater.material_code, - mater.material_name + late.*, + mater.material_code, + mater.material_name FROM - md_pb_groupplate late - LEFT JOIN md_me_materialbase mater ON mater.material_id = late.material_id + md_pb_groupplate late + LEFT JOIN md_me_materialbase mater ON mater.material_id = late.material_id late.status = '01' @@ -21,18 +21,18 @@ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java index 0f610c9..3d8a6c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java @@ -119,7 +119,7 @@ public class UpdateIvtUtils { * @param where 输入参数 */ private void updateAddCanuseInsertIvt(JSONObject where) { -// throw new BadRequestException("当前载具已存在库存物料，请检查数据!"); + throw new BadRequestException("当前载具已存在库存物料，请检查数据!"); // 判断当前载具是否有物料 // MdPbStoragevehicleext extDao = iMdPbStoragevehicleextService.getOne( // new QueryWrapper().lambda() @@ -197,7 +197,7 @@ public class UpdateIvtUtils { } // 如果可用数和冻结数都为零则删除数据 if (frozen_qty == 0 && extDao.getQty().doubleValue() == 0) { -// iMdPbStoragevehicleextService.removeById(extDao); + iMdPbStoragevehicleextService.removeById(extDao); } else { extDao.setFrozen_qty(BigDecimal.valueOf(frozen_qty)); extDao.setUpdate_id(SecurityUtils.getCurrentUserId()); @@ -219,20 +219,16 @@ public class UpdateIvtUtils { new QueryWrapper().lambda() .eq(GroupPlate::getStoragevehicle_code, where.getString("storagevehicle_code")) .eq(GroupPlate::getMaterial_id, where.getString("material_id")) - .eq(GroupPlate::getPcsn, where.getString("pcsn")).eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) + .eq(GroupPlate::getPcsn, where.getString("pcsn")) + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")) ); if (ObjectUtil.isEmpty(extDao)) { throw new BadRequestException("当前载具【" + extDao.getStoragevehicle_code() + "】不存在相关物料批次库存，请检查数据!"); } - // 减冻结 - double qty = NumberUtil.sub(extDao.getQty(), extDao.getFrozen_qty()).doubleValue(); - if (qty < 0) { - throw new BadRequestException("冻结数不能为负数，请检查变动数量！当前冻结数为【" + extDao.getFrozen_qty() + "】当前变动数为【" + where.getDoubleValue("change_qty") + "】"); - } // 加可用 - // double canuse_qty = NumberUtil.add(extDao.getQty(), where.getDoubleValue("change_qty")).doubleValue(); + BigDecimal addQty = extDao.getQty().add(where.getBigDecimal("change_qty")); extDao.setFrozen_qty(BigDecimal.ZERO); - extDao.setQty(BigDecimal.valueOf(qty)); + extDao.setQty(addQty); extDao.setUpdate_id(SecurityUtils.getCurrentUserId()); extDao.setUpdate_name(SecurityUtils.getCurrentNickName()); extDao.setUpdate_time(DateUtil.now()); diff --git a/nladmin-ui/src/views/system/user/user.js b/nladmin-ui/src/views/system/user/user.js index 6cd91a5..437bb95 100644 --- a/nladmin-ui/src/views/system/user/user.js +++ b/nladmin-ui/src/views/system/user/user.js @@ -35,8 +35,10 @@ export function editUser(data) { export function updatePass(user) { const data = { - oldPass: encrypt(user.oldPass), - newPass: encrypt(user.newPass) + // oldPass: encrypt(user.oldPass), + // newPass: encrypt(user.newPass) + oldPass: user.oldPass, + newPass: user.newPass } return request({ url: 'api/users/updatePass/', diff --git a/nladmin-ui/src/views/wms/basedata/group/group.js b/nladmin-ui/src/views/wms/basedata/group/group.js index e927e8f..bcbfae5 100644 --- a/nladmin-ui/src/views/wms/basedata/group/group.js +++ b/nladmin-ui/src/views/wms/basedata/group/group.js @@ -24,4 +24,12 @@ export function edit(data) { }) } -export default { add, edit, del } +export function getAllGroupInfo(data) { + return request({ + url: 'api/group/getAllGroupInfo', + method: 'post', + data + }) +} + +export default { add, edit, del, getAllGroupInfo } diff --git a/nladmin-ui/src/views/wms/basedata/group/index.vue b/nladmin-ui/src/views/wms/basedata/group/index.vue index a16cda9..a03fa64 100644 --- a/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -2,62 +2,62 @@
- - - 物料查询： - + + 物料查询： + + + + 批次查询： + + + + 载具编码： + + + + 组盘状态： + + - - - 批次查询： - - - - 载具编码： - - - - 组盘状态： - - - - - - - - + + + + + + @@ -179,6 +179,8 @@
+ +
@@ -190,6 +192,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import rrOperation from '@crud/RR.operation' import MaterialDialog from '@/views/wms/basedata/material/MaterialDialog' +import AddDialog from '@/views/wms/basedata/group/AddDialog' const defaultForm = { group_id: null, @@ -211,7 +214,7 @@ const defaultForm = { } export default { name: 'Group', - components: { pagination, MaterialDialog, crudOperation, rrOperation, udOperation }, + components: { pagination, MaterialDialog, crudOperation, rrOperation, udOperation, AddDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], tableEnums: ['md_pb_measureunit#unit_name#measure_unit_id'], // 数据字典 @@ -243,6 +246,9 @@ export default { [CRUD.HOOK.beforeRefresh]() { return true }, + querytable() { + this.crud.toQuery() + }, formattStatus(row) { return this.dict.label.GROUP_STATUS[row.status] }, diff --git a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue index e01adf7..4aeb40d 100644 --- a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue +++ b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue @@ -29,7 +29,7 @@ @@ -51,7 +49,7 @@ - + @@ -87,7 +85,7 @@ export default { }, isSingle: { type: Boolean, - default: true + default: false } }, data() { @@ -102,6 +100,11 @@ export default { handler(newValue) { this.dialogVisible = newValue } + }, + isSingle: { + handler(newValue) { + this.isSingle = newValue + } } }, methods: { @@ -109,31 +112,21 @@ export default { this.tableRadio = item }, open() { - - }, - handleSelectionChange(val, row) { - if (val.length > 1) { - this.$refs.table.clearSelection() - this.$refs.table.toggleRowSelection(val.pop()) - } else { - this.checkrow = row - } - }, - onSelectAll() { - this.$refs.table.clearSelection() + this.crud.refresh() }, close() { this.crud.resetQuery(false) this.$emit('update:dialogShow', false) }, submit() { + debugger // 处理单选 if (this.isSingle && this.tableRadio) { this.$emit('update:dialogShow', false) this.$emit('materialChoose', this.tableRadio) return } - this.rows = this.$refs.table.selection + this.rows = this.$refs.table2.selection if (this.rows.length <= 0) { this.$message('请先勾选物料') return @@ -146,8 +139,8 @@ export default { } diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue index fb619a2..47b841c 100644 --- a/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -43,7 +43,7 @@ - + @@ -102,9 +102,9 @@ @selection-change="crud.selectionChangeHandler" > - - - + + + diff --git a/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js b/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js index 21f6c89..c435721 100644 --- a/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js +++ b/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js @@ -32,6 +32,7 @@ export function getSect(params) { }) } + export function getSectCode(params) { return request({ url: 'api/sectattr/getSectCode', diff --git a/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue b/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue index ca46b36..82a81a0 100644 --- a/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue +++ b/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue @@ -40,7 +40,7 @@ @keyup.enter.native="crud.toQuery" /> - + @@ -67,34 +67,30 @@ > - + - + - + - + - + - +
@@ -112,11 +108,11 @@ - +
@@ -133,22 +129,22 @@ > - + - + - + - + - + - +
@@ -184,22 +180,22 @@
- + - + - + - + - + - + 否 @@ -240,8 +236,8 @@ /> - - + + - +
- + - - - - - - - - - - - + + + @@ -327,10 +326,8 @@ const defaultForm = { struct_code: null, struct_name: null, simple_name: null, - sect_id: null, sect_code: null, sect_name: null, - stor_id: null, stor_code: null, stor_name: null, stor_type: null, @@ -424,10 +421,10 @@ export default { struct_name: [ { required: true, message: '仓位名称不能为空', trigger: 'blur' } ], - sect_id: [ + sect_code: [ { required: true, message: '库区标识不能为空', trigger: 'blur' } ], - stor_id: [ + stor_code: [ { required: true, message: '仓库标识不能为空', trigger: 'blur' } ], capacity: [ @@ -457,7 +454,7 @@ export default { } }, created() { - crudSectattr.getSect({ 'stor_id': '' }).then(res => { + crudSectattr.getSectCode({ 'stor_code': '' }).then(res => { this.sects = res.content }) }, @@ -468,12 +465,12 @@ export default { }, [CRUD.HOOK.afterToEdit](crud, form) { const val = [] - val[0] = form.stor_id - val[1] = form.sect_id + val[0] = form.stor_code + val[1] = form.sect_code form.cascader = val }, sectChange(val) { - this.form.sect_id = val[1] + this.form.sect_code = val[1] }, openOneCreate() { this.openOneCreateDialog = true @@ -490,16 +487,16 @@ export default { }, sectQueryChange(val) { if (val.length === 1) { - this.query.stor_id = val[0] - this.query.sect_id = '' + this.query.stor_code= val[0] + this.query.sect_code = '' } if (val.length === 0) { - this.query.sect_id = '' - this.query.stor_id = '' + this.query.sect_code = '' + this.query.stor_code = '' } if (val.length === 2) { - this.query.stor_id = val[0] - this.query.sect_id = val[1] + this.query.stor_code = val[0] + this.query.sect_code = val[1] } this.crud.toQuery() }, diff --git a/nladmin-ui/src/views/wms/sch/point/schBasePoint.js b/nladmin-ui/src/views/wms/sch/point/schBasePoint.js index aecdb0f..cb06aff 100644 --- a/nladmin-ui/src/views/wms/sch/point/schBasePoint.js +++ b/nladmin-ui/src/views/wms/sch/point/schBasePoint.js @@ -40,6 +40,14 @@ export function getPointList(data) { }) } +export function getRegionPoints(params) { + return request({ + url: 'api/schBasePoint/getRegionPoints', + method: 'get', + params + }) +} + export function changeLock(data) { return request({ url: 'api/schBasePoint/changeLock', @@ -48,4 +56,4 @@ export function changeLock(data) { }) } -export default { add, edit, del, changeUsed, getPointList, changeLock } +export default { add, edit, del, changeUsed, getPointList, getRegionPoints, changeLock } diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue index 7deac2b..d155483 100644 --- a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue +++ b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue @@ -313,7 +313,7 @@ export default { rows.forEach((item) => { let same_mater = true this.form.tableData.forEach((row) => { - if (row.pcsn === item.pcsn) { + if (row.pcsn === item.pcsn && row.material_id === item.material_id && row.storagevehicle_code === item.storagevehicle_code) { same_mater = false } }) diff --git a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue index 5b55ca8..c36550f 100644 --- a/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue +++ b/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue @@ -77,12 +77,12 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker/index' -import crudRawAssist from '@/views/wms/st/inbill/rawassist' +import group, { getAllGroupInfo } from '@/views/wms/basedata/group/group.js' const start = new Date() export default { name: 'AddDtl', - components: { crudOperation, rrOperation, pagination, DateRangePicker }, + components: { crudOperation, rrOperation, pagination, DateRangePicker, group }, cruds() { return CRUD({ title: '用户', @@ -149,10 +149,10 @@ export default { console.log('获取的rows:') console.log(this.rows) this.$emit('tableChanged', this.rows) - // crudRawAssist.queryBoxMater(this.rows).then(res => { - // this.rows = res - // this.$emit('tableChanged', this.rows) - // }) + group.getAllGroupInfo(this.rows).then(res => { + this.rows = res.content + this.$emit('tableChanged', this.rows) + }) // this.form = this.$options.data().form } } diff --git a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index 6c31ceb..6c0238d 100644 --- a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -72,6 +72,20 @@ label="数量" align="center" /> + + @@ -155,10 +169,13 @@ :data="form.tableMater" style="width: 100%;" max-height="300" + highlight-current-row + @row-click="clcikDisRow" border :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > + @@ -215,7 +232,7 @@ export default { type: String, default: null }, - storId: { + storCode: { type: String, default: null } @@ -236,6 +253,7 @@ export default { sect_val: null, form: { dtl_row: null, + dis_row: null, storage_qty: '', point_code: null, checked: true, @@ -255,7 +273,7 @@ export default { }, methods: { open() { - crudSectattr.getSectCode({ 'stor_id': this.storId }).then(res => { + crudSectattr.getSectCode({ 'stor_code': this.storCode }).then(res => { this.sects = res.content }) @@ -283,11 +301,15 @@ export default { crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code }).then(res => { this.openParam = res this.form.dtl_row = res[row.index] + this.form.dis_row = null }) crudRawAssist.getDisDtl(row).then(res => { this.form.tableMater = res }) }, + clcikDisRow(row, column, event) { + this.form.dis_row = row + }, tableRowClassName({ row, rowIndex }) { row.index = rowIndex }, @@ -369,6 +391,10 @@ export default { this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO) return } + if (!this.form.dis_row) { + this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO) + return + } // 如果勾选了，直接跳后台 if (this.form.checked) { if (!this.sect_code) { @@ -385,6 +411,7 @@ export default { crudRawAssist.getDisDtl(this.form.dtl_row).then(res => { this.form.tableMater = res this.divBtn = false + this.form.dis_row = null this.crud.notify('分配货位成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) }) }).finally(() => { @@ -403,9 +430,8 @@ export default { this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO) return } - const flag = this.form.tableMater.some(mater => !mater.struct_code) - if (flag) { - this.crud.notify('明细存在未分配货位！', CRUD.NOTIFICATION_TYPE.INFO) + if (!this.form.dis_row) { + this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO) return } // 如果勾选了，直接跳后台 @@ -415,6 +441,7 @@ export default { }) crudRawAssist.getDisDtl(this.form.dtl_row).then(res => { this.form.tableMater = res + this.form.dis_row = null this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) }) }) diff --git a/nladmin-ui/src/views/wms/st/inbill/index.vue b/nladmin-ui/src/views/wms/st/inbill/index.vue index 6aafc5d..a166def 100644 --- a/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -379,7 +379,7 @@ export default { divOpen() { crudRawAssist.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => { this.openParam = res - this.storId = this.currentRow.stor_id + this.storCode = this.currentRow.stor_code this.billType = this.currentRow.bill_type this.divShow = true }) diff --git a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 72b9f0a..1768a21 100644 --- a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -157,21 +157,14 @@ disabled /> - - + - - + :options="outBoundRegion" + :props="{ checkStrictly: true }" + clearable + @change="outBoundChange" + />
@@ -211,6 +204,7 @@ +