root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-31 11:04:40 +08:00
parent efc8ade0ef 918bf7964b
commit 432e5e020d
27 changed files with 2076 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml
View File

@@ -35,7 +35,7 @@
<where>
mst.is_delete = '0'
AND
io_type = '2'
io_type = '1'
<if test="query.start_time != null">
and mst.create_time >= #{query.start_time}
</if>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml
View File

@@ -38,7 +38,7 @@
<where>
mst.is_delete = '0'
AND
io_type = '1'
io_type = '0'
<if test="query.start_time != null">
and mst.create_time >= #{query.start_time}
</if>

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
View File

@@ -32,6 +32,7 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlY
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvOutYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService;
@@ -53,7 +54,7 @@ import java.util.Map;
* @since 2023-05-10
*/
@Service
public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMapper, StIvtIostorinvYl> implements IStIvtIostorinvOutYlService {
public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvOutYlMapper, StIvtIostorinvYl> implements IStIvtIostorinvOutYlService {
@Autowired
private IStIvtBsrealstorattrService stIvtBsrealstorattrService;

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java
View File

@@ -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<StIvtStructivtYlMapper, StIvtStructivtYl> implements IStIvtStructivtYlService {
@Autowired
private StIvtStructivtYlMapper structivtYlMapper;
@Override
public Object getRawIvt(StructIvtYLQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
List<Map> mst_detail = structivtYlMapper.getRawIvt(query, pageQuery);
List<Map> mst_detail = this.baseMapper.getRawIvt(query, pageQuery);
TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
build.setTotalElements(page.getTotal());
return build;
@@ -40,6 +36,6 @@ public class StIvtStructivtYlServiceImpl extends ServiceImpl<StIvtStructivtYlMap
@Override
public List<Map> getStructIvt(StructIvtYLQuery query) {
return structivtYlMapper.getStructIvt(query);
return this.baseMapper.getStructIvt(query);
}
}

165
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/SemiProductOutController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page){
// return new ResponseEntity<>(semiProductOutService.pageQuery(whereJson,page), HttpStatus.OK);
// }
//
// @GetMapping("/addDtl")
// @Log("查询库存")
// @ApiOperation("查询库存")
// public ResponseEntity<Object> queryAddDtl(@RequestParam Map whereJson, Pageable page){
// return new ResponseEntity<>(semiProductOutService.queryAddDtl(whereJson,page), HttpStatus.OK);
// }
//
// @GetMapping("/queryDtl")
// @Log("查询明细")
// @ApiOperation("查询明细")
// public ResponseEntity<Object> queryDtl(@RequestParam Map whereJson, Pageable page){
// return new ResponseEntity<>(semiProductOutService.queryDtl(whereJson,page), HttpStatus.OK);
// }
//
// @PostMapping("/getOutBillDtl")
// @Log("查询分配明细")
// @ApiOperation("查询分配明细")
// public ResponseEntity<Object> getOutBillDtl(@RequestBody JSONObject whereJson){
// return new ResponseEntity<>(semiProductOutService.getOutBillDtl(whereJson), HttpStatus.OK);
// }
//
// @Log("删除出库单")
// @ApiOperation("删除出库单")
// @DeleteMapping
// public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
// semiProductOutService.deleteAll(ids);
// return new ResponseEntity<>(HttpStatus.OK);
// }
//
// @PutMapping
// @Log("修改出库单")
// @ApiOperation("修改出库单")
// public ResponseEntity<Object> update(@RequestBody JSONObject whereJson){
// semiProductOutService.update(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping()
// @Log("新增出库单")
// @ApiOperation("新增出库单")
// public ResponseEntity<Object> insertDtl(@RequestBody JSONObject whereJson){
// semiProductOutService.insertDtl(whereJson);
// return new ResponseEntity<>(HttpStatus.CREATED);
// }
//
// @PostMapping("/allDiv")
// @Log("出库单全部分配")
// @ApiOperation("出库单全部分配")
// public ResponseEntity<Object> allDiv(@RequestBody JSONObject whereJson) {
// semiProductOutService.allDiv(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/allDivOne")
// @Log("分配一条出库明细")
// @ApiOperation("分配一条出库明细")
// public ResponseEntity<Object> allDivOne(@RequestBody JSONObject whereJson) {
// semiProductOutService.allDivOne(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/allCancel")
// @Log("出库单全部取消")
// @ApiOperation("出库单全部取消")
// public ResponseEntity<Object> allCancel(@RequestBody JSONObject whereJson) {
// semiProductOutService.allCancel(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/oneCancel")
// @Log("出库单全部取消")
// @ApiOperation("出库单全部取消")
// public ResponseEntity<Object> oneCancel(@RequestBody JSONObject whereJson) {
// semiProductOutService.oneCancel(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/getOutBillDis")
// @Log("查询出库单分配明细")
// @ApiOperation("查询出库单分配明细")
// public ResponseEntity<Object> getOutBillDis(@RequestBody JSONObject whereJson){
// return new ResponseEntity<>(semiProductOutService.getOutBillDis(whereJson), HttpStatus.OK);
// }
//
// @PostMapping("/allSetPoint")
// @Log("设置全部站点")
// @ApiOperation("设置全部站点")
// public ResponseEntity<Object> allSetPoint(@RequestBody JSONObject whereJson) {
// semiProductOutService.allSetPoint(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/manualDiv")
// @Log("出库单手动分配")
// @ApiOperation("出库单手动分配")
// public ResponseEntity<Object> manualDiv(@RequestBody JSONObject whereJson) {
// semiProductOutService.manualDiv(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/confirm")
// @Log("出库单强制确认")
// @ApiOperation("出库单强制确认")
// public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
// semiProductOutService.confirm(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/finishTask")
// @Log("出库任务手动完成")
// @ApiOperation("出库任务手动完成")
// public ResponseEntity<Object> finishTask(@RequestBody JSONObject whereJson) {
// semiProductOutService.finishTask(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @PostMapping("/backConfirm")
// @Log("出库单强制确认")
// @ApiOperation("出库单强制确认")
// public ResponseEntity<Object> backConfirm(@RequestBody JSONObject whereJson) {
// semiProductOutService.backConfirm(whereJson);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
//
// @Log("下载发货单Excel")
// @ApiOperation("下载发货单Excel")
// @GetMapping(value = "/downloadExcel")
// public ResponseEntity<Object> downloadExcel(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
// semiProductOutService.downloadExcel(response,whereJson);
// return new ResponseEntity<>(HttpStatus.OK);
// }
//}

111
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java Normal file
View File

@@ -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;
/**
* <p>
* 出入库记录表 前端控制器
* </p>
*
* @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<Object> query(BcpIostorInvQuery query, PageQuery page) {
return new ResponseEntity<>(bcpOutService.queryDtl(query,page), HttpStatus.OK);
}
@PostMapping("/create")
@Log("新增出库单")
@ApiOperation("新增出库单")
public ResponseEntity<Object> create(@RequestBody JSONObject form) {
bcpOutService.create(form);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@Log("删除出入库单")
@ApiOperation("删除出入库单")
@PostMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
if (ids.length>0){
bcpOutService.update(new UpdateWrapper<StIvtIostorinvBcp>()
.set("is_delete","1")
.in("iostorinv_id",ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
@Log("修改出库单")
@ApiOperation("修改出库单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
bcpOutService.updateBill(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/commit")
@Log("出入单提交")
@ApiOperation("出入单提交")
public ResponseEntity<Object> commit(@RequestBody Map<String,Object> whereJson) {
//semiProductInService.commit(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/getIODtl")
@Log("查询入库分配明细")
@ApiOperation("查询入库分配明细")
public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(bcpOutService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK);
}
@PostMapping("/confirm")
@Log("完成单据")
@ApiOperation("完成单据")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
bcpOutService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/confirmTask")
@Log("下发任务")
@ApiOperation("下发任务")
public ResponseEntity<Object> confirmTask(@RequestBody JSONObject whereJson) {
bcpOutService.confirmTask(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java
View File

@@ -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<Object> create(@RequestBody JSONObject jo) {
// return new ResponseEntity<>(shutframeinvBcpService.create(jo), HttpStatus.OK);
// }
}

32
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java
View File

@@ -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.*;
/**
* <p>
@@ -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<Object> getBcpIvt(StructIvtBcpQuery query, PageQuery page) {
return new ResponseEntity<>(bcpService.getBcpIvt(query, page), HttpStatus.OK);
}
@PostMapping("/getBcpIvtInfo")
@Log("查询可用的半成品库存")
@ApiOperation("查询可用的半成品库存")
public ResponseEntity<Object> getBcpIvtInfo(@RequestBody JSONObject jo) {
return new ResponseEntity<>(bcpService.getBcpIvtInfo(jo), HttpStatus.OK);
}
}

51
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpOutService.java Normal file
View File

@@ -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;
/**
* <p>
* 出入库记录表 服务类
* </p>
*
* @author generator
* @since 2023-05-10
*/
public interface IStIvtIostorinvBcpOutService extends IService<StIvtIostorinvBcp> {
Object queryDtl(BcpIostorInvQuery query, PageQuery page);
List<Map> 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);
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java
View File

@@ -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;
/**
* 创建人

210
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java Normal file
View File

@@ -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;
/**
* <p>
* 出入库记录表 服务实现类
* </p>
*
* @author generator
* @since 2023-05-10
*/
@Service
public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvBcpMapper, StIvtIostorinvBcp> 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<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
TableDataInfo build = TableDataInfo.build(this.getIoDtl(query));
build.setTotalElements(page.getTotal());
return build;
}
@Override
public List<Map> 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<StIvtBsrealstorattr>().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<StIvtStructivtBcp>().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<StIvtStructivtBcp>().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<String>) 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();
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
View File

@@ -119,9 +119,9 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
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.setBase_unit_id(row.getString("base_unit_id"));
mst.setQty_unit_id(row.getString("base_unit_id"));
mst.setBase_bill_code(row.getString("base_bill_code"));
mst.setBase_unit_name(row.getString("base_unit_name"));
mst.setQty_unit_name(row.getString("base_unit_name"));
mst.setUnit_weight(row.getBigDecimal("unit_weight"));
mst.setStoragevehicle_code(row.getString("storagevehicle_code"));
mst.setStoragevehicle_id(row.getString("storagevehicle_id"));
@@ -153,11 +153,12 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
.pcsn(mst.getPcsn())
.ivt_level(mst.getIvt_level())
.is_active(mst.getIs_active())
.qty_unit_id(mst.getBase_unit_id())
.qty_unit_id(mst.getQty_unit_id())
.instorage_time(DateUtil.now())
.stor_id(mst.getStor_id())
.canuse_qty(mst.getPlan_qty())
.workshop_id(mst.getWorkshop_id())
.unit_weight(mst.getUnit_weight())
.build()
);

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java
View File

@@ -1,11 +1,16 @@
package org.nl.wms.storage_manage.semimanage.service.structIvt;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -21,4 +26,14 @@ public interface IStIvtStructivtBcpService extends IService<StIvtStructivtBcp> {
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<Map> getBcpIvtInfo(JSONObject jo);
}

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
View File

@@ -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<StIvtStructivtBcp> {
int batchUpdateByParam(@Param("event") List<Map> event, @Param("struct_code")String struct_code);
List<Map> getBcpIvt(@Param("query") StructIvtBcpQuery query, @Param("pageQuery") PageQuery pageQuery);
List<Map> getBcpIvtInfo(@Param("map") JSONObject map);
}

65
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
View File

@@ -19,4 +19,69 @@
where struct_code = #{struct_code}
</update>
<select id="getBcpIvt" resultType="java.util.Map">
SELECT
ivt.*,
mu.unit_name AS qty_unit_name,
mb.material_code,
mb.material_name,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
sa.storagevehicle_code
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = ivt.qty_unit_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="query.material_search != null and query.material_search != ''">
and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
</if>
<if test="query.sect_id != null and query.sect_id != ''">
and sa.sect_id = #{query.sect_id}
</if>
<if test="query.struct_search != null and query.struct_search != ''">
and (sa.struct_code = #{query.struct_search} OR sa.struct_name = #{query.struct_search})
</if>
</where>
</select>
<select id="getBcpIvtInfo" resultType="java.util.Map">
SELECT
ivt.*,
mu.unit_name AS qty_unit_name,
mb.material_code,
mb.material_name,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
sa.storagevehicle_code
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = ivt.qty_unit_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="map.material_id != null and map.material_id != ''">
and #{map.material_id} = ivt.material_id
</if>
<if test="map.stor_id != null and map.stor_id != ''">
and ivt.stor_id = #{map.stor_id}
</if>
</where>
</select>
</mapper>

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StructIvtBcpQuery.java Normal file
View File

@@ -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<StIvtStructivtBcp> {
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());
}
}

38
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java
View File

@@ -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<StIvtStructivtBcpM
@Autowired
private IStIvtStructattrService structattrService;
@Override
public List<Map> getBcpIvtInfo(JSONObject jo) {
return this.baseMapper.getBcpIvtInfo(jo);
}
@Override
public Object getBcpIvt(StructIvtBcpQuery query, PageQuery pageQuery) {
com.github.pagehelper.Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
List<Map> mst_detail = this.baseMapper.getBcpIvt(query, pageQuery);
TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
build.setTotalElements(page.getTotal());
return build;
}
@Override
public List<StIvtStructivtBcp> allocationRules(Integer num) {
QueryWrapper<StIvtStructivtBcp> query = new QueryWrapper<StIvtStructivtBcp>()
.eq("is_active", true)
.isNull("material_id");
Page<StIvtStructivtBcp> page = this.page(new Page<>(0, 3), query);
List<StIvtStructivtBcp> records = page.getRecords();
List<StIvtStructivtBcp> 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<String, Boolean> fieldRelation = event.getFieldRelation();
ArrayList<Map> list = new ArrayList<>();
for (Map.Entry<String, Boolean> entry : fieldRelation.entrySet()) {
Map<String, Object> 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);
}
}
}