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-30 14:56:40 +08:00
parent d172223109 02bc0fdb96
commit ec2157cf91
30 changed files with 1449 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
View File

@@ -21,6 +21,7 @@ public class StructarrQuery extends BaseQuery<StIvtStructattr> {
private String is_semi_finished;
private String is_virtualstore;
private String sect_id;
private String struct_code;
@Override
public void paramMapping() {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
View File

@@ -16,7 +16,7 @@ import java.util.Map;
@Getter
public enum IOSEnum {
//出入库类型
IO_TYPE(MapOf.of("入库", "1", "出库", "2")),
IO_TYPE(MapOf.of("入库", "0", "出库", "1")),
//单据类型
BILL_TYPE(MapOf.of("生产入库", "11", "手工入库", "12", "原料入库", "13"
, "领料出库", "21", "销售出库", "22", "手工出库", "23")),

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
View File

@@ -48,6 +48,7 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl<StIvtStructivtflo
flow.setPcsn(flowDto.getPcsn());
}
仓库信息:{
flow.setStruct_name(struct_attr.getStruct_name());
flow.setStruct_code(struct_attr.getStruct_code());
flow.setStruct_id(struct_attr.getStruct_id());
flow.setStor_id(struct_attr.getStor_id());

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java
View File

@@ -1,5 +1,13 @@
package org.nl.wms.storage_manage.productmanage.controller.structIvt;
import io.swagger.annotations.ApiOperation;
import org.nl.common.anno.Log;
import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,8 +20,19 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2023-05-04
*/
@RestController
@RequestMapping("/stIvtStructivtCp")
@RequestMapping("/api/stIvtStructivtCp")
public class StIvtStructivtCpController {
@Autowired
private IStIvtStructivtCpService iStIvtStructivtCpService;
@PostMapping("/getStructIvt")
@Log("查询库存")
@ApiOperation("查询库存")
public ResponseEntity<Object> getStructIvt(StructIvtYLQuery query) {
return new ResponseEntity<>(iStIvtStructivtCpService.getStructIvtMore(query), HttpStatus.OK);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/dao/StIvtMoreorlessdtlCp.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class StIvtMoreorlessdtlCp implements Serializable {
/**
* 损溢单明细id
*/
@TableId
private String mol_dtl_id;
/**

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/dao/StIvtMoreorlessmstCp.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,6 +27,7 @@ public class StIvtMoreorlessmstCp implements Serializable {
/**
* 损溢单标识
*/
@TableId
private String mol_id;
/**

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/dao/mapper/StIvtMoreorlessmstCpMapper.xml
View File

@@ -6,6 +6,7 @@
mst.*,
a.total_qty,
a.struct_name,
a.storagevehicle_code,
sa.struct_code,
sa.struct_id,
sa.sect_id,
@@ -17,9 +18,11 @@
dtl.struct_name,
dtl.struct_id,
SUM( dtl.mol_qty ) AS total_qty,
dtl.mol_id
dtl.mol_id,
dtl.bucketunique,
MAX(dtl.storagevehicle_code) AS storagevehicle_code
FROM
st_ivt_moreorlessdtl_yl dtl
st_ivt_moreorlessdtl_cp dtl
GROUP BY
dtl.struct_name,
dtl.mol_id,

30
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.productmanage.service.moreOrLess.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -8,10 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
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.StIvtSectattr;
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.service.moreOrLess.IStIvtMoreorlessdtlCpService;
import org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao.StIvtMoreorlessdtlCp;
import org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao.StIvtMoreorlessmstCp;
@@ -43,6 +47,10 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl<StIvtMoreorless
@Autowired
private IStIvtStructattrService structattrService; // 仓位属性服务
@Autowired
protected IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; // 载具信息表服务
@Override
public List<Map> getMlDtl(JSONObject form) {
return this.baseMapper.getMlDtl(form);
@@ -62,6 +70,7 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl<StIvtMoreorless
row.setMol_dtl_id(mol_dtl_id);
row.setMol_id(mst.getMol_id());
row.setMol_code(mst.getMol_code());
row.setPcsn(DateUtil.today());
row.setSeq_no(BigDecimal.valueOf(i + 1));
// 获取库区信息
@@ -79,13 +88,28 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl<StIvtMoreorless
if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
row.setStruct_name(structDao.getStruct_name());
row.setStoragevehicle_id("999999");
row.setStoragevehicle_code("999999");
// 获取载具信息
MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getOne(
new QueryWrapper<MdPbStoragevehicleinfo>().lambda()
.eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code())
.eq(MdPbStoragevehicleinfo::getIs_used, true)
.eq(MdPbStoragevehicleinfo::getIs_delete, false)
);
if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在!");
row.setStoragevehicle_id(vehicleDao.getStoragevehicle_id());
row.setStoragevehicle_code(vehicleDao.getStoragevehicle_code());
row.setStoragevehicle_type(vehicleDao.getStoragevehicle_type());
row.setStatus(MLEnum.DTL_STATUS.code("生成"));
this.save(row);
//锁定货位
structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "1").set("inv_code",mst.getMol_code()).eq("struct_id", row.getStruct_id()));
structattrService.update(
new UpdateWrapper<StIvtStructattr>()
.set("lock_type", IOSEnum.LOCK_TYPE.code("盘点锁"))
.set("inv_code",mst.getMol_code())
.eq("struct_id", row.getStruct_id()));
}
}
return total_qty;

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import java.util.List;
import java.util.Map;
@@ -48,4 +49,13 @@ public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
* }
*/
List<Map> getStructIvt(JSONObject whereJson);
/**
* 获取手工分配库存
* @param whereJson
* {
* 明细row
* }
*/
List<Map> getStructIvtMore(StructIvtYLQuery whereJson);
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
View File

@@ -2,7 +2,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import java.util.List;
import java.util.Map;
@@ -21,4 +23,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
List<Map> getStructIvt(JSONObject json);
List<Map> getStructIvtMore(@Param("query") StructIvtYLQuery query);
}

35
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
View File

@@ -62,4 +62,39 @@
</select>
<select id="getStructIvtMore" 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,
class.class_name
FROM
ST_IVT_StructIvt_CP 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
LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_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_id != null and query.struct_id != ''">
and sa.struct_id = #{query.struct_id}
</if>
</where>
</select>
</mapper>

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivt
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper;
import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -92,6 +93,11 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
return baseMapper.getStructIvt(whereJson);
}
@Override
public List<Map> getStructIvtMore(StructIvtYLQuery whereJson) {
return this.baseMapper.getStructIvtMore(whereJson);
}
/*
加待入
*/

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

@@ -1,14 +1,13 @@
package org.nl.wms.storage_manage.semimanage.service.iostorInv.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 出入库记录表
@@ -57,7 +56,7 @@ public class StIvtIostorinvBcp implements Serializable {
/**
* 业务日期
*/
private Date biz_date;
private String biz_date;
/**
* 关联单据
@@ -67,7 +66,7 @@ public class StIvtIostorinvBcp implements Serializable {
/**
* 车间标识
*/
private String product_area;
private String workshop_id;
/**
* 仓库标识
@@ -168,7 +167,7 @@ public class StIvtIostorinvBcp implements Serializable {
/**
* 创建时间
*/
private Date create_time;
private String create_time;
/**
* 修改人
@@ -183,7 +182,7 @@ public class StIvtIostorinvBcp implements Serializable {
/**
* 修改时间
*/
private Date update_time;
private String update_time;
/**
* 执行状态

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
View File

@@ -19,7 +19,10 @@
and dtl.iostorinv_id = #{query.iostorinv_id }
</if>
<if test="query.bill_code != null and query.bill_code != ''">
and dtl.bill_code like %${query.bill_code}%'
and dtl.bill_code like %${query.bill_code}%
</if>
<if test="query.bill_type != null and query.bill_type != ''">
and dtl.bill_type like %${query.bill_type}%
</if>
<if test="query.bill_status != null and query.bill_status != ''">
and dtl.bill_status = #{query.bill_status}

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

@@ -1,6 +1,7 @@
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.github.pagehelper.Page;
@@ -15,6 +16,9 @@ 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.IStIvtSectattrService;
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.IOSEnum;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
@@ -22,6 +26,9 @@ import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivt
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.storage_manage.productmanage.util.DivRuleCpService;
import org.nl.wms.storage_manage.productmanage.util.RuleUtil;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl;
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.IStIvtIostorinvBcpService;
@@ -58,6 +65,10 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
private IStIvtStructivtflowService structivtflowService;
@Autowired
private IStIvtStructattrService structattrService;
@Autowired
private DivRuleCpService divRuleCpService;
@Autowired
private IStIvtSectattrService sectattrService;
@Override
@@ -81,14 +92,15 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
StIvtIostorinvBcp mst = new StIvtIostorinvBcp();
mst.setIostorinv_id(IdUtil.getStringId());
mst.setBill_code(CodeUtil.getNewCode("IO_CODE"));
mst.setBiz_date(form.getDate("biz_date"));
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.setProduct_area(form.getString("product_code"));
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());
@@ -97,7 +109,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
packageRow(mst, (JSONObject) item);
mst.setCreate_id(SecurityUtils.getCurrentUserId());
mst.setCreate_name(SecurityUtils.getCurrentNickName());
mst.setCreate_time(new Date());
mst.setCreate_time(DateUtil.now());
this.save(mst);
}
}
@@ -120,15 +132,36 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
public String confirm(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空");
StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id"));
checkParam(mst);
//checkParam(mst);
if (StringUtils.isEmpty(mst.getStruct_code())) {
throw new BadRequestException("当前入库单还未分配仓位！");
}
mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
mst.setUpdate_time(new Date());
mst.setUpdate_time(DateUtil.now());
mst.setUpdate_id(SecurityUtils.getCurrentUserId());
mst.setUpdate_name(SecurityUtils.getCurrentNickName());
this.updateById(mst);
structivtBcpService.updateCashByParam(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM,mst.getPlan_qty(),mst.getStruct_code());
structivtflowService.recordStructivtFlow(
//新增库存
structivtBcpService.save(StIvtStructivtBcp.builder()
.struct_id(mst.getStruct_id())
.struct_code(mst.getStruct_code())
.struct_name(mst.getStruct_name())
.material_id(mst.getMaterial_id())
.quality_scode(mst.getQuality_scode())
.pcsn(mst.getPcsn())
.ivt_level(mst.getIvt_level())
.is_active(mst.getIs_active())
.qty_unit_id(mst.getBase_unit_id())
.instorage_time(DateUtil.now())
.stor_id(mst.getStor_id())
.canuse_qty(mst.getPlan_qty())
.workshop_id(mst.getWorkshop_id())
.build()
);
/*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())
@@ -136,7 +169,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
.task_id(mst.getTask_id())
.storagevehicle_code(mst.getStoragevehicle_code())
.build()
);
);*/
return null;
}
@@ -146,36 +179,40 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id"));
checkParam(mst);
//分配货位。下发任务，更新主单据状态。更新明细任务
List<StIvtStructivtBcp> struct_codes = structivtBcpService.allocationRules(1);
if (CollectionUtils.isEmpty(struct_codes)){
StIvtSectattr sect = sectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_name", "半成品库区"));
JSONObject jo = new JSONObject();
jo.put("sect_id", sect.getSect_id());
jo.put("stor_id", sect.getStor_id());
jo.put("rule_type", RuleUtil.PRODUCTION_IN_1);
StIvtStructattr stIvtStructattr = divRuleCpService.divRuleIn(jo);
if (ObjectUtil.isEmpty(stIvtStructattr)) {
throw new BadRequestException("无可分配货位");
}
仓库信息:{
mst.setSect_id(stIvtStructattr.getSect_id());
mst.setSect_code(stIvtStructattr.getSect_code());
mst.setSect_name(stIvtStructattr.getSect_name());
mst.setStruct_id(stIvtStructattr.getStruct_id());
mst.setStruct_code(stIvtStructattr.getStruct_code());
mst.setStruct_name(stIvtStructattr.getStruct_name());
}
PointEvent event = PointEvent.builder()
.type(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND.getCode())
.point_code1(mst.getPoint_code())
.point_code2(struct_codes.get(0).getStruct_code())
.point_code2(stIvtStructattr.getStruct_code())
.callback((Consumer<String>) mst::setTask_id)
.build();
BussEventMulticaster.Publish(event);
mst.setBill_status(IOSEnum.BILL_STATUS.code("下发"));
mst.setUpdate_time(new Date());
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);
//更新库存
StIvtStructivtBcp struct = structivtBcpService.getOne(new QueryWrapper<StIvtStructivtBcp>().eq("struct_code", mst.getStruct_code()));
//插入库存变动表
structivtflowService.recordStructivtFlow(
StIvtStructivtflowDto.builder()
.bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND).bill_table("st_ivt_iostorinv_bcp")
.material_id(mst.getMaterial_id()).pcsn(mst.getPcsn())
.struct_code(mst.getStruct_code()).result_qty(struct.getCanuse_qty()).change_qty(mst.getPlan_qty())
.task_id(mst.getTask_id())
.storagevehicle_code(mst.getStoragevehicle_code())
.build()
);
return mst.getTask_id();
}
@@ -195,7 +232,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
StIvtIostorinvBcp mst = form.toJavaObject(StIvtIostorinvBcp.class);
mst.setUpdate_id(SecurityUtils.getCurrentUserId());
mst.setUpdate_name(SecurityUtils.getCurrentNickName());
mst.setUpdate_time(new Date());
mst.setUpdate_time(DateUtil.now());
for (Object item : form.getJSONArray("tableData")) {
packageRow(mst, (JSONObject) item);
}

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

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_structivt_bcp")
@Builder
public class StIvtStructivtBcp implements Serializable {
private static final long serialVersionUID = 1L;
@@ -75,7 +78,7 @@ public class StIvtStructivtBcp implements Serializable {
/**
* 入库时间
*/
private Date instorage_time;
private String instorage_time;
/**
* 仓库标识
@@ -85,7 +88,7 @@ public class StIvtStructivtBcp implements Serializable {
/**
* 车间标识
*/
private String product_area;
private String workshop_id;
/**
* 是否已挑料

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

@@ -3,7 +3,7 @@
<mapper namespace="org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper">
<update id="batchUpdateByParam">
update user_distribute set
update st_ivt_structivt_bcp set
<foreach collection="event" item="item" separator=",">
${item.field} = ${item.field}
<choose>

25
mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue
View File

@@ -149,6 +149,18 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center"/>
<el-table-column prop="storagevehicle_code" label="载具号" align="center" min-width="200" show-overflow-tooltip>
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.storagevehicle_code" class="input-with-select"/>
<span v-show="scope.row.edit">{{ scope.row.storagevehicle_code }}</span>
</template>
</el-table-column>
<el-table-column prop="bucketunique" label="箱号" align="center" min-width="200" show-overflow-tooltip>
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.bucketunique" class="input-with-select"/>
<span v-show="scope.row.edit">{{ scope.row.bucketunique }}</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" align="center" min-width="200" show-overflow-tooltip>
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
@@ -284,7 +296,7 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({'stor_type': '3'}).then(res => {
crudStorattr.getStor({'stor_type': '4'}).then(res => {
this.storlist = res.content
})
},
@@ -408,6 +420,11 @@ export default {
this.nowrow = row
},
async insertdtl() {
if (!this.form.struct_code) {
this.crud.notify('请先选择货位', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.form.tableData.push({
quality_scode: '02',
ivt_qty: 0,
@@ -447,6 +464,12 @@ export default {
return false
}
}
for (let i = 0; i < this.form.tableData.length; i++) {
if (this.form.tableData[i].storagevehicle_code !== row.storagevehicle_code) {
this.crud.notify('载具号不一致！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
// 修改行的编辑状态
row.edit = !row.edit
this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新

4
mes/qd/src/views/wms/storage_manage/product/productMoreOrless/StructDiv.vue
View File

@@ -22,7 +22,7 @@
</el-col>
<el-col :span="6">
<el-input
v-model="query.search"
v-model="query.struct_code"
clearable
style="width: 200px"
size="mini"
@@ -123,7 +123,7 @@ export default {
methods: {
open() {
this.crud.resetQuery(false)
crudSectattr.getSect({ 'stor_type': '3' }).then(res => {
crudSectattr.getSect({ 'stor_type': '4' }).then(res => {
this.sects = res.content
})
if (this.sect) {

2
mes/qd/src/views/wms/storage_manage/product/productMoreOrless/index.vue
View File

@@ -218,7 +218,7 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
this.storlist = res.content
})
},

2
mes/qd/src/views/wms/storage_manage/product/productMoreOrless/moreorless.js
View File

@@ -26,7 +26,7 @@ export function edit(data) {
export function getStructIvt(params) {
return request({
url: '/api/stIvtStructivtYl/getStructIvt',
url: '/api/stIvtStructivtCp/getStructIvt',
method: 'post',
params
})

4
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
View File

@@ -221,7 +221,7 @@ import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDia
import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog'
import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
export default {
name: 'RawProductIn',
@@ -267,7 +267,7 @@ export default {
}
},
created() {
crudStorattr.queryStor({ 'stor_type': '3' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},

4
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
View File

@@ -247,7 +247,7 @@
import CRUD, { crud, form } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import BillDtl from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import crudProductOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
import crudStructattr from '@/api/wms/basedata/st/structattr'
import StructIvt from '@/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt'
@@ -317,7 +317,7 @@ export default {
},
methods: {
open() {
crudStorattr.queryStor({ 'stor_type': '3' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},

4
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
View File

@@ -221,7 +221,7 @@ import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductOut/AddDi
import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog'
import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
export default {
name: 'RawProductOut',
@@ -267,7 +267,7 @@ export default {
}
},
created() {
crudStorattr.queryStor({ 'stor_type': '3' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},

7
mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
View File

@@ -27,7 +27,7 @@
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="product_code">
<label slot="label">所属仓库2:</label>
<label slot="label">所属仓库:</label>
<el-select
v-model="form.stor_id"
clearable
@@ -222,11 +222,12 @@
import CRUD, { crud, form } from '@crud/crud'
import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
const defaultForm = {
bill_code: '',
product_code: 'A1',
bill_status: '1',
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '',
@@ -284,7 +285,7 @@ export default {
},
methods: {
open() {
crudsemiproductIn.queryStor().then(res => {
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})
},

37
mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
View File

@@ -48,25 +48,6 @@
</el-select>
</el-form-item>
<el-form-item label="生成方式">
<el-select
v-model="query.bill_type"
clearable
filterable
size="mini"
placeholder="生成方式"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker
v-model="query.createTime"
@@ -107,9 +88,9 @@
/>
</el-form-item>
<el-form-item label="所属仓库">
<el-form-item label="车间">
<el-select
v-model="query.product_code"
v-model="query.workshop_id"
clearable
size="mini"
placeholder="全部"
@@ -117,7 +98,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.sortlist"
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -173,7 +154,7 @@
</template>fileinput_name
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="product_area" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column prop="workshop_id" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column prop="stor_name" label="仓库" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />
@@ -218,6 +199,7 @@ import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog'
import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
export default {
name: 'SemiproductIn',
@@ -225,6 +207,9 @@ export default {
cruds() {
return CRUD({
title: '',
query: {
'io_type': '0'
},
optShow: { add: true, reset: true },
idField: 'iostorinv_id',
url: '/api/in/semiproductIn',
@@ -233,7 +218,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_IN_TYPE', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -263,8 +248,8 @@ export default {
}
},
created() {
crudsemiproductIn.queryStor().then(res => {
this.storlist = res
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})
},
methods: {

411
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue Normal file
View File

@@ -0,0 +1,411 @@
<template>
<el-dialog
:title="crud.status.title"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
@open="open"
@close="close"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">所属仓库:</label>
<el-select
v-model="form.stor_id"
clearable
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="出库点" prop="point_code">
<label slot="label">出库点:</label>
<el-select
v-model="form.point_code"
clearable
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-select
v-model="form.bill_type"
clearable
placeholder="业务类型"
style="width: 210px"
class="filter-item"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div v-show="crud.status.add === 1" class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent()"
>
添加物料
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="base_bill_code" label="订单号">
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].base_bill_code"
clearable
:controls="false"
controls-position="right"
size="small"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].plan_qty"
size="small"
:controls="false"
controls-position="right"
precision="3"
:min="0"
@change="changeQty"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].unit_weight"
size="small"
:controls="false"
controls-position="right"
precision="3"
:min="0"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号">
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].storagevehicle_code"
clearable
:controls="false"
controls-position="right"
size="small"
/>
</template>
</el-table-column>
<el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
/>
</template>
</el-table-column>
</el-table>
<MaterDtl
:dialog-show.sync="materShow"
:is-single="false"
:mater-opt-code="materType"
@setMaterValue="tableChanged"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
const defaultForm = {
bill_code: '',
product_code: 'A1',
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '',
remark: '',
biz_date: new Date(),
create_mode: '',
tableData: []
}
export default {
name: 'AddDialog',
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_OUT_TYPE', 'product_area'],
cruds() {
return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductIn }})
},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Object
}
},
data() {
return {
dialogVisible: false,
materShow: false,
dtlShow: false,
opendtlParam: null,
materType: '03', // 关键成品
storlist: [],
billtypelist: [],
rules: {
product_code: [
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.afterToView]() {
crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res.content
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
if (!row.base_bill_code) {
this.crud.notify('订单号', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.plan_qty) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.stor_id) {
this.crud.notify('所属仓库不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.point_code) {
this.crud.notify('入库点不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.storagevehicle_code) {
this.crud.notify('载具不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.unit_weight) {
this.crud.notify('单重不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
},
deleteRow(index, rows) {
const material_code = rows[index].material_code
let len = rows.length
while (len--) {
const obj = rows[len]
if (material_code === obj.material_code) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
this.form.detail_count = this.form.tableData.length
}
}
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
same_mater = false
}
})
if (same_mater) {
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = '1'
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
})
this.form.detail_count = this.form.tableData.length
},
insertEvent(row) {
this.materShow = true
},
changeQty() {
this.form.total_qty = 0
this.form.tableData.forEach((item) => {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
})
}
}
}
</script>
<style>
.crud-opts2 {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
}
</style>

249
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue Normal file
View File

@@ -0,0 +1,249 @@
<template>
<el-dialog
append-to-body
title="入库详情"
:visible.sync="dialogVisible"
destroy-on-close
fullscreen
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="所属仓库" prop="stor_name">
<label slot="label">所属仓库:</label>
<el-input v-model="form.stor_name" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="入库点" prop="point_code">
<label slot="label">入库点:</label>
<el-input v-model="form.point_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产车间">
<el-select
v-model="form.product_area"
clearable
size="mini"
placeholder="全部"
:disabled="true"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型">
<el-select
v-model="form.bill_type"
clearable
filterable
size="mini"
:disabled="true"
placeholder="业务类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span2">入库作业明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
:data="tableDtl"
style="width: 100%;"
max-height="300"
size="mini"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="base_bill_code" label="订单号" width="150" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="base_unit_name" label="单位" align="center" />
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="struct_code" label="分配货位" align="center" />
<el-table-column prop="task_id" label="任务号" align="center" />
<el-table-column prop="work_status" label="任务状态" align="center" />
</el-table>
</el-card>
</el-dialog>
</template>
<script>
import { crud } from '@crud/crud'
import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
props: {
dialogShow: {
type: Boolean,
default: false
},
rowmst: {
type: Object
}
},
data() {
return {
dialogVisible: false,
tableDtl: [],
tabledis: [],
billtypelist: [],
storlist: [],
currentdtl: null,
currentDis: {},
form: {}
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
},
rowmst: {
handler(newValue) {
this.form = newValue
}
}
},
methods: {
open() {
this.queryTableDtl()
},
close() {
this.$emit('update:dialogShow', false)
this.currentDis = {}
this.currentdtl = null
this.tableDtl = []
this.$emit('TaskChanged')
},
stateFormat(row, column) {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]
},
work_statusFormat(row) {
return this.dict.label.work_status[row.work_status]
},
handleDtlCurrentChange(current) {
if (current !== null) {
this.tabledis = []
this.currentdtl = current
this.queryTableDdis()
} else {
this.tabledis = []
this.currentdtl = {}
}
},
invtypeFormat(row, column) {
for (const item of this.billtypelist) {
if (item.code === row.source_bill_type) {
return item.name
}
}
},
handleDisCurrentChange(current) {
this.currentDis = current
},
queryTableDtl() {
crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.tableDtl = res
})
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size:20px;
color:#303133;
}
.crud-opts2 .role-span2 {
padding: 0px 0px 20px 0px;
}
.crud-opts2 {
padding: 10px 0px 0px 50px;
}
</style>

342
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue Normal file
View File

@@ -0,0 +1,342 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="所属仓库">
<el-select
v-model="query.stor_id"
clearable
size="mini"
placeholder="单据状态"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.bill_type"
clearable
filterable
size="mini"
placeholder="单据类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
v-model="query.bill_status"
clearable
size="mini"
placeholder="单据状态"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="入库单号">
<el-input
v-model="query.bill_code"
size="mini"
clearable
placeholder="单据号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="车间">
<el-select
v-model="query.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
:disabled="confirm_flag"
icon="el-icon-position"
size="mini"
@click="confirmTask"
>
下发执行
</el-button>
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
:disabled="dis_flag"
@click="confirm"
>
强制确认
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
size="mini"
:data="crud.data"
highlight-current-row
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
@current-change="handleCurrentChange"
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>fileinput_name
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="workshop_id" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column prop="stor_name" label="仓库" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量" />
<el-table-column show-overflow-tooltip min-width="120" prop="base_unit_name" label="单位" />
<el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="入库点" />
<el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="create_name" />
<el-table-column label="创建时间" align="center" prop="create_time" width="150" />
<el-table-column label="修改人" align="center" prop="update_name" />
<el-table-column label="修改时间" align="center" prop="update_time" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
<DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
</div>
</template>
<script>
import crudsemiproductout from '@/views/wms/storage_manage/semiproduct/semiproductout/semiproductout'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductout/AddDialog'
import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
export default {
name: 'SemiproductOut',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({
title: '',
query: {
'io_type': '1'
},
optShow: { add: true, reset: true },
idField: 'iostorinv_id',
url: '/api/in/semiproductIn',
crudMethod: { ...crudsemiproductout }
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_OUT_TYPE', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
permission: {},
product_code: 'A1',
dis_flag: true,
confirm_flag: true,
disShow: false,
viewShow: false,
mstrow: {},
divShow: false,
openParam: [],
currentRow: null,
storlist: [],
storId: null
}
},
computed: {
...mapGetters([
'user'
])
},
mounted: function() {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})
},
methods: {
fun(val) {
return Number(val).toFixed(3)
},
canUd(row) {
return row.bill_status == '1002'
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
this.buttonChange(row)
} else if (val.length === 1) {
this.buttonChange(row)
} else {
this.handleCurrentChange(null)
}
},
onSelectAll() {
this.$refs.table.clearSelection()
this.handleCurrentChange(null)
},
buttonChange(currentRow) {
if (currentRow !== null) {
this.currentRow = currentRow
if (currentRow.bill_status === '10' || currentRow.bill_status === '20') {
this.confirm_flag = false
} else {
this.confirm_flag = true
}
if (currentRow.bill_status !== '99') {
this.dis_flag = false
} else {
this.dis_flag = true
}
}
},
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.dis_flag = true
this.confirm_flag = true
this.currentRow = {}
}
},
bill_typeFormat(row, column) {
return this.dict.label.bill_type[row.bill_type]
},
toView(row) {
this.mstrow = row
this.viewShow = true
},
toEdtl(row) {
this.editShow = true
this.mstrow = row
},
confirm() {
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudsemiproductout.confirm(this.currentRow).then(res => {
this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
confirmTask() {
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudsemiproductout.confirmTask(this.currentRow).then(res => {
this.crud.notify('单据下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
stateFormat(row, column) {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
querytable() {
this.onSelectAll()
this.crud.toQuery()
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}
</style>

192
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/semiproductout.js Normal file
View File

@@ -0,0 +1,192 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/in/semiproductIn/create',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/in/semiproductIn/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/in/semiproductIn/update',
method: 'post',
data
})
}
export function getType(params) {
return request({
url: '/api/in/semiproductIn/getType',
method: 'get',
params
})
}
export function getIODtl(data) {
return request({
url: '/api/in/semiproductIn/getIODtl',
method: 'post',
data
})
}
export function insertDtl(data) {
return request({
url: '/api/in/semiproductIn/insertDtl',
method: 'post',
data
})
}
export function commit(data) {
return request({
url: '/api/in/semiproductIn/commit',
method: 'post',
data
})
}
export function checkVehicle(data) {
return request({
url: '/api/in/semiproductIn/checkVehicle',
method: 'post',
data
})
}
export function confirmvehicle(data) {
return request({
url: '/api/in/semiproductIn/confirmvehicle',
method: 'post',
data
})
}
export function getDisDtl(data) {
return request({
url: '/api/in/semiproductIn/getDisDtl',
method: 'post',
data
})
}
export function divStruct(data) {
return request({
url: '/api/in/semiproductIn/divStruct',
method: 'post',
data
})
}
export function unDivStruct(data) {
return request({
url: '/api/in/semiproductIn/unDivStruct',
method: 'post',
data
})
}
export function divPoint(data) {
return request({
url: '/api/in/semiproductIn/divPoint',
method: 'post',
data
})
}
export function bucketDtl(data) {
return request({
url: '/api/in/semiproductIn/bucketDtl',
method: 'post',
data
})
}
export function updateTask(data) {
return request({
url: '/api/in/semiproductIn/updateTask',
method: 'post',
data
})
}
export function confirmTask(data) {
return request({
url: '/api/in/semiproductIn/confirmTask',
method: 'post',
data
})
}
export function confirm(data) {
return request({
url: '/api/in/semiproductIn/confirm',
method: 'post',
data
})
}
export function delDis(data) {
return request({
url: '/api/in/semiproductIn/delDis',
method: 'post',
data
})
}
export function queryBoxMater(data) {
return request({
url: '/api/in/semiproductIn/queryBoxMater',
method: 'post',
data
})
}
export function queryStor() {
return request({
url: 'api/stIvtBsrealstorattr/queryStor',
method: 'post'
})
}
export function getDisTask(data) {
return request({
url: '/api/in/semiproductIn/getDisTask',
method: 'post',
data
})
}
export default {
add,
edit,
del,
getType,
insertDtl,
getIODtl,
commit,
checkVehicle,
confirmvehicle,
getDisDtl,
divStruct,
unDivStruct,
divPoint,
delDis,
queryBoxMater,
bucketDtl,
updateTask,
confirmTask,
confirm,
queryStor,
getDisTask
}