From 7b360a1743f22a79f50807d0eb1858f9619e826f Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 29 Jun 2023 18:35:44 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=96=B0=E5=A2=9E=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/domain/LockProcess.java | 4 +- .../PcsIfPurchaseorderController.java | 95 +++++- .../purchase/IPcsIfPurchaseorderService.java | 19 ++ .../purchase/dao/PcsIfPurchaseorder.java | 27 +- .../dao/mapper/PcsIfPurchaseorderMapper.java | 1 + .../mapper/xml/PcsIfPurchaseorderMapper.xml | 33 ++ .../purchase/dto/PurchaseOrderQuery.java | 12 +- .../impl/PcsIfPurchaseorderServiceImpl.java | 131 +++++++- .../views/wms/pcs/deliveryorder/Dialog.vue | 2 +- .../views/wms/pcs/purchaseorder/AddDialog.vue | 318 ++++++++++++++++++ .../src/views/wms/pcs/purchaseorder/index.vue | 254 ++++++++++++++ .../views/wms/pcs/purchaseorder/purchase.js | 67 ++++ .../views/wms/pcs/purchaseplan/AddDialog.vue | 318 ++++++++++++++++++ .../wms/pcs/purchaseplan/UploadDialog.vue | 116 +++++++ .../src/views/wms/pcs/purchaseplan/index.vue | 311 +++++++++++++++++ .../views/wms/pcs/purchaseplan/purchase.js | 58 ++++ 16 files changed, 1741 insertions(+), 25 deletions(-) create mode 100644 mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue create mode 100644 mes/qd/src/views/wms/pcs/purchaseorder/index.vue create mode 100644 mes/qd/src/views/wms/pcs/purchaseorder/purchase.js create mode 100644 mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue create mode 100644 mes/qd/src/views/wms/pcs/purchaseplan/UploadDialog.vue create mode 100644 mes/qd/src/views/wms/pcs/purchaseplan/index.vue create mode 100644 mes/qd/src/views/wms/pcs/purchaseplan/purchase.js diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/LockProcess.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/LockProcess.java index 94e48e3c..cee5c321 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/LockProcess.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/LockProcess.java @@ -1,7 +1,9 @@ package org.nl.common.domain; +import java.io.IOException; + @FunctionalInterface public interface LockProcess { - void process(); + void process() throws IOException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java index ea7c19f0..af312ad3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -1,22 +1,28 @@ package org.nl.wms.pcs_manage.controller.purchase; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.ApiOperation; -import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.common.utils.RedissonUtils; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.pcs_manage.PCSEnum; import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; -import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; /** *

@@ -36,8 +42,79 @@ public class PcsIfPurchaseorderController { @GetMapping(value = "/forRawIn") @Log("查询需入库的原料需求") @ApiOperation("查询需入库的原料需求") - public ResponseEntity queryRawIn(PurchaseOrderQuery query, PageQuery page){ - return new ResponseEntity<>(purchaseorderService.queryRawIn(query,page),HttpStatus.OK); + public ResponseEntity queryRawIn(PurchaseOrderQuery query, PageQuery page) { + return new ResponseEntity<>(purchaseorderService.queryRawIn(query, page), HttpStatus.OK); + } + + @GetMapping + @Log("原料需求分页查询") + @ApiOperation("原料需求分页查询") + public ResponseEntity pageQuery(PurchaseOrderQuery query, PageQuery page) { + return new ResponseEntity<>(purchaseorderService.pageQuery(query, page), HttpStatus.OK); + } + + @PostMapping + @Log("新增原料需求") + @ApiOperation("新增原料需求") + public ResponseEntity create(@RequestBody JSONObject whereJson) { + purchaseorderService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/update") + @Log("修改原料需求") + @ApiOperation("修改原料需求") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + purchaseorderService.update(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/commit") + @Log("提交原料需求") + @ApiOperation("提交原料需求") + public ResponseEntity commit(@RequestBody List list) { + list.forEach(order -> { + order.setStatus(PCSEnum.BILL_STATUS.code("提交")); + order.setAudit_id(SecurityUtils.getCurrentUserId()); + order.setAudit_name(SecurityUtils.getCurrentNickName()); + order.setAudit_time(DateUtil.now()); + purchaseorderService.updateById(order); + }); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/getDtl") + @Log("获取原料需求明细") + @ApiOperation("获取原料需求明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(purchaseorderService.getDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/delete") + @Log("删除原料需求") + @ApiOperation("删除原料需求") + public ResponseEntity delete(@RequestBody Long[] ids) { + for (Long id : ids) { + purchaseorderService.update(new UpdateWrapper().eq("id", id).set("is_delete", true)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + public void download(PurchaseOrderQuery query, HttpServletResponse response) throws IOException { + purchaseorderService.download(query, response); + } + + @PostMapping("/excelImport") + @Log("excel导入") + @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + RedissonUtils.lock(() -> { + purchaseorderService.excelImport(file, request, response); + }, "原料需求导入", null); + return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java index e278d4e3..3d4e2ac0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java @@ -6,6 +6,12 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; /** *

@@ -25,6 +31,8 @@ public interface IPcsIfPurchaseorderService extends IService */ Object queryRawIn(PurchaseOrderQuery query, PageQuery page); + Object pageQuery(PurchaseOrderQuery query, PageQuery page); + /** * 修改原料需求表的入库数量并修改状态 * @@ -32,4 +40,15 @@ public interface IPcsIfPurchaseorderService extends IService */ void updatePurchaseNum(JSONObject jo); + List getDtl(JSONObject jo); + + void create(JSONObject form); + + void download(PurchaseOrderQuery query, HttpServletResponse response) throws IOException; + + void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException; + + void update(JSONObject form); + + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java index 62ea37e6..5d1595d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -94,7 +94,12 @@ public class PcsIfPurchaseorder implements Serializable { /** * 状态 */ - private String STATUS; + private String status; + + /** + * 生成方式 + */ + private String create_mode; /** * 创建人 @@ -126,6 +131,21 @@ public class PcsIfPurchaseorder implements Serializable { */ private String audit_name; + /** + * 采购人 + */ + private String purchase_id; + + /** + * 采购人时间 + */ + private String purchase_time; + + /** + * 采购人姓名 + */ + private String purchase_name; + /** * 确认人 */ @@ -151,6 +171,11 @@ public class PcsIfPurchaseorder implements Serializable { */ private Boolean is_delete; + /** + * 部门ID + */ + private String material_code; + /** * 部门ID */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java index 194be7ae..c6debef6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java @@ -21,4 +21,5 @@ import java.util.Map; public interface PcsIfPurchaseorderMapper extends BaseMapper { List getMstDetail(@Param("query") PurchaseOrderQuery query, @Param(value = "pageQuery") PageQuery pageQuery); + List queryAll(@Param("query") PurchaseOrderQuery query, @Param(value = "pageQuery") PageQuery pageQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml index 673eb91c..d69c0330 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml @@ -29,4 +29,37 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java index 290f9ad7..96530cc1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java @@ -16,16 +16,12 @@ public class PurchaseOrderQuery extends BaseQuery { private String bill_code; + private String status; + private String material_search; - private Boolean is_delete = false; - - - @Override - public void paramMapping() { - super.doP.put("bill_code", QParam.builder().k(new String[]{"bill_code"}).type(QueryTEnum.LK).build()); - super.doP.put("material_search", QParam.builder().k(new String[]{"material_search"}).type(QueryTEnum.LK).build()); - } + private String create_mode; + private String workshop_id; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java index a5a92787..740a299a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -1,8 +1,13 @@ package org.nl.wms.pcs_manage.service.purchase.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,19 +15,27 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.tools.service.dto.LocalStorageDto; import org.nl.wms.pcs_manage.PCSEnum; import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMapper; import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; +import org.nl.wms.storage_manage.CHECKEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; import java.math.BigDecimal; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -48,6 +61,79 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = purchaseorderMapper.queryAll(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public List getDtl(JSONObject jo) { + String material_id = jo.getString("material_id"); + return this.list(new QueryWrapper().eq("material_id", material_id).eq("status", PCSEnum.BILL_STATUS.code("生成")).eq("is_delete", false)); + } + + @Override + public void update(JSONObject form) { + JSONArray rows = form.getJSONArray("tableData"); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + PcsIfPurchaseorder purchase = row.toJavaObject(PcsIfPurchaseorder.class); + this.updateById(purchase); + } + } + + @Override + public void download(PurchaseOrderQuery query, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + List mst_detail = purchaseorderMapper.queryAll(query, null); + for (Map dtl : mst_detail) { + Map map = new LinkedHashMap<>(); + map.put("id(不可修改)", dtl.get("id")); + map.put("车间", dtl.get("workshop_id")); + map.put("物料编码", dtl.get("material_code")); + map.put("物料名称", dtl.get("material_name")); + map.put("数量", dtl.get("qty")); + map.put("单位", dtl.get("qty_unit_name")); + map.put("要求到料日期", dtl.get("ask_time")); + map.put("订单编号", dtl.get("po_code")); + map.put("确认到料日期", dtl.get("agree_time")); + map.put("入库数量", dtl.get("instor_qty")); + map.put("状态", dtl.get("status")); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + @Override + public void create(JSONObject form) { + JSONArray rows = form.getJSONArray("tableData"); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + PcsIfPurchaseorder order = new PcsIfPurchaseorder(); + order.setId(IdUtil.getStringId()); + order.setWorkshop_id(form.getString("workshop_id")); + order.setMaterial_id(form.getString("material_id")); + order.setMaterial_code(form.getString("material_code")); + order.setQty(row.getBigDecimal("qty")); + order.setStatus(PCSEnum.BILL_STATUS.code("生成")); + order.setQty_unit_id(form.getString("qty_unit_id")); + order.setQty_unit_name(form.getString("qty_unit_name")); + order.setAsk_time(row.getString("ask_time")); + order.setCreate_mode(CHECKEnum.CREATE_MODE.code("PC产生")); + order.setCreate_id(SecurityUtils.getCurrentUserId()); + order.setCreate_name(SecurityUtils.getCurrentNickName()); + order.setCreate_time(DateUtil.now()); + order.setIs_delete(false); + order.setSyscompanyid("111"); + order.setSysdeptid("111"); + this.save(order); + } + } + @Override public void updatePurchaseNum(JSONObject jo) { String po_code = jo.getString("po_code"); @@ -60,20 +146,55 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl().eq("po_code", po_code)); - if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("完成"))) { + if (purchaseorder.getStatus().equals(PCSEnum.BILL_STATUS.code("完成"))) { throw new BadRequestException("当前单据状态已经完成，无法进行入库数修改！"); } BigDecimal new_instor_qty = NumberUtil.add(instor_qty, purchaseorder.getInstor_qty(), 3); purchaseorder.setQty(new_instor_qty); if (purchaseorder.getTotal_qty().compareTo(new_instor_qty) <= 0) { - purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("完成")); + purchaseorder.setStatus(PCSEnum.BILL_STATUS.code("完成")); purchaseorder.setConfirm_id(SecurityUtils.getCurrentUserId()); purchaseorder.setConfirm_name(SecurityUtils.getCurrentNickName()); purchaseorder.setConfirm_time(DateUtil.now()); } else { - purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("到货中")); + purchaseorder.setStatus(PCSEnum.BILL_STATUS.code("到货中")); } this.updateById(purchaseorder); } + + @Override + public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException { + InputStream inputStream = file.getInputStream(); + ExcelReader excelReader = ExcelUtil.getReader(inputStream); + List> read = excelReader.read(); + + for (int i = 1; i < read.size(); i++) { + List list = read.get(i); + if (ObjectUtil.isEmpty(list)) { + continue; + } + String id = (String) list.get(0); + String po_code = (String) list.get(7); + String agree_time = ((DateTime) list.get(8)).toString("YYYY-MM-dd"); + String status = (String) list.get(10); + PcsIfPurchaseorder order = this.getOne(new QueryWrapper().eq("id", id)); + if (ObjectUtil.isEmpty(order)) { + throw new BadRequestException("未查询到第" + (i + 1) + "行的原料需求！"); + } + try { + if (status.equals(PCSEnum.BILL_STATUS.code("提交"))) { + order.setPo_code(po_code); + order.setAgree_time(agree_time); + order.setStatus(PCSEnum.BILL_STATUS.code("确认采购")); + order.setPurchase_id("0"); + order.setPurchase_name("EXCEL导入"); + order.setPurchase_time(DateUtil.now()); + this.updateById(order); + } + } catch (Exception exception) { + throw new BadRequestException("第" + (i + 1) + "行输入的数据有误！"); + } + } + } } diff --git a/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue b/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue index 04fa9dc0..07f7bb3c 100644 --- a/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue +++ b/mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue @@ -42,7 +42,7 @@ import DateRangePicker from '@/components/DateRangePicker/index' import crudSap from '@/api/wms/ext/sap' export default { - name: 'importOrder', + name: 'ImportOrder', components: {rrOperation, pagination, DateRangePicker}, cruds() { }, diff --git a/mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue b/mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue new file mode 100644 index 00000000..1675164f --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue @@ -0,0 +1,318 @@ + + + + + + diff --git a/mes/qd/src/views/wms/pcs/purchaseorder/index.vue b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue new file mode 100644 index 00000000..f5eda933 --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/mes/qd/src/views/wms/pcs/purchaseorder/purchase.js b/mes/qd/src/views/wms/pcs/purchaseorder/purchase.js new file mode 100644 index 00000000..b427b77f --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseorder/purchase.js @@ -0,0 +1,67 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/pcsIfPurchaseorder', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/pcsIfPurchaseorder/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/pcsIfPurchaseorder/update', + method: 'post', + data + }) +} + +export function confirm(data) { + return request({ + url: '/api/pcsIfPurchaseorder/confirm', + method: 'post', + data + }) +} + +export function getDtl(data) { + return request({ + url: '/api/pcsIfPurchaseorder/getDtl', + method: 'post', + data + }) +} + +export function commit(data) { + return request({ + url: '/api/pcsIfPurchaseorder/commit', + method: 'post', + data + }) +} + +export function excelImport(data) { + return request({ + url: '/api/pcsIfPurchaseorder/excelImport', + method: 'post', + data + }) +} + +export default { + add, + edit, + del, + confirm, + getDtl, + commit, + excelImport +} diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue b/mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue new file mode 100644 index 00000000..1675164f --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue @@ -0,0 +1,318 @@ + + + + + + diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/UploadDialog.vue b/mes/qd/src/views/wms/pcs/purchaseplan/UploadDialog.vue new file mode 100644 index 00000000..636827eb --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseplan/UploadDialog.vue @@ -0,0 +1,116 @@ + + + + diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue new file mode 100644 index 00000000..9a2d4504 --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue @@ -0,0 +1,311 @@ + + + + + diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/purchase.js b/mes/qd/src/views/wms/pcs/purchaseplan/purchase.js new file mode 100644 index 00000000..1837c165 --- /dev/null +++ b/mes/qd/src/views/wms/pcs/purchaseplan/purchase.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/pcsIfPurchaseorder', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/pcsIfPurchaseorder/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/pcsIfPurchaseorder/update', + method: 'post', + data + }) +} + +export function confirm(data) { + return request({ + url: '/api/pcsIfPurchaseorder/confirm', + method: 'post', + data + }) +} + +export function getDtl(data) { + return request({ + url: '/api/pcsIfPurchaseorder/getDtl', + method: 'post', + data + }) +} + +export function commit(data) { + return request({ + url: '/api/pcsIfPurchaseorder/commit', + method: 'post', + data + }) +} + +export default { + add, + edit, + del, + confirm, + getDtl, + commit +}