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

add：备件出库、库存查询、库存变更

Browse Source
This commit is contained in:
liuxy
2023-09-11 17:01:50 +08:00
parent 665ac256b9
commit 9ec53a5ba0
18 changed files with 2383 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/controller/iostorInv/EmBiIostorinvOutController.java Normal file
View File

@@ -0,0 +1,77 @@
package org.nl.wms.device_manage.ios.controller.iostorInv;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.device_manage.ios.service.iostorInv.EmBiIostorinvOutService;
import org.nl.wms.device_manage.ios.service.iostorInv.dto.EmIostorInvQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 出入库单主表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-10
*/
@RestController
@RequestMapping("/api/emBiIostorinv/out")
public class EmBiIostorinvOutController {
@Autowired
private EmBiIostorinvOutService emBiIostorinvOutService;
@GetMapping
@Log("查询原料出库单")
//("查询原料出库单")
public ResponseEntity<Object> query(EmIostorInvQuery query, PageQuery page){
return new ResponseEntity<>(emBiIostorinvOutService.pageQuery(query,page),HttpStatus.OK);
}
@PostMapping
@Log("创建入库单")
//("创建入库单")
public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
emBiIostorinvOutService.create(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
@Log("修改入库单")
//("修改入库单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
emBiIostorinvOutService.updateBill(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除入库单")
//("删除入库单")
public ResponseEntity<Object> delete(@RequestBody Long[] ids){
emBiIostorinvOutService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/getIODtl")
@Log("查询出库分配明细")
//("查询出库分配明细")
public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(emBiIostorinvOutService.getInvDtl(whereJson), HttpStatus.OK);
}
@PostMapping("/confirm")
@Log("强制确认")
//("强制确认")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
emBiIostorinvOutService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/controller/structIvt/EmBiStructivtController.java
View File

@@ -29,8 +29,8 @@ public class EmBiStructivtController {
private EmBiStructivtService emBiStructivtService;
@GetMapping("/getRawIvt")
@Log("查询可用的原料库存")
//("查询可用的原料库存")
@Log("查询可用的备件库存")
//("查询可用的备件库存")
public ResponseEntity<Object> getRawIvt(StructIvtEmQuery query, PageQuery page) {
return new ResponseEntity<>(emBiStructivtService.getRawIvt(query, page), HttpStatus.OK);
}
@@ -57,8 +57,8 @@ public class EmBiStructivtController {
}
@GetMapping("/getAllRawIvt")
@Log("查询原料库存")
//("查询原料库存")
@Log("查询备件库存")
//("查询备件库存")
public ResponseEntity<Object> getAllRawIvt(StructIvtEmQuery query, PageQuery page) {
return new ResponseEntity<>(emBiStructivtService.getAllRawIvt(query, page), HttpStatus.OK);
}

66
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/iostorInv/EmBiIostorinvOutService.java Normal file
View File

@@ -0,0 +1,66 @@
package org.nl.wms.device_manage.ios.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.device_manage.ios.service.iostorInv.dao.EmBiostorinv;
import org.nl.wms.device_manage.ios.service.iostorInv.dto.EmIostorInvQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 出入库单主表 服务类
* </p>
*
* @author generator
* @since 2023-05-10
*/
public interface EmBiIostorinvOutService extends IService<EmBiostorinv> {
/**
* 分页查询
* @param query,page /
* @return JSONObject
*/
Object pageQuery(EmIostorInvQuery query, PageQuery page);
/**
* 创建
*
* @param form /
*/
void create(JSONObject form);
/**
* 修改单据
* @param form
* @return
*/
String updateBill(JSONObject form);
/**
* 删除
* @param ids
* {
* 主表id..
* }
*/
void delete(Long[] ids);
/**
* 获取分配明细
* @param form
* @return
*/
List<Map> getInvDtl(JSONObject form);
/**
* 强制确认
* @param form
* @return
*/
void confirm(JSONObject form);
}

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/iostorInv/dao/mapper/EmBiIostorinvOutMapper.java Normal file
View File

@@ -0,0 +1,23 @@
package org.nl.wms.device_manage.ios.service.iostorInv.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.device_manage.ios.service.iostorInv.dao.EmBiostorinv;
import org.nl.wms.device_manage.ios.service.iostorInv.dto.EmIostorInvQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 出入库单主表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-05-10
*/
public interface EmBiIostorinvOutMapper extends BaseMapper<EmBiostorinv> {
List<Map> getMstDetail(@Param("query") EmIostorInvQuery query, @Param("pageQuery") PageQuery pageQuery);
}

65
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/iostorInv/dao/mapper/xml/EmBiIostorinvOutMapper.xml Normal file
View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.device_manage.ios.service.iostorInv.dao.mapper.EmBiIostorinvOutMapper">
<select id="getMstDetail" resultType="java.util.Map">
SELECT
mst.iostorinv_id,
mst.bill_code,
mst.io_type,
mst.buss_type,
mst.bill_type,
mst.biz_date,
mst.stor_id,
mst.stor_code,
mst.stor_name,
mst.source_id,
mst.source_name,
mst.source_type,
mst.total_qty,
mst.dis_name,
mst.dis_time,
mst.detail_count,
mst.bill_status,
mst.workshop_id,
mst.remark,
mst.create_id,
mst.create_name,
DATE_FORMAT( mst.create_time,'%Y-%m-%d %H:%i:%s') AS create_time,
mst.update_id,
mst.update_name,
DATE_FORMAT( mst.update_time,'%Y-%m-%d %H:%i:%s') AS update_time,
mst.confirm_id,
mst.confirm_name,
DATE_FORMAT( mst.confirm_time,'%Y-%m-%d %H:%i:%s') AS confirm_time
FROM
em_bi_iostorinv mst
<where>
mst.is_delete = '0'
AND
io_type = '1'
<if test="query.start_time != null">
and mst.create_time >= #{query.start_time}
</if>
<if test="query.end_time != null">
and #{query.end_time} >= mst.create_time
</if>
<if test="query.stor_id != null and query.stor_id != ''">
and mst.stor_id = #{query.stor_id}
</if>
<if test="query.bill_status != null and query.bill_status != ''">
and mst.bill_status = #{query.bill_status}
</if>
<if test="query.bill_type != null and query.bill_type != ''">
and mst.bill_type = #{query.bill_type}
</if>
<if test="query.bill_code != null and query.bill_code != ''">
and mst.bill_code = #{query.bill_code}
</if>
</where>
order by mst.create_time DESC
</select>
</mapper>

302
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/iostorInv/impl/EmBiIostorinvOutServiceImpl.java Normal file
View File

@@ -0,0 +1,302 @@
package org.nl.wms.device_manage.ios.service.iostorInv.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
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;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.jsonwebtoken.lang.Assert;
import org.jetbrains.annotations.NotNull;
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.system.util.CodeUtil;
import org.nl.wms.device_manage.ios.service.iostorInv.EmBiIostorinvOutService;
import org.nl.wms.device_manage.ios.service.iostorInv.EmBiIostorinvdisService;
import org.nl.wms.device_manage.ios.service.iostorInv.EmBiIostorinvdtlService;
import org.nl.wms.device_manage.ios.service.iostorInv.dao.EmBiIostorinvdis;
import org.nl.wms.device_manage.ios.service.iostorInv.dao.EmBiIostorinvdtl;
import org.nl.wms.device_manage.ios.service.iostorInv.dao.EmBiostorinv;
import org.nl.wms.device_manage.ios.service.iostorInv.dao.mapper.EmBiIostorinvOutMapper;
import org.nl.wms.device_manage.ios.service.iostorInv.dto.EmIostorInvQuery;
import org.nl.wms.device_manage.ios.service.structIvt.EmBiStructivtService;
import org.nl.wms.device_manage.ios.service.structIvt.EmBiStructivtflowService;
import org.nl.wms.device_manage.ios.service.structIvt.dao.EmBiStructivt;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
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.StIvtStructattr;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* <p>
* 出入库单主表 服务实现类
* </p>
*
* @author generator
* @since 2023-05-10
*/
@Service
public class EmBiIostorinvOutServiceImpl extends ServiceImpl<EmBiIostorinvOutMapper, EmBiostorinv> implements EmBiIostorinvOutService {
@Autowired
private IStIvtBsrealstorattrService stIvtBsrealstorattrService; // 仓库服务
@Autowired
private EmBiIostorinvdtlService emBiIostorinvdtlService; // 明细服务
@Autowired
private EmBiIostorinvdisService emBiIostorinvdisService; // 分配服务
@Autowired
private EmBiStructivtService emBiStructivtService; // 库存服务
@Autowired
private IMdMeMaterialbaseService materialbaseService; // 物料基本信息服务
@Autowired
private IStIvtStructattrService structattrService; // 仓位服务
@Autowired
private EmBiStructivtflowService emBiStructivtflowService; // 仓位变动记录服务
@Override
public Object pageQuery(EmIostorInvQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
List<Map> mst_detail = this.baseMapper.getMstDetail(query, pageQuery);
TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
build.setTotalElements(page.getTotal());
return build;
}
@Override
@Transactional(rollbackOn = Exception.class)
public void create(JSONObject form) {
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用主表 插入/更新方法
EmBiostorinv stIvtIostorinvYl = packageMstForm(new EmBiostorinv(), form, false);
// 插入主表
this.save(stIvtIostorinvYl);
// 调用明细表 插入/更新方法
emBiIostorinvdtlService.create(rows, stIvtIostorinvYl.getIostorinv_id(), stIvtIostorinvYl.getIo_type());
}
@Override
@Transactional(rollbackOn = Exception.class)
public String updateBill(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空");
EmBiostorinv mst = form.toJavaObject(EmBiostorinv.class);
mst.setUpdate_id(SecurityUtils.getCurrentUserId());
mst.setUpdate_name(SecurityUtils.getCurrentNickName());
mst.setUpdate_time(DateUtil.now());
this.updateById(mst);
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用明细表 插入/更新方法
emBiIostorinvdtlService.create(rows, form.getString("iostorinv_id"), mst.getIo_type());
return mst.getIostorinv_id();
}
@Override
public void delete(Long[] ids) {
for (Long id : ids) {
EmBiostorinv dao = this.getOne(new QueryWrapper<EmBiostorinv>().eq("iostorinv_id", id));
dao.setIs_delete(true);
this.updateById(dao);
}
}
@Override
public List<Map> getInvDtl(JSONObject form) {
return emBiIostorinvdtlService.getDtlList(form);
}
@Override
@Transactional(rollbackOn = Exception.class)
public void confirm(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空");
String iostorinv_id = form.getString("iostorinv_id");
EmBiostorinv mst = this.getById(iostorinv_id);
mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
mst.setDis_id(SecurityUtils.getCurrentUserId());
mst.setDis_name(SecurityUtils.getCurrentNickName());
mst.setDis_time(DateUtil.now());
mst.setConfirm_id(SecurityUtils.getCurrentUserId());
mst.setConfirm_name(SecurityUtils.getCurrentNickName());
mst.setConfirm_time(DateUtil.now());
this.updateById(mst);
List<EmBiIostorinvdtl> dtl_list = emBiIostorinvdtlService.list(new QueryWrapper<EmBiIostorinvdtl>().eq("iostorinv_id", iostorinv_id));
if (ObjectUtil.isEmpty(dtl_list)) {
throw new BadRequestException("该入库单不存在明细！");
}
if (mst == null || mst.getIs_delete() == true) {
throw new BadRequestException("单据不存在");
}
dtl_list.forEach(dtl -> {
double need_qty = dtl.getPlan_qty().doubleValue();
List<EmBiStructivt> list = emBiStructivtService.list(new QueryWrapper<EmBiStructivt>()
.eq("material_id", dtl.getMaterial_id())
.eq("stor_id", mst.getStor_id())
.eq("workshop_id", mst.getWorkshop_id()));
MdMeMaterialbase mater = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", dtl.getMaterial_id()));
if (ObjectUtil.isEmpty(list)) {
throw new BadRequestException("当前仓库内不存在物料：" + mater.getMaterial_name());
}
for (EmBiStructivt ivt : list) {
//判断是否需要继续分配库存，不大于0时跳出循环
if (need_qty > 0) {
double canuse_qty = ivt.getCanuse_qty().doubleValue();
//插入分配表
String s = JSON.toJSONString(dtl);
JSONObject dis = JSONObject.parseObject(s);
StIvtStructattr structattr = structattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_id", ivt.getStruct_id()));
dis.put("struct_id", structattr.getStruct_id());
dis.put("struct_code", structattr.getStruct_code());
dis.put("struct_name", structattr.getStruct_name());
dis.put("sect_id", structattr.getSect_id());
dis.put("sect_code", structattr.getSect_code());
dis.put("sect_name", structattr.getSect_name());
if (canuse_qty > need_qty) {
dis.put("plan_qty", need_qty);
dis.put("real_qty", need_qty);
//减去库存
double sub = NumberUtil.sub(canuse_qty, need_qty);
ivt.setCanuse_qty(BigDecimal.valueOf(sub));
ivt.setIvt_qty(BigDecimal.valueOf(sub));
emBiStructivtService.updateById(ivt);
// 插入库存变动记录
JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivt));
param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY);
param.put("change_qty",need_qty);
param.put("result_qty", sub);
param.put("bill_code",mst.getBill_code());
param.put("inv_id",mst.getIostorinv_id());
param.put("bill_type_scode",mst.getBill_type());
emBiStructivtflowService.insetIvtChange(param);
need_qty = 0;
} else {
dis.put("plan_qty", canuse_qty);
dis.put("real_qty", canuse_qty);
emBiStructivtService.remove(new QueryWrapper<EmBiStructivt>().eq("stockrecord_id", ivt.getStockrecord_id()));
// 插入库存变动记录
JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivt));
param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY);
param.put("change_qty",need_qty);
param.put("result_qty", 0);
param.put("bill_code",mst.getBill_code());
param.put("inv_id",mst.getIostorinv_id());
param.put("bill_type_scode",mst.getBill_type());
emBiStructivtflowService.insetIvtChange(param);
need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue();
}
JSONObject mst_jo = new JSONObject();
mst_jo.put("mst_id", dtl.getIostorinv_id());
mst_jo.put("dtl_id", dtl.getIostorinv_id());
emBiIostorinvdisService.create(dis, mst_jo);
//维护库存
} else {
break;
}
}
if (need_qty > 0) {
throw new BadRequestException("物料:" + mater.getMaterial_name() + "库存不足，缺少：" + need_qty + "个");
}
});
List<EmBiIostorinvdis> dis_list = emBiIostorinvdisService.list(new QueryWrapper<EmBiIostorinvdis>().eq("iostorinv_id", iostorinv_id));
//修改分配状态
dis_list.forEach(dis -> {
dis.setWork_status(IOSEnum.WORK_STATUS.code("完成"));
emBiIostorinvdisService.updateById(dis);
});
}
@NotNull
private EmBiostorinv packageMstForm(EmBiostorinv stIvtIostorinvYl, JSONObject whereJson, Boolean isUpdate) {
JSONArray rows = whereJson.getJSONArray("tableData");
if (!isUpdate) {
// 新增
stIvtIostorinvYl.setIostorinv_id(IdUtil.getStringId());
stIvtIostorinvYl.setBill_code(CodeUtil.getNewCode("IO_CODE"));
stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("出库"));
stIvtIostorinvYl.setBuss_type(whereJson.getString("bill_type"));
stIvtIostorinvYl.setBill_type(stIvtIostorinvYl.getBuss_type());
stIvtIostorinvYl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
stIvtIostorinvYl.setCreate_id(SecurityUtils.getCurrentUserId());
stIvtIostorinvYl.setCreate_name(SecurityUtils.getCurrentNickName());
stIvtIostorinvYl.setCreate_time(DateUtil.now());
stIvtIostorinvYl.setIs_delete(false);
stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId());
stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName());
stIvtIostorinvYl.setUpdate_time(DateUtil.now());
// TODO 暂时写死
stIvtIostorinvYl.setSysdeptid("111");
stIvtIostorinvYl.setSyscompanyid("111");
} else {
// 修改
stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId());
stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName());
stIvtIostorinvYl.setUpdate_time(DateUtil.now());
}
stIvtIostorinvYl.setBiz_date(whereJson.getString("biz_date").substring(0, 10));
// 获取仓库信息
QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
wrapper.eq("stor_id", whereJson.getString("stor_id"));
wrapper.eq("is_used", true);
StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper);
if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！");
stIvtIostorinvYl.setStor_id(bsrealDao.getStor_id());
stIvtIostorinvYl.setStor_code(bsrealDao.getStor_code());
stIvtIostorinvYl.setStor_name(bsrealDao.getStor_name());
stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty"));
stIvtIostorinvYl.setDetail_count(rows.size());
stIvtIostorinvYl.setRemark(whereJson.getString("remark"));
stIvtIostorinvYl.setWorkshop_id(whereJson.getString("workshop_id"));
return stIvtIostorinvYl;
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/iostorInv/impl/EmBiIostorinvServiceImpl.java
View File

@@ -29,6 +29,8 @@ import org.nl.wms.device_manage.ios.service.iostorInv.dto.EmIostorInvQuery;
import org.nl.wms.device_manage.ios.service.structIvt.EmBiStructivtService;
import org.nl.wms.device_manage.ios.service.structIvt.EmBiStructivtflowService;
import org.nl.wms.device_manage.ios.service.structIvt.dao.EmBiStructivt;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.IOSEnum;
@@ -67,6 +69,9 @@ public class EmBiIostorinvServiceImpl extends ServiceImpl<EmBiIostorinvMapper, E
private EmBiStructivtflowService emBiStructivtflowService; //仓位变动服务
@Autowired
private IMdMeMaterialbaseService materialbaseService; // 物料基本信息服务
@Override
public Object pageQuery(EmIostorInvQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -148,6 +153,8 @@ public class EmBiIostorinvServiceImpl extends ServiceImpl<EmBiIostorinvMapper, E
dis.setWork_status(IOSEnum.WORK_STATUS.code("完成"));
emBiIostorinvdisService.updateById(dis);
MdMeMaterialbase materDao = materialbaseService.getById(dis.getMaterial_id());
//修改库存
//判断该货位和物料上是否存在
@@ -182,6 +189,7 @@ public class EmBiIostorinvServiceImpl extends ServiceImpl<EmBiIostorinvMapper, E
.qty_unit_id(dis.getQty_unit_id())
.instorage_time(DateUtil.now())
.stor_id(mst.getStor_id())
.material_code(materDao.getMaterial_code())
.workshop_id(mst.getWorkshop_id())
.build();
emBiStructivtService.save(ivtDao);

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/EmBiStructivt.java
View File

@@ -106,6 +106,11 @@ public class EmBiStructivt implements Serializable {
*/
private String stor_id;
/**
* 物料编码
*/
private String material_code;
/**
* 车间标识
*/

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml
View File

@@ -6,14 +6,13 @@
SELECT
ivt.*,
mu.unit_name AS qty_unit_name,
mb.material_code,
mb.material_name,
mb.material_spec,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
sa.stor_code,
sa.stor_name,
class.class_name
FROM
em_bi_structivt ivt
@@ -26,13 +25,26 @@
AND
sa.lock_type = '0'
<if test="query.material_search != null and query.material_search != ''">
and (mb.material_code like '%${query.material_search}%' OR mb.material_name like '%${query.material_search}%')
and (mb.material_code like '%${query.material_search}%' OR
mb.material_name like '%${query.material_search}%' OR
mb.material_spec like '%${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.stor_id != null and query.stor_id != ''">
and sa.stor_id = #{query.stor_id}
</if>
<if test="query.struct_id != null and query.struct_id != ''">
and sa.struct_id = #{query.struct_id}
and (sa.struct_code like '%${query.struct_id}%' OR
sa.struct_name like '%${query.struct_id}%')
</if>
<if test="query.start_time != null and query.start_time != ''">
and ivt.instorage_time >= #{query.start_time}
</if>
<if test="query.end_time != null and query.end_time != ''">
and #{query.end_time} >= ivt.instorage_time
</if>
</where>
</select>