From d6dd0dd1f2d9036475f6711ba24e2e14d959f793 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Thu, 7 Jul 2022 18:07:31 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=BB=84=E7=9B=98crud"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 36a768a1116471629aa8b503b87c731413ae1777. --- .../wms/database/rest/VehicleController.java | 7 - .../wms/database/service/VehicleService.java | 7 - .../service/impl/MdPbVehicleServiceImpl.java | 16 -- .../st/buss/rest/VehicleGroupController.java | 67 -------- .../st/buss/service/VehicleGroupService.java | 47 ------ .../st/buss/service/dto/VehicleGrouplDto.java | 67 -------- .../service/impl/VehicleGroupServiceImpl.java | 100 ------------ .../src/main/java/org/nl/wms/wms.xls | Bin 392192 -> 367616 bytes .../src/api/wms/st/buss/stBussVehicleGroup.js | 27 ---- .../src/views/wms/database/material/index.vue | 9 +- .../st/buss/vehiclegroup/VehicleDialog.vue | 148 ------------------ .../views/wms/st/buss/vehiclegroup/index.vue | 62 ++------ 12 files changed, 16 insertions(+), 541 deletions(-) delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/rest/VehicleGroupController.java delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/VehicleGroupService.java delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/dto/VehicleGrouplDto.java delete mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/st/buss/service/impl/VehicleGroupServiceImpl.java delete mode 100644 wms/qd/src/api/wms/st/buss/stBussVehicleGroup.js delete mode 100644 wms/qd/src/views/wms/st/buss/vehiclegroup/VehicleDialog.vue 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 3e4f87d143e4581d7e3f2237199beeb4a59bf709..8c22aa577bcb3d986442b821539edeb4cd09a717 100644 GIT binary patch delta 29057 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 delta 50452 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 R>Gt&`8uul(vdVy+_#5h3l-&RT 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 } } }