From e75bae3a1a124a45a9755c9d5e8eead761ea9e68 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 6 Aug 2022 11:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/EndrealsemimaterialController.java | 69 ------ .../rest/SemirealrawmaterialController.java | 69 ------ .../service/EndrealsemimaterialService.java | 66 ------ .../service/SemirealrawmaterialService.java | 66 ------ .../impl/EndrealsemimaterialServiceImpl.java | 133 ----------- .../impl/SemirealrawmaterialServiceImpl.java | 133 ----------- .../wql/QMD_ME_ENDREALRAWMATERIAL001.wql | 74 ------ .../wql/QMD_ME_SEMIREALRAWMATERIAL001.wql | 74 ------ .../org/nl/wms/basedata/master/wql/mdme.xls | Bin 163328 -> 159232 bytes .../basedata/master/endrealsemimaterial.js | 35 --- .../basedata/master/semirealrawmaterial.js | 35 --- .../SelectEndMaterialDialog.vue | 219 ----------------- .../master/endrealsemimaterial/index.vue | 97 -------- .../SelectRawMaterialDialog.vue | 222 ------------------ .../master/semirealrawmaterial/index.vue | 97 -------- 15 files changed, 1389 deletions(-) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SemirealrawmaterialController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SemirealrawmaterialService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SemirealrawmaterialServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql delete mode 100644 mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js delete mode 100644 mes/qd/src/api/wms/basedata/master/semirealrawmaterial.js delete mode 100644 mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue delete mode 100644 mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue delete mode 100644 mes/qd/src/views/wms/basedata/master/semirealrawmaterial/SelectRawMaterialDialog.vue delete mode 100644 mes/qd/src/views/wms/basedata/master/semirealrawmaterial/index.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java deleted file mode 100644 index bf0d3d9..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java +++ /dev/null @@ -1,69 +0,0 @@ - -package org.nl.wms.basedata.master.rest; - - -import com.alibaba.fastjson.JSONObject; -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.basedata.master.service.EndrealsemimaterialService; -import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto; -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 geng by -* @date 2022-05-31 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "成品对应半成品管理") -@RequestMapping("/api/endrealsemimaterial") -@Slf4j -public class EndrealsemimaterialController { - - private final EndrealsemimaterialService endrealsemimaterialService; - - @GetMapping - @Log("查询成品对应半成品") - @ApiOperation("查询成品对应半成品") - //@PreAuthorize("@el.check('endrealsemimaterial:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(endrealsemimaterialService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增成品对应半成品") - @ApiOperation("新增成品对应半成品") - //@PreAuthorize("@el.check('endrealsemimaterial:add')") - public ResponseEntity create(@Validated @RequestBody EndrealsemimaterialDto dto){ - endrealsemimaterialService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping("/updateRawmaterial") - @Log("修改成品对应半成品") - @ApiOperation("修改成品对应半成品") - //@PreAuthorize("@el.check('semirealrawmaterial:edit')") - public ResponseEntity updateRawmaterial(@RequestBody JSONObject param){ - endrealsemimaterialService.updateRawmaterial(param); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除成品对应半成品") - @ApiOperation("删除成品对应半成品") - //@PreAuthorize("@el.check('endrealsemimaterial:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - endrealsemimaterialService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SemirealrawmaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SemirealrawmaterialController.java deleted file mode 100644 index af19437..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SemirealrawmaterialController.java +++ /dev/null @@ -1,69 +0,0 @@ - -package org.nl.wms.basedata.master.rest; - - -import com.alibaba.fastjson.JSONObject; -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.basedata.master.service.SemirealrawmaterialService; -import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto; -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 geng by -* @date 2022-05-31 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "半成品对应原材料管理") -@RequestMapping("/api/semirealrawmaterial") -@Slf4j -public class SemirealrawmaterialController { - - private final SemirealrawmaterialService semirealrawmaterialService; - - @GetMapping - @Log("查询半成品") - @ApiOperation("查询半成品") - //@PreAuthorize("@el.check('semirealrawmaterial:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(semirealrawmaterialService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增半成品对应原材料") - @ApiOperation("新增半成品对应原材料") - //@PreAuthorize("@el.check('semirealrawmaterial:add')") - public ResponseEntity create(@Validated @RequestBody SemirealrawmaterialDto dto){ - semirealrawmaterialService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @Log("删除半成品对应原材料") - @ApiOperation("删除半成品对应原材料") - //@PreAuthorize("@el.check('semirealrawmaterial:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - semirealrawmaterialService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/updateRawmaterial") - @Log("修改半成品对应原材料") - @ApiOperation("修改半成品对应原材料") - //@PreAuthorize("@el.check('semirealrawmaterial:edit')") - public ResponseEntity updateRawmaterial(@RequestBody JSONObject param){ - semirealrawmaterialService.updateRawmaterial(param); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java deleted file mode 100644 index 1d4b3fe..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java +++ /dev/null @@ -1,66 +0,0 @@ - -package org.nl.wms.basedata.master.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-31 -**/ -public interface EndrealsemimaterialService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param relation_id ID - * @return Endrealsemimaterial - */ - EndrealsemimaterialDto findById(Long relation_id); - - /** - * 根据编码查询 - * @param code code - * @return Endrealsemimaterial - */ - EndrealsemimaterialDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(EndrealsemimaterialDto dto); - - /** - * 编辑 - * @param param / - */ - void updateRawmaterial(JSONObject param); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SemirealrawmaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SemirealrawmaterialService.java deleted file mode 100644 index 0905ca6..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SemirealrawmaterialService.java +++ /dev/null @@ -1,66 +0,0 @@ - -package org.nl.wms.basedata.master.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-31 -**/ -public interface SemirealrawmaterialService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param relation_id ID - * @return Semirealrawmaterial - */ - SemirealrawmaterialDto findById(Long relation_id); - - /** - * 根据编码查询 - * @param code code - * @return Semirealrawmaterial - */ - SemirealrawmaterialDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(SemirealrawmaterialDto dto); - - /** - * 编辑 - * @param param / - */ - void updateRawmaterial(JSONObject param); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java deleted file mode 100644 index c856777..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ - -package org.nl.wms.basedata.master.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -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.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SecurityUtils; -import org.nl.wms.basedata.master.service.EndrealsemimaterialService; -import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto; -import org.nl.wql.WQL; -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.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-05-31 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class EndrealsemimaterialServiceImpl implements EndrealsemimaterialService { - - @Override - public Map queryAll(Map whereJson, Pageable page){ - String search = MapUtil.getStr(whereJson, "search"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - JSONObject json = WQL.getWO("QMD_ME_ENDREALRAWMATERIAL001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "endRealRawMaterial.semi_material_id desc"); - return json; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EndrealsemimaterialDto.class); - return null; - } - - @Override - public EndrealsemimaterialDto findById(Long relation_id) { - WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial"); - JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( EndrealsemimaterialDto.class); - } - return null; - } - - @Override - public EndrealsemimaterialDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( EndrealsemimaterialDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(EndrealsemimaterialDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateRawmaterial(JSONObject param) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - String relation_id = param.getString("relation_id"); - String semi_material_id = param.getString("semi_material_id"); - JSONObject map = new JSONObject(); - map.put("semi_material_id", semi_material_id); - map.put("update_optid", currentUserId); - map.put("update_optname", nickName); - map.put("update_time", now); - WQLObject wo = WQLObject.getWQLObject("MD_ME_EndRealSemiMaterial"); - wo.update(map, "relation_id = '" + relation_id + "'"); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - for (Long relation_id : ids) { - JSONObject param = new JSONObject(); - param.put("relation_id", String.valueOf(relation_id)); - param.put("raw_material_id", ""); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SemirealrawmaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SemirealrawmaterialServiceImpl.java deleted file mode 100644 index 1b63013..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SemirealrawmaterialServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ - -package org.nl.wms.basedata.master.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -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.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SecurityUtils; -import org.nl.wms.basedata.master.service.SemirealrawmaterialService; -import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto; -import org.nl.wql.WQL; -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.List; -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-31 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SemirealrawmaterialServiceImpl implements SemirealrawmaterialService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = MapUtil.getStr(whereJson, "search"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - JSONObject json = WQL.getWO("QMD_ME_SEMIREALRAWMATERIAL001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "semiRealRawMaterial.raw_material_id desc"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SemirealrawmaterialDto.class); - return null; - } - - @Override - public SemirealrawmaterialDto findById(Long relation_id) { - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(SemirealrawmaterialDto.class); - } - return null; - } - - @Override - public SemirealrawmaterialDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(SemirealrawmaterialDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SemirealrawmaterialDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateRawmaterial(JSONObject param) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - String relation_id = param.getString("relation_id"); - String raw_material_id = param.getString("raw_material_id"); - JSONObject map = new JSONObject(); - map.put("raw_material_id", raw_material_id); - map.put("update_optid", currentUserId); - map.put("update_optname", nickName); - map.put("update_time", now); - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - wo.update(map, "relation_id = '" + relation_id + "'"); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial"); - for (Long relation_id : ids) { - JSONObject param = new JSONObject(); - param.put("relation_id", String.valueOf(relation_id)); - param.put("raw_material_id", ""); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql deleted file mode 100644 index e101cb9..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql +++ /dev/null @@ -1,74 +0,0 @@ -[交易说明] - 交易名： 成品对应半成品查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - endRealRawMaterial.*, - material.material_id, - material.material_code, - material.material_name, - material.material_spec, - material.product_series, - classstandard.class_name, - material1.material_id ymaterial_id, - material1.material_code ymaterial_code, - material1.material_name ymaterial_name, - material1.material_spec ymaterial_spec, - material1.product_series yproduct_series, - classstandard1.class_name yclass_name - FROM - MD_ME_EndRealSemiMaterial endRealRawMaterial - LEFT JOIN MD_ME_MaterialBase material ON endRealRawMaterial.end_material_id = material.material_id - LEFT JOIN md_pb_classstandard classstandard on material.product_series = classstandard.class_id - LEFT JOIN MD_ME_MaterialBase material1 ON endRealRawMaterial.semi_material_id = material1.material_id - LEFT JOIN md_pb_classstandard classstandard1 on material1.product_series = classstandard1.class_id - WHERE - material.is_delete = '0' - OPTION 输入.search <> "" - (material.material_code like 输入.search or - material.material_name like 输入.search) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql deleted file mode 100644 index 351dd04..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql +++ /dev/null @@ -1,74 +0,0 @@ -[交易说明] - 交易名： 半成品对应原材料查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - semiRealRawMaterial.*, - material.material_id, - material.material_code, - material.material_name, - material.material_spec, - material.product_series, - classstandard.class_name, - material1.material_id ymaterial_id, - material1.material_code ymaterial_code, - material1.material_name ymaterial_name, - material1.material_spec ymaterial_spec, - material1.product_series yproduct_series, - classstandard1.class_name yclass_name - FROM - MD_ME_SemiRealRawMaterial semiRealRawMaterial - LEFT JOIN MD_ME_MaterialBase material ON semiRealRawMaterial.semi_material_id = material.material_id - LEFT JOIN md_pb_classstandard classstandard on material.product_series = classstandard.class_id - LEFT JOIN MD_ME_MaterialBase material1 ON semiRealRawMaterial.raw_material_id = material1.material_id - LEFT JOIN md_pb_classstandard classstandard1 on material1.product_series = classstandard1.class_id - WHERE - material.is_delete = '0' - OPTION 输入.search <> "" - (material.material_code like 输入.search or - material.material_name like 输入.search) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls index 3e7530917e3a62f6c315d9c165ed568d0c5fc210..96a2ffe66093d9a18f024ac6a3be94ea530bfc5a 100644 GIT binary patch delta 42757 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 delta 46205 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 diff --git a/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js b/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js deleted file mode 100644 index e994410..0000000 --- a/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/endrealsemimaterial', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/endrealsemimaterial/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/endrealsemimaterial', - method: 'put', - data - }) -} - -export function updateRawmaterial(data) { - return request({ - url: 'api/endrealsemimaterial/updateRawmaterial', - method: 'put', - data - }) -} - -export default { add, edit, del, updateRawmaterial } diff --git a/mes/qd/src/api/wms/basedata/master/semirealrawmaterial.js b/mes/qd/src/api/wms/basedata/master/semirealrawmaterial.js deleted file mode 100644 index f30eaae..0000000 --- a/mes/qd/src/api/wms/basedata/master/semirealrawmaterial.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/semirealrawmaterial', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/semirealrawmaterial/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/semirealrawmaterial', - method: 'put', - data - }) -} - -export function updateRawmaterial(data) { - return request({ - url: 'api/semirealrawmaterial/updateRawmaterial', - method: 'put', - data - }) -} - -export default { add, edit, del, updateRawmaterial } diff --git a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue b/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue deleted file mode 100644 index b0c8f58..0000000 --- a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue b/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue deleted file mode 100644 index 3cc51e9..0000000 --- a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/SelectRawMaterialDialog.vue b/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/SelectRawMaterialDialog.vue deleted file mode 100644 index 022b053..0000000 --- a/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/SelectRawMaterialDialog.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/index.vue b/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/index.vue deleted file mode 100644 index c172979..0000000 --- a/mes/qd/src/views/wms/basedata/master/semirealrawmaterial/index.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - -