From f3c2b7872a70aad34a9acaa24ce9ae15071dd355 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 2 Sep 2022 20:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pdm/rest/WCChangeController.java | 63 +++++++ .../nl/wms/pdm/service/WCChangeService.java | 59 ++++++ .../pdm/service/impl/WCChangeServiceImpl.java | 128 +++++++++++++ .../java/org/nl/wms/pdm/wql/QPDM_WCCHANGE.wql | 67 +++++++ .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 249344 -> 251904 bytes mes/qd/src/api/wms/pdm/wcchange.js | 64 +++++++ .../views/wms/pdm/base/wcchange/AddDialog.vue | 168 +++++++++++++++++ .../src/views/wms/pdm/base/wcchange/index.vue | 169 ++++++++++++++++++ mes/qd/src/views/wms/pub/SuppDialog.vue | 140 +++++++++++++++ 9 files changed, 858 insertions(+) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WCChangeController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/WCChangeService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WCChangeServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WCCHANGE.wql create mode 100644 mes/qd/src/api/wms/pdm/wcchange.js create mode 100644 mes/qd/src/views/wms/pdm/base/wcchange/AddDialog.vue create mode 100644 mes/qd/src/views/wms/pdm/base/wcchange/index.vue create mode 100644 mes/qd/src/views/wms/pub/SuppDialog.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WCChangeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WCChangeController.java new file mode 100644 index 00000000..25b530c7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WCChangeController.java @@ -0,0 +1,63 @@ + +package org.nl.wms.pdm.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.service.LocalStorageService; +import org.nl.wms.pdm.service.DailyplanService; +import org.nl.wms.pdm.service.WCChangeService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@Api(tags = "碳化钨总碳修正维护") +@RequestMapping("/api/wcchange") +@Slf4j +public class WCChangeController { + + private final WCChangeService wCChangeService; + + @GetMapping + @Log("查询月生产计划") + @ApiOperation("查询月生产计划") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(wCChangeService. + queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增工令") + @ApiOperation("新增工令") + public ResponseEntity create(@RequestBody JSONObject json){ + wCChangeService.create(json); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改工令") + @ApiOperation("修改工令") + public ResponseEntity update(@RequestBody JSONObject whereJson){ + wCChangeService.update(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除月生产计划") + @ApiOperation("删除月生产计划") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + wCChangeService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/WCChangeService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/WCChangeService.java new file mode 100644 index 00000000..17a0031d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/WCChangeService.java @@ -0,0 +1,59 @@ + +package org.nl.wms.pdm.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.pcs.service.dto.ProductplanprocDto; +import org.springframework.data.domain.Pageable; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + +/** +* @description 服务接口 +* @author Liuxy +* @date 2021-12-13 +**/ +public interface WCChangeService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + /** + * 创建 + * @param json / + */ + void create(JSONObject json); + + /** + * 根据ID查询 + * @param plan_id ID + * @return Productplanproc + */ + ProductplanprocDto findById(Long plan_id); + + /** + * 根据编码查询 + * @param code code + * @return Productplanproc + */ + ProductplanprocDto findByCode(String code); + + /** + * 编辑 + * @param whereJson / + */ + void update(JSONObject whereJson); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WCChangeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WCChangeServiceImpl.java new file mode 100644 index 00000000..f9e7eb2d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WCChangeServiceImpl.java @@ -0,0 +1,128 @@ + +package org.nl.wms.pdm.service.impl; + + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.exception.BadRequestException; +import org.nl.modules.security.service.dto.JwtUserDto; +import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.FileUtil; +import org.nl.utils.SecurityUtils; +import org.nl.wms.basedata.master.service.MaterialbaseService; +import org.nl.wms.pcs.service.dto.ProductplanprocDto; +import org.nl.wms.pdm.service.DailyplanService; +import org.nl.wms.pdm.service.WCChangeService; +import org.nl.wms.pdm.service.WorkOrdereService; +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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; + + +@Service +@RequiredArgsConstructor +@Slf4j +public class WCChangeServiceImpl implements WCChangeService { + + @Override + public Map queryAll(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(whereJson); + + String material_code = map.get("material_code"); + if (StrUtil.isNotEmpty(material_code)) { + map.put("material_code", "%" + material_code + "%"); + } + String supp_code = map.get("supp_code"); + if (StrUtil.isNotEmpty(supp_code)) { + map.put("supp_code", "%" + supp_code + "%"); + } + map.put("flag", "1"); + JSONObject jret = WQL.getWO("QPDM_WCCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.create_time"); + return jret; + } + + + @Override + public ProductplanprocDto findById(Long plan_id) { + WQLObject wo = WQLObject.getWQLObject("pcs_if_productplanproc"); + JSONObject json = wo.query("plan_id =" + plan_id + "").uniqueResult(0); + final ProductplanprocDto obj = json.toJavaObject(ProductplanprocDto.class); + return obj; + } + + @Override + public ProductplanprocDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("pcs_if_productplanproc"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + final ProductplanprocDto obj = json.toJavaObject(ProductplanprocDto.class); + return obj; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(JSONObject json) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getNickName(); + String now = DateUtil.now(); + JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); + Long deptId = currentUser.getDeptId(); + WQLObject PDM_BI_SuppWCChange = WQLObject.getWQLObject("PDM_BI_SuppWCChange"); // 工艺路线主表 + JSONObject mater = PDM_BI_SuppWCChange.query("material_id='"+json.getString("material_id")+"' and supp_id='"+json.getString("supp_id")+"'").uniqueResult(0); + if(mater != null){ + throw new BadRequestException("已存在相同物料和供应商的记录"); + } + + // 插入主表 + json.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + json.put("create_id", currentUserId); + json.put("create_name", nickName); + json.put("create_time", now); + + PDM_BI_SuppWCChange.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(JSONObject json) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getNickName(); + String now = DateUtil.now(); + + WQLObject PDM_BI_SuppWCChange = WQLObject.getWQLObject("PDM_BI_SuppWCChange"); // 工艺路线主表 + JSONObject mater = PDM_BI_SuppWCChange.query("material_id='"+json.getString("material_id")+"' and supp_id='"+json.getString("supp_id")+"'").uniqueResult(0); + if(mater != null){ + if(!json.getString("change_id").equals(mater.getString("change_id"))){ + throw new BadRequestException("已存在相同物料和供应商的记录"); + } + } + + json.put("update_optid", currentUserId); + json.put("update_optname", nickName); + json.put("update_time", now); + PDM_BI_SuppWCChange.update(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + WQLObject PDM_BI_SuppWCChange = WQLObject.getWQLObject("PDM_BI_SuppWCChange"); // 工艺路线主表 + + for (Long change_id : ids) { + PDM_BI_SuppWCChange.delete("change_id='"+change_id+"'"); + } + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WCCHANGE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WCCHANGE.wql new file mode 100644 index 00000000..f41e7ef1 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WCCHANGE.wql @@ -0,0 +1,67 @@ +[交易说明] + 交易名： 月度计划分页查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.material_code TYPEAS s_string + 输入.supp_code TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + pp.*, + materialbase.material_code, + materialbase.material_name + FROM + PDM_BI_SuppWCChange pp + LEFT JOIN md_me_materialbase materialbase ON pp.material_id = materialbase.material_id + WHERE + 1=1 + OPTION 输入.material_code <> "" + (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code) + ENDOPTION + OPTION 输入.supp_code <> "" + (pp.supp_code like 输入.supp_code or pp.supp_name like 输入.supp_code) + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index b22da91b31fb95dada07ce1c2cf43dbd27391f84..ffbca44b3052a3e5c91be3d54319bdf28f8da988 100644 GIT binary patch delta 18302 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 diff --git a/mes/qd/src/api/wms/pdm/wcchange.js b/mes/qd/src/api/wms/pdm/wcchange.js new file mode 100644 index 00000000..5d0fa3a5 --- /dev/null +++ b/mes/qd/src/api/wms/pdm/wcchange.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/wcchange', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/wcchange/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/wcchange', + method: 'put', + data + }) +} + +export function submit(data) { + return request({ + url: 'api/wcchange/submit', + method: 'post', + data + }) +} + +export function openWork(data) { + return request({ + url: 'api/wcchange/openWork', + method: 'post', + data + }) +} + +export function confirmWork(data) { + return request({ + url: 'api/wcchange/confirmWork', + method: 'post', + data + }) +} +export function createPcsn(params) { + return request({ + url: 'api/wcchange/createPcsn', + method: 'get', + params + }) +} +export function getDepts(params) { + return request({ + url: 'api/wcchange/getDepts', + method: 'get', + params + }) +} +export default { add, edit, del, submit, confirmWork, openWork, createPcsn, getDepts } diff --git a/mes/qd/src/views/wms/pdm/base/wcchange/AddDialog.vue b/mes/qd/src/views/wms/pdm/base/wcchange/AddDialog.vue new file mode 100644 index 00000000..4072cc51 --- /dev/null +++ b/mes/qd/src/views/wms/pdm/base/wcchange/AddDialog.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/mes/qd/src/views/wms/pdm/base/wcchange/index.vue b/mes/qd/src/views/wms/pdm/base/wcchange/index.vue new file mode 100644 index 00000000..61056660 --- /dev/null +++ b/mes/qd/src/views/wms/pdm/base/wcchange/index.vue @@ -0,0 +1,169 @@ + + + + diff --git a/mes/qd/src/views/wms/pub/SuppDialog.vue b/mes/qd/src/views/wms/pub/SuppDialog.vue new file mode 100644 index 00000000..a0f82e11 --- /dev/null +++ b/mes/qd/src/views/wms/pub/SuppDialog.vue @@ -0,0 +1,140 @@ + + + +