diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/rest/VehicleController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/rest/VehicleController.java index a52a3dc..6bf2774 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/rest/VehicleController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/rest/VehicleController.java @@ -71,11 +71,4 @@ public class VehicleController { JSONObject json = mdPbVehicleService.getVehicle(code); return new ResponseEntity<>(json,HttpStatus.OK); } - - @GetMapping("/getVehicleByType") - @Log("选择载具") - @ApiOperation("选择载具") - public ResponseEntity getVehicleByType(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(mdPbVehicleService.getVehicleByType(whereJson,page),HttpStatus.OK); - } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/VehicleService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/VehicleService.java index 667c928..4f79858 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/VehicleService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/VehicleService.java @@ -68,11 +68,4 @@ public interface VehicleService { */ JSONObject getVehicle(String code); - /** - * 组盘信息选择载具查询 - * @param whereJson - * @param page - * @return - */ - Map getVehicleByType(Map whereJson, Pageable page); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MdPbVehicleServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MdPbVehicleServiceImpl.java index f987cb9..9e2cc0a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MdPbVehicleServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MdPbVehicleServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.wms.database.service.impl; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; @@ -12,7 +11,6 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.wms.database.service.VehicleService; import org.nl.wms.database.service.dto.VehicleDto; import org.nl.wql.WQL; -import org.nl.wql.core.bean.ResultBean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -243,19 +241,5 @@ public class MdPbVehicleServiceImpl implements VehicleService { return json; } - @Override - public Map getVehicleByType(Map whereJson, Pageable page) { - String where = ""; - WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); - String search = MapUtil.getStr(whereJson, "search"); - if (!StrUtil.isEmpty(search)) { - where = " AND (vehicle_code like '%" + search + "%' OR vehicle_name like '%" + search + "%' ) "; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete= '0' " + where + " AND vehicle_type = '02'" , "update_time desc"); - final JSONObject json = rb.pageResult(); - if (json.isEmpty()) return null; // 空值定义 - return json; - } - } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/rest/VehicleGroupController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/rest/VehicleGroupController.java deleted file mode 100644 index 625c72f..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/rest/VehicleGroupController.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.nl.wms.st.buss.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.database.service.dto.MaterialDto; -import org.nl.wms.st.buss.service.VehicleGroupService; -import org.nl.wms.st.buss.service.dto.VehicleGrouplDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @Author: lyd - * @Description: - * @Date: 2022-07-07 10:33 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "组盘管理") -@RequestMapping("/api/stBussVehicleGroup") -@Slf4j -public class VehicleGroupController { - - private final VehicleGroupService vehicleGroupService; - - @GetMapping - @Log("查询组盘") - @ApiOperation("查询组盘") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(vehicleGroupService.queryAll(whereJson,page), HttpStatus.OK); - } - - @PostMapping - @Log("新增组盘") - @ApiOperation("新增组盘") - //@PreAuthorize("@el.check('mdMeMaterial:add')") - public ResponseEntity create(@Validated @RequestBody VehicleGrouplDto dto){ - log.info("dto:{}",dto); - System.out.println(dto.toString()); - vehicleGroupService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改组盘") - @ApiOperation("修改组盘") - public ResponseEntity update(@Validated @RequestBody VehicleGrouplDto dto){ - vehicleGroupService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除组盘") - @ApiOperation("删除组盘") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - vehicleGroupService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/VehicleGroupService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/VehicleGroupService.java deleted file mode 100644 index 8e8769c..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/VehicleGroupService.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.nl.wms.st.buss.service; - -import org.nl.wms.database.service.dto.MaterialDto; -import org.nl.wms.st.buss.service.dto.VehicleGrouplDto; -import org.springframework.data.domain.Pageable; - -import java.util.Map; - -/** - * @Author: lyd - * @Description: 组盘信息服务接口 - * @Date: 2022-07-07 10:35 - */ -public interface VehicleGroupService { - /** - * 添加组盘信息 - * @param dto - */ - void create(VehicleGrouplDto dto); - - /** - * 分页获取组盘数据 - * @param whereJson - * @param page - * @return - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 修改组盘数据 - * @param dto - */ - void update(VehicleGrouplDto dto); - - /** - * 根据id查找对象 - * @param group_id - * @return - */ - VehicleGrouplDto findById(Long group_id); - - /** - * 删除 - * @param ids - */ - void deleteAll(Long[] ids); -} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/dto/VehicleGrouplDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/dto/VehicleGrouplDto.java deleted file mode 100644 index 0c90e48..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/dto/VehicleGrouplDto.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.nl.wms.st.buss.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Author: lyd - * @Description: - * @Date: 2022-07-07 10:37 - */ -@Data -public class VehicleGrouplDto implements Serializable { - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long group_id; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 物料id - */ - private Long material_id; - - /** - * 物料编码 - */ - private String material_code; - - /** - * 物料名 - */ - private String material_name; - - /** - * 批次 - */ - private String pcsn; - - /** - * 数量 - */ - private BigDecimal qty; - /** - * 创建人 - */ - private Long create_id; - - /** - * 创建人 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - -} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/impl/VehicleGroupServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/impl/VehicleGroupServiceImpl.java deleted file mode 100644 index 788e5be..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/impl/VehicleGroupServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.nl.wms.st.buss.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; -import org.nl.wms.database.service.dto.MaterialDto; -import org.nl.wms.st.buss.service.VehicleGroupService; -import org.nl.wms.st.buss.service.dto.VehicleGrouplDto; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Map; - -/** - * @Author: lyd - * @Description: 组盘管理实现类 - * @Date: 2022-07-07 10:35 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class VehicleGroupServiceImpl implements VehicleGroupService { - @Override - @Transactional(rollbackFor = Exception.class) - public void create(VehicleGrouplDto dto) { - //获取当前用户信息以及时间 - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - //赋值准备参数 - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setCreate_time(now); - dto.setGroup_id(IdUtil.getSnowflake(1, 1).nextId()); - //获取表对象 - WQLObject st_buss_vehiclegroup = WQLObject.getWQLObject("st_buss_vehiclegroup"); - JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(dto)); - st_buss_vehiclegroup.insert(jsonObject); - } - - @Override - public Map queryAll(Map whereJson, Pageable page) { - WQLObject wo = WQLObject.getWQLObject("st_buss_vehiclegroup"); - String name = (String) whereJson.get("name"); - String sql = "1=1"; - if (StrUtil.isNotEmpty(name)) { - sql = " (vehicle_code like '%"+name+"%')"; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql + " and is_delete='0'", "create_time desc"); - final JSONObject json = rb.pageResult(); - log.info("json:{}",json); - return json; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(VehicleGrouplDto dto) { - System.out.println(dto); - //判断你是否存在 - VehicleGrouplDto vg = this.findById(dto.getGroup_id()); - if (vg == null) throw new BadRequestException("被删除或无权限，操作失败!"); - WQLObject wo = WQLObject.getWQLObject("st_buss_vehiclegroup"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - public VehicleGrouplDto findById(Long group_id) { - WQLObject wo = WQLObject.getWQLObject("st_buss_vehiclegroup"); - JSONObject json = wo.query("group_id = '" + group_id + "' and is_delete='0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(VehicleGrouplDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("st_buss_vehiclegroup"); - for (Long group_id : ids) { - JSONObject param = new JSONObject(); - param.put("group_id", String.valueOf(group_id)); - param.put("is_delete", "1"); - wo.update(param); - } - } -} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index 3e4f87d..8c22aa5 100644 Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/wms/qd/src/api/wms/st/buss/stBussVehicleGroup.js b/wms/qd/src/api/wms/st/buss/stBussVehicleGroup.js deleted file mode 100644 index 09c5ae0..0000000 --- a/wms/qd/src/api/wms/st/buss/stBussVehicleGroup.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/stBussVehicleGroup', - method: 'post', - data - }) -} - -export function edit(data) { - return request({ - url: 'api/stBussVehicleGroup', - method: 'put', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/stBussVehicleGroup/', - method: 'delete', - data: ids - }) -} - -export default { add, edit, del } diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue index 7b569b3..11a1b2c 100644 --- a/wms/qd/src/views/wms/database/material/index.vue +++ b/wms/qd/src/views/wms/database/material/index.vue @@ -59,13 +59,13 @@ /> - +
取消 - 确认 + 确认
@@ -200,8 +200,7 @@ export default { stewing_time: [ { required: true, message: '静止时间不能为空', trigger: 'blur' } ] - } - } + }} }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 @@ -248,7 +247,7 @@ export default { type: 'warning' }).then(() => { crudMdMeMaterial.edit(data).then(res => { - this.crud.notify((val === 1 ? '切换人工打包' : '切换机器打包') + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }).catch(() => { debugger if (data.is_manmade === '0') { diff --git a/wms/qd/src/views/wms/st/buss/vehiclegroup/VehicleDialog.vue b/wms/qd/src/views/wms/st/buss/vehiclegroup/VehicleDialog.vue deleted file mode 100644 index 692699c..0000000 --- a/wms/qd/src/views/wms/st/buss/vehiclegroup/VehicleDialog.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - diff --git a/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue b/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue index d5fa43a..daf7be1 100644 --- a/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue +++ b/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue @@ -5,7 +5,7 @@
@@ -14,7 +14,7 @@ - + @@ -36,33 +36,12 @@
- 取消 - 确认 + 取消 + 确认
- - - - - - - - - - - - - - - - @@ -73,10 +52,8 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud' import pagination from '@crud/Pagination' import crudOperation from '@crud/CRUD.operation' import rrOperation from '@crud/RR.operation' -import udOperation from '@crud/UD.operation' -import crudStBussVehicleGroup from '@/api/wms/st/buss/stBussVehicleGroup' +import crudMdMeMaterial from '@/api/wms/database/mdMeMaterial' import MaterDialog from '../../in/MaterDialog' -import VehicleDialog from '@/views/wms/st/buss/vehiclegroup/VehicleDialog' const defaultForm = { group_id: null, @@ -85,43 +62,36 @@ const defaultForm = { material_code: null, material_name: null, pcsn: null, - qty: null, - create_id: null, - create_name: null, - create_time: null + qty: null } export default { name: 'Vehiclegroup', - components: { VehicleDialog, pagination, crudOperation, rrOperation, MaterDialog, udOperation }, + components: { pagination, crudOperation, rrOperation, MaterDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { - // 拿数据，改成组盘信息 - return CRUD({ title: '组盘', url: 'api/stBussVehicleGroup', idField: 'group_id', sort: 'group_id,desc', crudMethod: { ...crudStBussVehicleGroup }, + return CRUD({ title: '物料', url: 'api/mdMeMaterial', idField: 'material_id', sort: 'material_id,desc', crudMethod: { ...crudMdMeMaterial }, optShow: { add: true, edit: false, - del: true, + del: false, download: false, reset: true }}) }, data() { return { - permission: { - }, + permission: {}, rules: { vehicle_code: [ - { required: true, message: '托盘编码不能为空', trigger: 'change' } + { required: true, message: '托盘编码不能为空', trigger: 'blur' } ], material_name: [ { required: true, message: '物料不能为空', trigger: 'change' } ] }, materDialog: false, - materType: '', - vehicleDialog: false, - vehicleType: '' + materType: '' } }, methods: { @@ -138,14 +108,6 @@ export default { this.form.material_id = row.material_id this.form.material_code = row.material_code this.form.material_name = row.material_name - }, - tableChanged4(row) { - console.log(row) - this.form.vehicle_code = row.vehicle_code - }, - // 打开选择托盘对话框 - getVehicle() { - this.vehicleDialog = true } } }