From 392443fbf49d5df6c868fa19791f79d45869a9bd Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 31 May 2023 09:13:07 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8D=8A=E6=88=90=E5=93=81=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E3=80=81=E6=8B=BC=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/xml/StIvtIostorinvYlMapper.xml | 2 +- .../impl/StIvtStructivtYlServiceImpl.java | 12 +- .../iostorInv/SemiProductOutController.java | 165 ------ .../StIvtIostorinvBcpOutController.java | 111 ++++ .../StIvtShutframeinvBcpController.java | 17 + .../StIvtStructivtBcpController.java | 32 +- .../IStIvtIostorinvBcpOutService.java | 51 ++ .../iostorInv/dao/StIvtIostorinvBcp.java | 4 +- .../impl/StIvtIostorinvBcpOutServiceImpl.java | 210 ++++++++ .../impl/StIvtIostorinvBcpServiceImpl.java | 7 +- .../structIvt/IStIvtStructivtBcpService.java | 15 + .../dao/mapper/StIvtStructivtBcpMapper.java | 11 +- .../mapper/xml/StIvtStructivtBcpMapper.xml | 65 +++ .../structIvt/dto/StructIvtBcpQuery.java | 33 ++ .../impl/StIvtStructivtBcpServiceImpl.java | 38 +- mes/qd/src/assets/icons/svg/拼托.svg | 1 + .../semiproduct/semiProductIn/index.vue | 5 +- .../semiproductMoreOrless/AddDialog.vue | 485 ++++++++++++++++++ .../semiproductShutFrame/AddDialog.vue | 365 +++++++++++++ .../semiproductShutFrame/index.vue | 300 +++++++++++ .../semiproductShutFrame/shutframe.js | 110 ++++ .../semiproduct/semiproductout/AddDialog.vue | 140 ++--- .../semiproduct/semiproductout/StructIvt.vue | 153 ++++++ .../semiproduct/semiproductout/index.vue | 11 +- .../semiproductout/semiproductout.js | 40 +- 25 files changed, 2060 insertions(+), 323 deletions(-) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/SemiProductOutController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java create mode 100644 mes/qd/src/assets/icons/svg/拼托.svg create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml index 375b8f8c..53fb1399 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml @@ -38,7 +38,7 @@ mst.is_delete = '0' AND - io_type = '1' + io_type = '0' and mst.create_time >= #{query.start_time} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java index 72e0a5ec..b1eba28e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java @@ -1,16 +1,14 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtYlMapper; -import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -27,12 +25,10 @@ import java.util.Map; @Service public class StIvtStructivtYlServiceImpl extends ServiceImpl implements IStIvtStructivtYlService { - @Autowired - private StIvtStructivtYlMapper structivtYlMapper; @Override public Object getRawIvt(StructIvtYLQuery query, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); - List mst_detail = structivtYlMapper.getRawIvt(query, pageQuery); + List mst_detail = this.baseMapper.getRawIvt(query, pageQuery); TableDataInfo build = TableDataInfo.build(mst_detail); build.setTotalElements(page.getTotal()); return build; @@ -40,6 +36,6 @@ public class StIvtStructivtYlServiceImpl extends ServiceImpl getStructIvt(StructIvtYLQuery query) { - return structivtYlMapper.getStructIvt(query); + return this.baseMapper.getStructIvt(query); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/SemiProductOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/SemiProductOutController.java deleted file mode 100644 index a9d67342..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/SemiProductOutController.java +++ /dev/null @@ -1,165 +0,0 @@ -//package org.nl.wms.storage_manage.semimanage.controller; -// -//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.common.anno.Log; -//import org.nl.wms.storage_manage.service.product.SemiProductOutService; -//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/semiproductOut") -//@Slf4j -//public class SemiProductOutController{ -// private final SemiProductOutService semiProductOutService; -// -// @GetMapping -// @Log("查询出库单") -// @ApiOperation("查询出库单") -// public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ -// return new ResponseEntity<>(semiProductOutService.pageQuery(whereJson,page), HttpStatus.OK); -// } -// -// @GetMapping("/addDtl") -// @Log("查询库存") -// @ApiOperation("查询库存") -// public ResponseEntity queryAddDtl(@RequestParam Map whereJson, Pageable page){ -// return new ResponseEntity<>(semiProductOutService.queryAddDtl(whereJson,page), HttpStatus.OK); -// } -// -// @GetMapping("/queryDtl") -// @Log("查询明细") -// @ApiOperation("查询明细") -// public ResponseEntity queryDtl(@RequestParam Map whereJson, Pageable page){ -// return new ResponseEntity<>(semiProductOutService.queryDtl(whereJson,page), HttpStatus.OK); -// } -// -// @PostMapping("/getOutBillDtl") -// @Log("查询分配明细") -// @ApiOperation("查询分配明细") -// public ResponseEntity getOutBillDtl(@RequestBody JSONObject whereJson){ -// return new ResponseEntity<>(semiProductOutService.getOutBillDtl(whereJson), HttpStatus.OK); -// } -// -// @Log("删除出库单") -// @ApiOperation("删除出库单") -// @DeleteMapping -// public ResponseEntity delete(@RequestBody Long[] ids) { -// semiProductOutService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -// -// @PutMapping -// @Log("修改出库单") -// @ApiOperation("修改出库单") -// public ResponseEntity update(@RequestBody JSONObject whereJson){ -// semiProductOutService.update(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping() -// @Log("新增出库单") -// @ApiOperation("新增出库单") -// public ResponseEntity insertDtl(@RequestBody JSONObject whereJson){ -// semiProductOutService.insertDtl(whereJson); -// return new ResponseEntity<>(HttpStatus.CREATED); -// } -// -// @PostMapping("/allDiv") -// @Log("出库单全部分配") -// @ApiOperation("出库单全部分配") -// public ResponseEntity allDiv(@RequestBody JSONObject whereJson) { -// semiProductOutService.allDiv(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/allDivOne") -// @Log("分配一条出库明细") -// @ApiOperation("分配一条出库明细") -// public ResponseEntity allDivOne(@RequestBody JSONObject whereJson) { -// semiProductOutService.allDivOne(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/allCancel") -// @Log("出库单全部取消") -// @ApiOperation("出库单全部取消") -// public ResponseEntity allCancel(@RequestBody JSONObject whereJson) { -// semiProductOutService.allCancel(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/oneCancel") -// @Log("出库单全部取消") -// @ApiOperation("出库单全部取消") -// public ResponseEntity oneCancel(@RequestBody JSONObject whereJson) { -// semiProductOutService.oneCancel(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/getOutBillDis") -// @Log("查询出库单分配明细") -// @ApiOperation("查询出库单分配明细") -// public ResponseEntity getOutBillDis(@RequestBody JSONObject whereJson){ -// return new ResponseEntity<>(semiProductOutService.getOutBillDis(whereJson), HttpStatus.OK); -// } -// -// @PostMapping("/allSetPoint") -// @Log("设置全部站点") -// @ApiOperation("设置全部站点") -// public ResponseEntity allSetPoint(@RequestBody JSONObject whereJson) { -// semiProductOutService.allSetPoint(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/manualDiv") -// @Log("出库单手动分配") -// @ApiOperation("出库单手动分配") -// public ResponseEntity manualDiv(@RequestBody JSONObject whereJson) { -// semiProductOutService.manualDiv(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/confirm") -// @Log("出库单强制确认") -// @ApiOperation("出库单强制确认") -// public ResponseEntity confirm(@RequestBody JSONObject whereJson) { -// semiProductOutService.confirm(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/finishTask") -// @Log("出库任务手动完成") -// @ApiOperation("出库任务手动完成") -// public ResponseEntity finishTask(@RequestBody JSONObject whereJson) { -// semiProductOutService.finishTask(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @PostMapping("/backConfirm") -// @Log("出库单强制确认") -// @ApiOperation("出库单强制确认") -// public ResponseEntity backConfirm(@RequestBody JSONObject whereJson) { -// semiProductOutService.backConfirm(whereJson); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } -// -// @Log("下载发货单Excel") -// @ApiOperation("下载发货单Excel") -// @GetMapping(value = "/downloadExcel") -// public ResponseEntity downloadExcel(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { -// semiProductOutService.downloadExcel(response,whereJson); -// return new ResponseEntity<>(HttpStatus.OK); -// } -//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java new file mode 100644 index 00000000..e8750f83 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java @@ -0,0 +1,111 @@ +package org.nl.wms.storage_manage.semimanage.controller.iostorInv; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + *

+ * 出入库记录表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@Api(tags = "半成品出库") +@RequestMapping("/api/out/semiproduct") +@Slf4j +@SaIgnore +public class StIvtIostorinvBcpOutController { + + @Autowired + private IStIvtIostorinvBcpOutService bcpOutService; + + @GetMapping + @Log("查询入库单据") + @ApiOperation("查询入库单据") + public ResponseEntity query(BcpIostorInvQuery query, PageQuery page) { + return new ResponseEntity<>(bcpOutService.queryDtl(query,page), HttpStatus.OK); + } + + @PostMapping("/create") + @Log("新增出库单") + @ApiOperation("新增出库单") + public ResponseEntity create(@RequestBody JSONObject form) { + bcpOutService.create(form); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @Log("删除出入库单") + @ApiOperation("删除出入库单") + @PostMapping("/delete") + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length>0){ + bcpOutService.update(new UpdateWrapper() + .set("is_delete","1") + .in("iostorinv_id",ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + + @PostMapping("/update") + @Log("修改出库单") + @ApiOperation("修改出库单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + bcpOutService.updateBill(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + + @PostMapping("/commit") + @Log("出入单提交") + @ApiOperation("出入单提交") + public ResponseEntity commit(@RequestBody Map whereJson) { + //semiProductInService.commit(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/getIODtl") + @Log("查询入库分配明细") + @ApiOperation("查询入库分配明细") + public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(bcpOutService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK); + } + + + @PostMapping("/confirm") + @Log("完成单据") + @ApiOperation("完成单据") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + bcpOutService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/confirmTask") + @Log("下发任务") + @ApiOperation("下发任务") + public ResponseEntity confirmTask(@RequestBody JSONObject whereJson) { + bcpOutService.confirmTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java index a2b97c74..70053e2b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java @@ -1,6 +1,15 @@ package org.nl.wms.storage_manage.semimanage.controller.shutFrame; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframeinvBcpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,5 +26,13 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/stIvtShutframeinvBcp") public class StIvtShutframeinvBcpController { +// @Autowired +// private IStIvtShutframeinvBcpService shutframeinvBcpService; +// @PostMapping("/create") +// @Log("创建拼盘单") +// @ApiOperation("创建拼盘单") +// public ResponseEntity create(@RequestBody JSONObject jo) { +// return new ResponseEntity<>(shutframeinvBcpService.create(jo), HttpStatus.OK); +// } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java index 6fdb667f..54b04ded 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java @@ -1,9 +1,17 @@ package org.nl.wms.storage_manage.semimanage.controller.structLvt; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; +import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; /** *

@@ -14,8 +22,24 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtBcp") +@RequestMapping("/api/bcp") public class StIvtStructivtBcpController { + @Autowired + private IStIvtStructivtBcpService bcpService; + + @GetMapping("/getBcpIvt") + @Log("查询可用的半成品库存") + @ApiOperation("查询可用的半成品库存") + public ResponseEntity getBcpIvt(StructIvtBcpQuery query, PageQuery page) { + return new ResponseEntity<>(bcpService.getBcpIvt(query, page), HttpStatus.OK); + } + + @PostMapping("/getBcpIvtInfo") + @Log("查询可用的半成品库存") + @ApiOperation("查询可用的半成品库存") + public ResponseEntity getBcpIvtInfo(@RequestBody JSONObject jo) { + return new ResponseEntity<>(bcpService.getBcpIvtInfo(jo), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java new file mode 100644 index 00000000..1b9b34b8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java @@ -0,0 +1,51 @@ +package org.nl.wms.storage_manage.semimanage.service.iostorInv; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 出入库记录表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IStIvtIostorinvBcpOutService extends IService { + + + Object queryDtl(BcpIostorInvQuery query, PageQuery page); + + List getIoDtl(BcpIostorInvQuery query); + /** + * 新增 + * @param form + * @return + */ + void create(JSONObject form); + /** + * 完成 + * @param form + * @return + */ + String confirm(JSONObject form); + /** + * 下发单据 + * @param form + * @return + */ + String confirmTask(JSONObject form); + /** + * 修改单据 + * @param form + * @return + */ + String updateBill(JSONObject form); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java index f23792d8..f3e0f3df 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java @@ -146,12 +146,12 @@ public class StIvtIostorinvBcp implements Serializable { /** * 数量计量单位标识 */ - private String base_unit_id; + private String qty_unit_id; /** * 数量计量单位名称 */ - private String base_unit_name; + private String qty_unit_name; /** * 创建人 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java new file mode 100644 index 00000000..b466ccd3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -0,0 +1,210 @@ +package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.jsonwebtoken.lang.Assert; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.publish.BussEventMulticaster; +import org.nl.common.publish.event.PointEvent; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; +import org.nl.wms.storage_manage.productmanage.util.RuleUtil; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper.StIvtIostorinvBcpMapper; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +/** + *

+ * 出入库记录表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl implements IStIvtIostorinvBcpOutService { + + @Autowired + private IStIvtBsrealstorattrService storattrService; + @Autowired + private IStIvtStructivtBcpService structivtBcpService; + @Autowired + private IStIvtStructivtflowService structivtflowService; + @Autowired + private IStIvtStructattrService structattrService; + @Autowired + private DivRuleCpService divRuleCpService; + @Autowired + private IStIvtSectattrService sectattrService; + + + @Override + public Object queryDtl(BcpIostorInvQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.getIoDtl(query)); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public List getIoDtl(BcpIostorInvQuery query) { + return this.baseMapper.getIostorinv(query); + } + + @Override + @Transactional + public void create(JSONObject form) { + Assert.notNull(form, "参数不能为空"); + for (Object item : form.getJSONArray("tableData")) { + StIvtIostorinvBcp mst = new StIvtIostorinvBcp(); + mst.setIostorinv_id(IdUtil.getStringId()); + mst.setBill_code(CodeUtil.getNewCode("IO_CODE")); + mst.setBiz_date(form.getString("biz_date")); + mst.setBill_type(form.getString("bill_type")); + mst.setIo_type(IOSEnum.IO_TYPE.code("出库")); + mst.setBill_status(IOSEnum.BILL_STATUS.code("生成")); + mst.setRemark(form.getString("remark")); + mst.setWorkshop_id(form.getString("product_code")); + mst.setPoint_code(form.getString("point_code")); + 仓库数据: + { + StIvtBsrealstorattr stor = storattrService.getOne(new QueryWrapper().eq("stor_id", form.getString("stor_id"))); + mst.setStor_id(stor.getStor_id()); + mst.setStor_code(stor.getStor_code()); + mst.setStor_name(stor.getStor_name()); + } + packageRow(mst, (JSONObject) item); + mst.setCreate_id(SecurityUtils.getCurrentUserId()); + mst.setCreate_name(SecurityUtils.getCurrentNickName()); + mst.setCreate_time(DateUtil.now()); + this.save(mst); + } + } + + private void packageRow(StIvtIostorinvBcp mst, JSONObject row) { + mst.setMaterial_id(row.getString("material_id")); + mst.setPcsn(StringUtils.isNotEmpty(row.getString("pcsn")) ? row.getString("pcsn") : DateUtil.today()); + mst.setPlan_qty(row.getBigDecimal("plan_qty")); + mst.setQuality_scode(row.getString("quality_scode")); + mst.setQty_unit_id(row.getString("qty_unit_id")); + mst.setBase_bill_code(row.getString("base_bill_code")); + mst.setQty_unit_name(row.getString("qty_unit_name")); + mst.setUnit_weight(row.getBigDecimal("unit_weight")); + mst.setStoragevehicle_code(row.getString("storagevehicle_code")); + mst.setStoragevehicle_id(row.getString("storagevehicle_id")); + mst.setSect_id(row.getString("sect_id")); + mst.setSect_code(row.getString("sect_code")); + mst.setSect_name(row.getString("sect_name")); + mst.setStruct_id(row.getString("struct_id")); + mst.setStruct_code(row.getString("struct_code")); + mst.setStruct_name(row.getString("struct_name")); + } + + @Override + @Transactional + public String confirm(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id")); + //checkParam(mst); + if (StringUtils.isEmpty(mst.getStruct_code())) { + throw new BadRequestException("当前入库单还未分配仓位！"); + } + + mst.setBill_status(IOSEnum.BILL_STATUS.code("完成")); + mst.setUpdate_time(DateUtil.now()); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(mst); + + //删除库存 + structivtBcpService.remove(new QueryWrapper().eq("struct_id",mst.getStruct_id())); + + /*structivtflowService.recordStructivtFlow( + StIvtStructivtflowDto.builder() + .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp") + .material_id(mst.getMaterial_id()).pcsn(mst.getPcsn()) + .struct_code(mst.getStruct_code()).result_qty(structivtBcpService.getOne(new QueryWrapper().eq("struct_code", mst.getStruct_code())).getCanuse_qty()).change_qty(mst.getPlan_qty()) + .task_id(mst.getTask_id()) + .storagevehicle_code(mst.getStoragevehicle_code()) + .build() + );*/ + return null; + } + + @Override + public String confirmTask(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id")); + checkParam(mst); + + PointEvent event = PointEvent.builder() + .type(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND.getCode()) + .point_code1(mst.getPoint_code()) + .point_code2(mst.getStruct_code()) + .callback((Consumer) mst::setTask_id) + .build(); + BussEventMulticaster.Publish(event); + + mst.setWork_status(IOSEnum.WORK_STATUS.code("生成")); + mst.setBill_status(IOSEnum.BILL_STATUS.code("分配完")); + mst.setUpdate_time(DateUtil.now()); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(mst); + return mst.getTask_id(); + } + + private void checkParam(StIvtIostorinvBcp mst) { + if (mst == null || mst.getIs_delete() == true) { + throw new BadRequestException("单据不存在"); + } + if (!IOSEnum.BILL_STATUS.code("生成").equals(mst.getBill_status())) { + throw new BadRequestException("单据" + mst.getBill_code() + "状态不是生成状态"); + } + } + + @Override + @Transactional + public String updateBill(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + StIvtIostorinvBcp mst = form.toJavaObject(StIvtIostorinvBcp.class); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + mst.setUpdate_time(DateUtil.now()); + for (Object item : form.getJSONArray("tableData")) { + packageRow(mst, (JSONObject) item); + } + this.updateById(mst); + return mst.getIostorinv_id(); + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index 43683fb5..dbfb5157 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -119,9 +119,9 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl @@ -21,4 +26,14 @@ public interface IStIvtStructivtBcpService extends IService { void updateCashByParam(CHANGE_BILL_TYPE_ENUM event, BigDecimal plan_qty,String struct_code); + /** + * 分页查询可用的原料库存 + * + * @param query,page / + * @return JSONObject + */ + Object getBcpIvt(StructIvtBcpQuery query, PageQuery page); + + List getBcpIvtInfo(JSONObject jo); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java index e1764fca..63c18ed2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java @@ -1,8 +1,11 @@ package org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper; -import org.apache.ibatis.annotations.Param; -import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery; import java.util.List; import java.util.Map; @@ -19,5 +22,9 @@ public interface StIvtStructivtBcpMapper extends BaseMapper { int batchUpdateByParam(@Param("event") List event, @Param("struct_code")String struct_code); + List getBcpIvt(@Param("query") StructIvtBcpQuery query, @Param("pageQuery") PageQuery pageQuery); + + List getBcpIvtInfo(@Param("map") JSONObject map); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index 0a87ed63..2d7c9a88 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -19,4 +19,69 @@ where struct_code = #{struct_code} + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java new file mode 100644 index 00000000..60124525 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java @@ -0,0 +1,33 @@ +package org.nl.wms.storage_manage.semimanage.service.structIvt.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class StructIvtBcpQuery extends BaseQuery { + + + private String sect_id; + + private String struct_search; + + private String material_search; + + private Boolean is_delete = false; + + + @Override + public void paramMapping() { + super.doP.put("material_search", QParam.builder().k(new String[]{"material_search"}).type(QueryTEnum.LK).build()); + super.doP.put("struct_search", QParam.builder().k(new String[]{"struct_search"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java index 322bb859..c9099df5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java @@ -1,15 +1,19 @@ package org.nl.wms.storage_manage.semimanage.service.structIvt.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; -import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; -import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; +import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService; import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper; -import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,29 +37,43 @@ public class StIvtStructivtBcpServiceImpl extends ServiceImpl getBcpIvtInfo(JSONObject jo) { + return this.baseMapper.getBcpIvtInfo(jo); + } + + @Override + public Object getBcpIvt(StructIvtBcpQuery query, PageQuery pageQuery) { + com.github.pagehelper.Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = this.baseMapper.getBcpIvt(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + @Override public List allocationRules(Integer num) { QueryWrapper query = new QueryWrapper() .eq("is_active", true) .isNull("material_id"); Page page = this.page(new Page<>(0, 3), query); - List records = page.getRecords(); + List records = page.getRecords(); return records; } @Override public void updateCashByParam(CHANGE_BILL_TYPE_ENUM event, BigDecimal plan_qty, String struct_code) { - if (!StringUtils.isEmpty(struct_code)){ + if (!StringUtils.isEmpty(struct_code)) { Map fieldRelation = event.getFieldRelation(); ArrayList list = new ArrayList<>(); for (Map.Entry entry : fieldRelation.entrySet()) { Map map = new HashMap<>(); - map.put("field",entry.getKey()); - map.put("value",plan_qty); - map.put("add",entry.getValue()); + map.put("field", entry.getKey()); + map.put("value", plan_qty); + map.put("add", entry.getValue()); list.add(map); } - this.baseMapper.batchUpdateByParam(list,struct_code); + this.baseMapper.batchUpdateByParam(list, struct_code); } } } diff --git a/mes/qd/src/assets/icons/svg/拼托.svg b/mes/qd/src/assets/icons/svg/拼托.svg new file mode 100644 index 00000000..47ee02fb --- /dev/null +++ b/mes/qd/src/assets/icons/svg/拼托.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue index 20d02bdc..5bd9cac5 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue @@ -161,7 +161,8 @@ - + + @@ -257,7 +258,7 @@ export default { return Number(val).toFixed(3) }, canUd(row) { - return row.bill_status == '1002' + return row.bill_status !== '10' }, handleSelectionChange(val, row) { if (val.length > 1) { diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue new file mode 100644 index 00000000..86feabc0 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue @@ -0,0 +1,485 @@ + + + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue new file mode 100644 index 00000000..7af0c490 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue @@ -0,0 +1,365 @@ + + + + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue new file mode 100644 index 00000000..4bbf70cc --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue @@ -0,0 +1,300 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js new file mode 100644 index 00000000..4e46b804 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js @@ -0,0 +1,110 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/shutframe', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/shutframe/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/shutframe', + method: 'put', + data + }) +} + +export function getOutBillDtl(params) { + return request({ + url: '/api/shutframe/getOutBillDtl', + method: 'get', + params + }) +} +export function getOutBillDtl2(params) { + return request({ + url: '/api/shutframe/getOutBillDtl2', + method: 'get', + params + }) +} +export function getInvTypes() { + return request({ + url: '/api/shutframe/getInvTypes', + method: 'get' + }) +} +export function insertDtl(data) { + return request({ + url: '/api/shutframe/insertDtl', + method: 'post', + data + }) +} +export function getBcpIvtInfo(data) { + return request({ + url: '/api/bcp/getBcpIvtInfo', + method: 'post', + data + }) +} +export function getStructIvt2(params) { + return request({ + url: '/api/shutframe/getStructIvt2', + method: 'get', + params + }) +} +export function getStruct(params) { + return request({ + url: '/api/shutframe/getStruct', + method: 'get', + params + }) +} +export function handdown(data) { + return request({ + url: '/api/shutframe/handdown', + method: 'post', + data + }) +} +export function getOutBillTask(params) { + return request({ + url: '/api/shutframe/getOutBillTask', + method: 'get', + params + }) +} +export function issueTask(data) { + return request({ + url: '/api/shutframe/issueTask', + method: 'post', + data + }) +} +export function finishTask(data) { + return request({ + url: '/api/shutframe/finishTask', + method: 'post', + data + }) +} +export function allCancel(data) { + return request({ + url: '/api/shutframe/allCancel', + method: 'post', + data + }) +} +export default { add, edit, del, getOutBillDtl, allCancel, getBcpIvtInfo, getOutBillTask, finishTask, issueTask, getInvTypes, handdown, getOutBillDtl2, getStructIvt2, getStruct } diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue index 2cc37efc..879a7294 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue @@ -11,23 +11,26 @@ > - + - 保存 + 保存 关闭 - + - + - + @@ -99,7 +102,7 @@ - + @@ -113,7 +116,8 @@ - + @@ -121,7 +125,7 @@
- + - 添加物料 + 添加库存物料 @@ -143,58 +147,14 @@ border :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + - - - - - - - - - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue index 82df5bf7..61e3c432 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue @@ -157,12 +157,11 @@ - - - + + @@ -257,7 +256,7 @@ export default { return Number(val).toFixed(3) }, canUd(row) { - return row.bill_status == '1002' + return row.bill_status !== '10' }, handleSelectionChange(val, row) { if (val.length > 1) { @@ -297,7 +296,7 @@ export default { } }, bill_typeFormat(row, column) { - return this.dict.label.bill_type[row.bill_type] + return this.dict.label.ST_INV_OUT_TYPE[row.bill_type] }, toView(row) { this.mstrow = row @@ -314,6 +313,7 @@ export default { } crudsemiproductout.confirm(this.currentRow).then(res => { this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.refresh() }) }, confirmTask() { @@ -323,6 +323,7 @@ export default { } crudsemiproductout.confirmTask(this.currentRow).then(res => { this.crud.notify('单据下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.refresh() }) }, stateFormat(row, column) { diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/semiproductout.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/semiproductout.js index 5f35a9a9..d7b91c10 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/semiproductout.js +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/semiproductout.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: '/api/in/semiproductIn/create', + url: '/api/out/semiproduct/create', method: 'post', data }) @@ -10,7 +10,7 @@ export function add(data) { export function del(ids) { return request({ - url: '/api/in/semiproductIn/delete', + url: '/api/out/semiproduct/delete', method: 'post', data: ids }) @@ -18,7 +18,7 @@ export function del(ids) { export function edit(data) { return request({ - url: '/api/in/semiproductIn/update', + url: '/api/out/semiproduct/update', method: 'post', data }) @@ -26,7 +26,7 @@ export function edit(data) { export function getType(params) { return request({ - url: '/api/in/semiproductIn/getType', + url: '/api/out/semiproduct/getType', method: 'get', params }) @@ -34,7 +34,7 @@ export function getType(params) { export function getIODtl(data) { return request({ - url: '/api/in/semiproductIn/getIODtl', + url: '/api/out/semiproduct/getIODtl', method: 'post', data }) @@ -42,7 +42,7 @@ export function getIODtl(data) { export function insertDtl(data) { return request({ - url: '/api/in/semiproductIn/insertDtl', + url: '/api/out/semiproduct/insertDtl', method: 'post', data }) @@ -50,7 +50,7 @@ export function insertDtl(data) { export function commit(data) { return request({ - url: '/api/in/semiproductIn/commit', + url: '/api/out/semiproduct/commit', method: 'post', data }) @@ -58,7 +58,7 @@ export function commit(data) { export function checkVehicle(data) { return request({ - url: '/api/in/semiproductIn/checkVehicle', + url: '/api/out/semiproduct/checkVehicle', method: 'post', data }) @@ -66,7 +66,7 @@ export function checkVehicle(data) { export function confirmvehicle(data) { return request({ - url: '/api/in/semiproductIn/confirmvehicle', + url: '/api/out/semiproduct/confirmvehicle', method: 'post', data }) @@ -74,7 +74,7 @@ export function confirmvehicle(data) { export function getDisDtl(data) { return request({ - url: '/api/in/semiproductIn/getDisDtl', + url: '/api/out/semiproduct/getDisDtl', method: 'post', data }) @@ -82,7 +82,7 @@ export function getDisDtl(data) { export function divStruct(data) { return request({ - url: '/api/in/semiproductIn/divStruct', + url: '/api/out/semiproduct/divStruct', method: 'post', data }) @@ -90,7 +90,7 @@ export function divStruct(data) { export function unDivStruct(data) { return request({ - url: '/api/in/semiproductIn/unDivStruct', + url: '/api/out/semiproduct/unDivStruct', method: 'post', data }) @@ -98,7 +98,7 @@ export function unDivStruct(data) { export function divPoint(data) { return request({ - url: '/api/in/semiproductIn/divPoint', + url: '/api/out/semiproduct/divPoint', method: 'post', data }) @@ -106,7 +106,7 @@ export function divPoint(data) { export function bucketDtl(data) { return request({ - url: '/api/in/semiproductIn/bucketDtl', + url: '/api/out/semiproduct/bucketDtl', method: 'post', data }) @@ -114,7 +114,7 @@ export function bucketDtl(data) { export function updateTask(data) { return request({ - url: '/api/in/semiproductIn/updateTask', + url: '/api/out/semiproduct/updateTask', method: 'post', data }) @@ -122,7 +122,7 @@ export function updateTask(data) { export function confirmTask(data) { return request({ - url: '/api/in/semiproductIn/confirmTask', + url: '/api/out/semiproduct/confirmTask', method: 'post', data }) @@ -130,7 +130,7 @@ export function confirmTask(data) { export function confirm(data) { return request({ - url: '/api/in/semiproductIn/confirm', + url: '/api/out/semiproduct/confirm', method: 'post', data }) @@ -138,7 +138,7 @@ export function confirm(data) { export function delDis(data) { return request({ - url: '/api/in/semiproductIn/delDis', + url: '/api/out/semiproduct/delDis', method: 'post', data }) @@ -146,7 +146,7 @@ export function delDis(data) { export function queryBoxMater(data) { return request({ - url: '/api/in/semiproductIn/queryBoxMater', + url: '/api/out/semiproduct/queryBoxMater', method: 'post', data }) @@ -161,7 +161,7 @@ export function queryStor() { export function getDisTask(data) { return request({ - url: '/api/in/semiproductIn/getDisTask', + url: '/api/out/semiproduct/getDisTask', method: 'post', data })