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

rev：新增原材料盘点、损溢；老车间包装

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-26 16:24:02 +08:00
parent 1ce759c718
commit 40ec3496ff
37 changed files with 1299 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml
View File

@@ -42,5 +42,8 @@
<if test="sect_type_attr != null and stor_id != ''">
and st_ivt_sectattr.sect_type_attr = #{sect_type_attr}
</if>
<if test="stor_type != null and stor_type != ''">
and stor.stor_type = #{stor_type}
</if>
</select>
</mapper>

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

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

45
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java Normal file
View File

@@ -0,0 +1,45 @@
package org.nl.wms.storage_manage;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import java.util.Map;
/*
* @author ZZQ
* @Date 2023/5/4 20:11
*/
@AllArgsConstructor
@Getter
public enum CHECKEnum {
//单据类型
BILL_TYPE(MapOf.of("计划盘点", "31", "临时盘点", "32")),
//单据状态
BILL_STATUS(MapOf.of("生成", "10", "盘点中", "30", "完成", "99")),
//单据状态
DTL_STATUS(MapOf.of("生成", "01", "盘点中", "04", "已盘点", "05", "异常处理中", "06", "异常处理完成"
, "07", "确认完成", "99")),
PROCESS_TYPE(MapOf.of("账务为准", "0", "实盘为准", "1")),
CREATE_MODE(MapOf.of("PC产生", "01", "终端产生", "02", "外部接口产生", "03", "内部调度产生", "04"));
private Map<String, String> code;
public String code(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return code;
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {
return entry.getValue();
}
}
throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
}
}

88
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java
View File

@@ -1,9 +1,16 @@
package org.nl.wms.storage_manage.rawmanage.controller.check;
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.check.IStIvtCheckmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
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 +21,81 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2023-05-10
*/
@RestController
@RequestMapping("/stIvtCheckmstYl")
@RequestMapping("/api/check")
public class StIvtCheckmstYlController {
@Autowired
private IStIvtCheckmstYlService checkmstYlService;
@GetMapping
@Log("查询原料入库单")
@ApiOperation("查询原料入库单")
public ResponseEntity<Object> query(CheckQuery query, PageQuery page) {
return new ResponseEntity<>(checkmstYlService.pageQuery(query, page), HttpStatus.OK);
}
@PostMapping
@Log("创建盘点单")
@ApiOperation("创建盘点单")
public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
checkmstYlService.create(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/getCheckDtl")
@Log("查询盘点明细")
@ApiOperation("查询盘点明细")
public ResponseEntity<Object> getCheckDtl(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(checkmstYlService.getCheckDtl(whereJson), HttpStatus.OK);
}
@PostMapping("/update")
@Log("修改盘点单")
@ApiOperation("修改盘点单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
checkmstYlService.update(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/delete")
@Log("删除入库单")
@ApiOperation("删除入库单")
public ResponseEntity<Object> delete(@RequestBody Long[] ids){
checkmstYlService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/saveCheck")
@Log("盘点保存")
@ApiOperation("盘点保存")
public ResponseEntity<Object> saveCheck(@RequestBody JSONObject whereJson) {
checkmstYlService.saveCheck(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/confirm")
@Log("移库单强制确认")
@ApiOperation("移库单强制确认")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
checkmstYlService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/process1")
@Log("实盘为准，生成损溢单修改库存")
@ApiOperation("实盘为准，生成损溢单修改库存")
public ResponseEntity<Object> process1(@RequestBody JSONObject whereJson) {
checkmstYlService.process1(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/process0")
@Log("账务为准")
@ApiOperation("账务为准")
public ResponseEntity<Object> process0(@RequestBody JSONObject whereJson) {
checkmstYlService.process0(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java
View File

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,8 +32,15 @@ public class StIvtStructivtYlController {
@GetMapping("/getRawIvt")
@Log("查询可用的原料库存")
@ApiOperation("查询可用的原料库存")
public ResponseEntity<Object> getRawIvt(StructIvtYLQuery query, PageQuery page){
return new ResponseEntity<>(structivtYlService.getRawIvt(query,page), HttpStatus.OK);
public ResponseEntity<Object> getRawIvt(StructIvtYLQuery query, PageQuery page) {
return new ResponseEntity<>(structivtYlService.getRawIvt(query, page), HttpStatus.OK);
}
@PostMapping("/getStructIvt")
@Log("查询库存")
@ApiOperation("查询库存")
public ResponseEntity<Object> getStructIvt(StructIvtYLQuery query) {
return new ResponseEntity<>(structivtYlService.getStructIvt(query), HttpStatus.OK);
}
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java
View File

@@ -1,7 +1,13 @@
package org.nl.wms.storage_manage.rawmanage.service.check;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -13,4 +19,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IStIvtCheckdtlYlService extends IService<StIvtCheckdtlYl> {
/**
* 主单据使用
* @param row
* @param mst
* @return
*/
double create(JSONArray row, StIvtCheckmstYl mst);
List<Map> getCheckDtl(JSONObject map);
}

39
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java
View File

@@ -1,7 +1,14 @@
package org.nl.wms.storage_manage.rawmanage.service.check;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -13,4 +20,36 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IStIvtCheckmstYlService extends IService<StIvtCheckmstYl> {
/**
* 分页查询
* @param query,page /
* @return JSONObject
*/
Object pageQuery(CheckQuery query, PageQuery page);
void create(JSONObject jo);
List<Map> getCheckDtl(JSONObject map);
void update(JSONObject map);
/**
* 删除
* @param ids
* {
* 主表id..
* }
*/
void delete(Long[] ids);
void saveCheck(JSONObject jo);
void confirm(JSONObject jo);
void process0(JSONObject jo);
void process1(JSONObject jo);
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.storage_manage.rawmanage.service.check.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;
@@ -25,6 +27,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点单明细id
*/
@TableId(value = "checkdtl_id")
private String checkdtl_id;
/**
@@ -115,7 +118,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点结果
*/
private Boolean check_result;
private String check_result;
/**
* 盘点人
@@ -130,7 +133,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点时间
*/
private Date check_time;
private String check_time;
/**
* 异常是否处理
@@ -150,7 +153,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 处理时间
*/
private Date process_time;
private String process_time;
}

13
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.storage_manage.rawmanage.service.check.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;
@@ -25,6 +27,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 盘点单标识
*/
@TableId(value = "check_id")
private String check_id;
/**
@@ -75,7 +78,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 创建时间
*/
private Date create_time;
private String create_time;
/**
* 审核人
@@ -90,7 +93,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 审核时间
*/
private Date audit_time;
private String audit_time;
/**
* 确认人
@@ -105,7 +108,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 确认时间
*/
private Date confirm_time;
private String confirm_time;
/**
* 备注
@@ -145,7 +148,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 回传时间
*/
private Date upload_time;
private String upload_time;
/**
* 部门ID
@@ -160,7 +163,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 车间标识
*/
private String product_area;
private String workshop_id;
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/StIvtCheckdtlYlMapper.java
View File

@@ -1,8 +1,12 @@
package org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* 盘点单明细表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface StIvtCheckdtlYlMapper extends BaseMapper<StIvtCheckdtlYl> {
List<Map> getCheckDtl(@Param("map") Map map);
}

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml
View File

@@ -2,4 +2,37 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckdtlYlMapper">
<select id="getCheckDtl" resultType="java.util.Map">
SELECT
CheckDtl.*,
struct.struct_code,
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
FROM
st_ivt_checkdtl_yl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
<where>
1=1
<if test="map.check_id != '' and map.check_id != null">
and CheckDtl.check_id = #{map.check_id}
</if>
<if test="map.checkdtl_id != '' and map.checkdtl_id != null">
and CheckDtl.checkdtl_id = #{map.checkdtl_id}
</if>
<if test="map.status != '' and map.status != null">
and #{map.status} >= CheckDtl.status
</if>
<if test="map.check_result != '' and map.check_result != null and map.check_result != '-1'">
and #{map.check_result} = CheckDtl.check_result
</if>
<if test="map.check_result == '-1'">
and CheckDtl.check_result IN ('1','2')
</if>
</where>
order by CheckDtl.seq_no
</select>
</mapper>

34
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java Normal file
View File

@@ -0,0 +1,34 @@
package org.nl.wms.storage_manage.rawmanage.service.check.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.rawmanage.service.check.dao.StIvtCheckmstYl;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class CheckQuery extends BaseQuery<StIvtCheckmstYl> {
private String stor_id;
private String status;
private String check_type;
private String check_code;
private Boolean is_delete = false;
@Override
public void paramMapping() {
super.doP.put("check_code", QParam.builder().k(new String[]{"check_code"}).type(QueryTEnum.LK).build());
}
}

74
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckdtlYlServiceImpl.java
View File

@@ -1,11 +1,33 @@
package org.nl.wms.storage_manage.rawmanage.service.check.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
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.CHECKEnum;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckdtlYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* <p>
* 盘点单明细表 服务实现类
@@ -17,4 +39,56 @@ import org.springframework.stereotype.Service;
@Service
public class StIvtCheckdtlYlServiceImpl extends ServiceImpl<StIvtCheckdtlYlMapper, StIvtCheckdtlYl> implements IStIvtCheckdtlYlService {
@Autowired
private IStIvtSectattrService sectattrService;
@Autowired
private IStIvtStructattrService structattrService;
@Override
public double create(JSONArray rows, StIvtCheckmstYl mst) {
double total_qty = 0;
if (rows.size() > 0 && ObjectUtil.isNotEmpty(mst)) {
// 先删除在插入
this.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", mst.getCheck_id()));
for (int i = 0; i < rows.size(); i++) {
String checkdtl_id = IdUtil.getStringId();
StIvtCheckdtlYl row = rows.getJSONObject(i).toJavaObject(StIvtCheckdtlYl.class);
row.setCheckdtl_id(checkdtl_id);
row.setCheck_id(mst.getCheck_id());
row.setCheck_code(mst.getCheck_code());
row.setSeq_no(BigDecimal.valueOf(i + 1));
// 获取库区信息
QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();
sect_wrapper.eq("sect_id", row.getSect_id());
sect_wrapper.eq("is_used", true);
StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper);
if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！");
row.setSect_name(sectDao.getSect_name());
// 获取仓位信息
QueryWrapper<StIvtStructattr> struct_wrapper = new QueryWrapper<>();
struct_wrapper.eq("struct_id", row.getStruct_id());
struct_wrapper.eq("is_used", true);
StIvtStructattr structDao = structattrService.getOne(struct_wrapper);
if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
row.setStruct_name(structDao.getStruct_name());
row.setStoragevehicle_id("999999");
row.setStoragevehicle_code("999999");
row.setStatus(CHECKEnum.DTL_STATUS.code("生成"));
this.save(row);
//锁定货位
structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "1").set("inv_code",mst.getCheck_code()).eq("struct_id", row.getStruct_id()));
}
}
return total_qty;
}
@Override
public List<Map> getCheckDtl(JSONObject map) {
return this.baseMapper.getCheckDtl(map);
}
}

292
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java
View File

@@ -1,11 +1,44 @@
package org.nl.wms.storage_manage.rawmanage.service.check.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.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.CHECKEnum;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckmstYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Stream;
/**
* <p>
* 盘点单主表 服务实现类
@@ -17,4 +50,259 @@ import org.springframework.stereotype.Service;
@Service
public class StIvtCheckmstYlServiceImpl extends ServiceImpl<StIvtCheckmstYlMapper, StIvtCheckmstYl> implements IStIvtCheckmstYlService {
@Autowired
private IStIvtBsrealstorattrService stIvtBsrealstorattrService;
@Autowired
private IStIvtCheckdtlYlService checkdtlYlService;
@Autowired
private IStIvtStructattrService structattrService;
@Override
public Object pageQuery(CheckQuery query, PageQuery page) {
// 查询条件
page.setSort("check_code,ASC");
// 分页查询
Page<StIvtCheckmstYl> pageQuery = this.page(page.build(), query.build());
TableDataInfo<StIvtCheckmstYl> build = TableDataInfo.build(pageQuery);
return build;
}
@Override
public void create(JSONObject form) {
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用主表 插入/更新方法
StIvtCheckmstYl checkmstYl = packageMstForm(new StIvtCheckmstYl(), form);
this.save(checkmstYl);
//调用明细表 插入方法
checkdtlYlService.create(rows, checkmstYl);
}
@Override
public List<Map> getCheckDtl(JSONObject map) {
return checkdtlYlService.getCheckDtl(map);
}
@Override
public void update(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("check_id")}, "请求参数不能为空");
StIvtCheckmstYl mst = form.toJavaObject(StIvtCheckmstYl.class);
this.updateById(mst);
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用明细表 插入/更新方法
checkdtlYlService.create(rows, mst);
}
@Override
public void saveCheck(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("row");
JSONArray rows = whereJson.getJSONArray("rows");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"}));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
checkdtlYlService.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"}));
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
String status = jo.getString("status");
StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class);
double base_qty = jo.getDoubleValue("base_qty");
dtl.setSeq_no(BigDecimal.valueOf(i + 1));
//已盘点过的明细不再处理
if ("05,06,07,99".contains(status)) {
checkdtlYlService.updateById(dtl);
continue;
}
dtl.setStatus(CHECKEnum.DTL_STATUS.code("盘点中"));
dtl.setCheck_optid(SecurityUtils.getCurrentUserId());
dtl.setCheck_optname(SecurityUtils.getCurrentNickName());
dtl.setCheck_time(DateUtil.now());
double fac_qty = jo.getDoubleValue("fac_qty");
//判断盈亏
if (fac_qty > base_qty) {
dtl.setCheck_result("2");
} else if (fac_qty < base_qty) {
dtl.setCheck_result("1");
} else {
dtl.setCheck_result("0");
}
if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) {
jo.put("checkdtl_id", IdUtil.getStringId());
}
checkdtlYlService.save(dtl);
}
jo_mst.setDtl_num(BigDecimal.valueOf(rows.size()));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("盘点中"));
jo_mst.setIs_nok(false);
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).ne("check_result", "0"));
if (dtl_list.size() != 0) {
jo_mst.setIs_nok(true);
}
this.updateById(jo_mst);
}
@Override
public void confirm(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("row");
JSONArray rows = whereJson.getJSONArray("rows");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"}));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
checkdtlYlService.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"}));
//定义需要需要更新的的点位集合
HashSet<String> set = new HashSet<>();
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
String status = jo.getString("status");
StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class);
double base_qty = jo.getDoubleValue("base_qty");
dtl.setSeq_no(BigDecimal.valueOf(i + 1));
//已盘点过的明细不再处理
if ("05,06,07,99".contains(status)) {
checkdtlYlService.updateById(dtl);
continue;
}
dtl.setStatus(CHECKEnum.DTL_STATUS.code("已盘点"));
dtl.setCheck_optid(SecurityUtils.getCurrentUserId());
dtl.setCheck_optname(SecurityUtils.getCurrentNickName());
dtl.setCheck_time(DateUtil.now());
double fac_qty = jo.getDoubleValue("fac_qty");
//判断盈亏
if (fac_qty > base_qty) {
dtl.setCheck_result("2");
} else if (fac_qty < base_qty) {
dtl.setCheck_result("1");
} else {
dtl.setCheck_result("0");
dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成"));
}
if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) {
jo.put("checkdtl_id", IdUtil.getStringId());
}
checkdtlYlService.save(dtl);
set.add(dtl.getStruct_id());
}
jo_mst.setDtl_num(BigDecimal.valueOf(rows.size()));
jo_mst.setIs_nok(false);
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).ne("check_result", "0"));
if (dtl_list.size() != 0) {
jo_mst.setIs_nok(true);
}
List<StIvtCheckdtlYl> finish_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlYlService.update(new UpdateWrapper<StIvtCheckdtlYl>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//锁定起点点位、仓位
set.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "0").set("inv_code", "").eq("struct_id", struct_id)));
}
this.updateById(jo_mst);
}
@Override
public void process0(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("form");
JSONObject row = whereJson.getJSONObject("row");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).ne("status", "99"));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
StIvtCheckdtlYl dtl = row.toJavaObject(StIvtCheckdtlYl.class);
dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成"));
dtl.setProcess_optid(SecurityUtils.getCurrentUserId());
dtl.setProcess_time(DateUtil.now());
dtl.setProcess_type(CHECKEnum.PROCESS_TYPE.code("账务为准"));
dtl.setIs_process(true);
checkdtlYlService.updateById(dtl);
List<StIvtCheckdtlYl> finish_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlYlService.update(new UpdateWrapper<StIvtCheckdtlYl>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
}
this.updateById(jo_mst);
}
@Override
public void process1(JSONObject jo) {
}
@Override
public void delete(Long[] ids) {
for (Long id : ids) {
StIvtCheckmstYl dao = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", id));
dao.setIs_delete(true);
//获取所有明细下的仓位解锁
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", id));
dtl_list.stream()
.map(dtl -> dtl.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
this.updateById(dao);
}
}
@NotNull
private StIvtCheckmstYl packageMstForm(StIvtCheckmstYl checkmstYl, JSONObject whereJson) {
JSONArray rows = whereJson.getJSONArray("tableData");
// 新增
checkmstYl.setCheck_id(IdUtil.getStringId());
checkmstYl.setCheck_code(CodeUtil.getNewCode("PD_CODE"));
checkmstYl.setBuss_type(whereJson.getString("check_type"));
checkmstYl.setCheck_type(checkmstYl.getBuss_type());
// 获取仓库信息
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("仓库不存在或未启用！");
checkmstYl.setStor_id(bsrealDao.getStor_id());
checkmstYl.setStor_name(bsrealDao.getStor_name());
checkmstYl.setDtl_num(BigDecimal.valueOf(rows.size()));
checkmstYl.setCreate_mode(CHECKEnum.CREATE_MODE.code("PC产生"));
checkmstYl.setStatus(CHECKEnum.BILL_STATUS.code("生成"));
checkmstYl.setCreate_id(SecurityUtils.getCurrentUserId());
checkmstYl.setCreate_name(SecurityUtils.getCurrentNickName());
checkmstYl.setCreate_time(DateUtil.now());
checkmstYl.setIs_delete(false);
checkmstYl.setIs_upload(true);
// TODO 暂时写死
checkmstYl.setSysdeptid("111");
checkmstYl.setSyscompanyid("111");
checkmstYl.setRemark(whereJson.getString("remark"));
checkmstYl.setWorkshop_id(whereJson.getString("workshop_id"));
return checkmstYl;
}
}

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

@@ -1,7 +1,9 @@
package org.nl.wms.storage_manage.rawmanage.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;
@@ -19,7 +21,9 @@ import org.nl.modules.system.util.CodeUtil;
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.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.IOSEnum;
@@ -41,6 +45,7 @@ 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;
@@ -74,10 +79,10 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
private IStIvtStructivtYlService structivtYlService;
@Autowired
private IPcsIfPurchaseorderService purchaseorderService;
private IMdMeMaterialbaseService materialbaseService;
@Autowired
private IMdMeMaterialbaseService materialbaseService;
private IStIvtStructattrService structattrService;
@Override
@@ -170,23 +175,58 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
for (StIvtStructivtYl ivt : list) {
//判断是否需要继续分配库存，不大于0时跳出循环
if (need_qty > 0){
if (need_qty > 0) {
double canuse_qty = ivt.getCanuse_qty().doubleValue();
if (canuse_qty >= need_qty){
//插入分配表
//插入分配表
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));
structivtYlService.updateById(ivt);
//维护库存
need_qty = 0;
} else {
dis.put("plan_qty", canuse_qty);
dis.put("real_qty", canuse_qty);
structivtYlService.remove(new QueryWrapper<StIvtStructivtYl>().eq("stockrecord_id", ivt.getStockrecord_id()));
need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue();
}
}else {
JSONObject mst_jo = new JSONObject();
mst_jo.put("mst_id", dtl.getIostorinv_id());
mst_jo.put("dtl_id", dtl.getIostorinv_id());
iostorinvdisYlService.create(dis, mst_jo);
//维护库存
} else {
break;
}
}
if (need_qty > 0){
throw new BadRequestException("物料:"+mater.getMaterial_name()+"库存不足，缺少："+need_qty+"KG");
if (need_qty > 0) {
throw new BadRequestException("物料:" + mater.getMaterial_name() + "库存不足，缺少：" + need_qty + "KG");
}
});
List<StIvtIostorinvdisYl> dis_list = iostorinvdisYlService.list(new QueryWrapper<StIvtIostorinvdisYl>().eq("iostorinv_id", iostorinv_id));
//修改分配状态
dis_list.forEach(dis -> {
dis.setWork_status(IOSEnum.WORK_STATUS.code("完成"));
iostorinvdisYlService.updateById(dis);
});
}
@NotNull

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

@@ -20,10 +20,7 @@ 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.dao.StIvtBsrealstorattr;
import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
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.dto.StIvtStructivtflowDto;
import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService;
@@ -35,7 +32,6 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIos
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
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.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -56,6 +56,27 @@ public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl<StIvtIostorinvdi
row.setWork_status(IOSEnum.WORK_STATUS.code("未生成"));
row.setPlan_qty(row.getPlan_qty());
// 获取库区信息
QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();
sect_wrapper.eq("sect_id", row.getSect_id());
sect_wrapper.eq("is_used", true);
StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper);
if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！");
row.setSect_code(sectDao.getSect_code());
row.setSect_name(sectDao.getSect_name());
// 获取仓位信息
QueryWrapper<StIvtStructattr> struct_wrapper = new QueryWrapper<>();
struct_wrapper.eq("struct_id", row.getStruct_id());
struct_wrapper.eq("is_used", true);
StIvtStructattr structDao = structattrService.getOne(struct_wrapper);
if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
row.setStruct_code(structDao.getStruct_code());
row.setStruct_name(structDao.getStruct_name());
row.setPcsn(DateUtil.today());
this.save(row);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java
View File

@@ -6,6 +6,9 @@ import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtY
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 仓位库存表 服务类
@@ -23,4 +26,6 @@ public interface IStIvtStructivtYlService extends IService<StIvtStructivtYl> {
* @return JSONObject
*/
Object getRawIvt(StructIvtYLQuery query, PageQuery page);
List<Map> getStructIvt(StructIvtYLQuery query);
}

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

@@ -21,4 +21,6 @@ import java.util.Map;
public interface StIvtStructivtYlMapper extends BaseMapper<StIvtStructivtYl> {
List<Map> getRawIvt(@Param("query") StructIvtYLQuery query, @Param("pageQuery") PageQuery pageQuery);
List<Map> getStructIvt(@Param("query") StructIvtYLQuery query);
}

38
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml
View File

@@ -23,7 +23,8 @@
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>
@@ -35,4 +36,39 @@
</if>
</where>
</select>
<select id="getStructIvt" 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_yl 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>

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

@@ -37,4 +37,9 @@ public class StIvtStructivtYlServiceImpl extends ServiceImpl<StIvtStructivtYlMap
build.setTotalElements(page.getTotal());
return build;
}
@Override
public List<Map> getStructIvt(StructIvtYLQuery query) {
return structivtYlMapper.getStructIvt(query);
}
}

90
mes/qd/src/views/wms/old_manage/old_package/index.vue
View File

@@ -101,12 +101,11 @@
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="confirm_flag"
@click="startWork()"
icon="el-icon-check"
@click="save"
>
开工
保存
</el-button>
<el-button
slot="right"
@@ -118,6 +117,17 @@
>
打印
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="confirm_flag"
@click="startWork()"
>
开工
</el-button>
</crudOperation>
<!--表单组件-->
@@ -402,7 +412,7 @@ export default {
query: {
workorder_status: '2',
product_area: 'A2',
workprocedure_code: 'BZ',
workprocedure_code: 'A1_BZ',
is_error: '0'
},
url: 'api/produceWorkorder',
@@ -431,46 +441,7 @@ export default {
roadList: ['1', '2', '3', '4', '5', '6', '7'],
confirm_flag: true,
permission: {},
rules: {
struct_id: [
{required: true, message: '仓位标识不能为空', trigger: 'blur'}
],
struct_code: [
{required: true, message: '仓位编码不能为空', trigger: 'blur'}
],
struct_name: [
{required: true, message: '仓位名称不能为空', trigger: 'blur'}
],
sect_id: [
{required: true, message: '库区标识不能为空', trigger: 'blur'}
],
stor_id: [
{required: true, message: '仓库标识不能为空', trigger: 'blur'}
],
capacity: [
{required: false, message: '不能为空', trigger: 'blur'},
{validator: numberOne}
],
weight: [
{required: false, message: '不能为空', trigger: 'blur'},
{validator: numberOne}
],
width: [
{required: false, message: '不能为空', trigger: 'blur'},
{validator: numberOne}
],
height: [
{required: false, message: '不能为空', trigger: 'blur'},
{validator: numberOne}
],
zdepth: [
{required: false, message: '不能为空', trigger: 'blur'},
{validator: numberOne}
],
material_height_type: [
{required: true, message: '物料高度类型不能为空', trigger: 'blur'}
]
}
rules: {}
}
},
created() {
@@ -542,10 +513,10 @@ export default {
this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty)
this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty)
orderExt.add(this.currentRow).then(res => {
this.notify('操作成功', 'success')
})
crudProduceshiftorder.openStart(this.currentRow).then(res => {
})
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
},
sectQueryChange(val) {
if (val.length === 1) {
@@ -562,12 +533,35 @@ export default {
}
this.crud.toQuery()
},
save() {
if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type ||
!this.crud.query.target_roadway || !this.crud.query.is_flip ||
!this.crud.query.tray_full_num) {
this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (!this.currentRow.workorder_code) {
this.crud.notify('请选择一条工单记录进行保存', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.currentRow.extra_map = this.crud.query
this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty)
this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty)
orderExt.add(this.currentRow).then(res => {
this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
print() {
if (!this.currentRow) {
debugger
if (!this.currentRow.workorder_code) {
this.crud.notify('请选择一条工单记录进行打印', CRUD.NOTIFICATION_TYPE.INFO)
return
}
orderExt.getExtList(this.currentRow).then(res => {
debugger
if (res.length == 0 || !res) {
this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO)
return
}
res.forEach((item) => {
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮

44
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -165,6 +165,16 @@
>
导入
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="print"
>
打印
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -470,6 +480,8 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import AddDialog from '@/views/wms/product_manage/workorder/AddDialog'
import UploadDialog from '@/views/wms/product_manage/workorder/UploadDialog'
import ReplaceDeviceDialog from '@/views/wms/product_manage/workorder/ReplaceDeviceDialog'
import orderExt from '@/views/wms/product_manage/workorder/orderExt'
import {getLodop} from '@/assets/js/lodop/LodopFuncs'
const defaultForm = {
workorder_id: null,
@@ -630,6 +642,38 @@ export default {
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
return [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
},
print() {
debugger
if (this.crud.selections.length <= 0 || this.crud.selections.length > 1) {
this.$message('请选择一条工单进行打印！')
return
}
let a = this.crud.selections[0]
orderExt.getExtList(a).then(res => {
if (res.length == 0 || !res) {
this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO)
return
}
res.forEach((item) => {
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '')
// LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '25mm', '128Auto', item.bar_code)
LODOP.SET_PRINT_STYLEA(0, 'ShowBarText', 0)
LODOP.ADD_PRINT_TEXT('35mm', '22mm', '40mm', '20mm', item.bar_code.substring(0, 9))
LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20)
LODOP.ADD_PRINT_TEXT('42mm', '25mm', '40mm', '20mm', item.bar_code.substring(9, 16))
console.log(item.barcode)
LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20)
LODOP.PRINT()// 打印
// LODOP.PREVIEW()
})
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
this.crud.toQuery()
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr

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

@@ -234,7 +234,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 crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudStructattr from "@/api/wms/basedata/st/structattr";
@@ -303,7 +303,7 @@ export default {
},
methods: {
open() {
crudStorattr.queryStor({"stor_type": "3"}).then(res => {
crudStorattr.getStor({"stor_type": "3"}).then(res => {
this.storlist = res.content
})
},

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

@@ -317,7 +317,7 @@ export default {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductIn.confirm(this.currentRow).then(res => {
crudProductOut.confirm(this.currentRow).then(res => {
this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})

54
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js
View File

@@ -40,187 +40,187 @@ export function getIODis(data) {
}
export function getOutBillDisDtl(params) {
return request({
url: '//api/out/stIvtIostorinvYl/getOutBillDisDtl',
url: '/api/out/stIvtIostorinvYl/getOutBillDisDtl',
method: 'get',
params
})
}
export function getOutBillTask(params) {
return request({
url: '//api/out/stIvtIostorinvYl/getOutBillTask',
url: '/api/out/stIvtIostorinvYl/getOutBillTask',
method: 'get',
params
})
}
export function getInvTypes() {
return request({
url: '//api/out/stIvtIostorinvYl/getInvTypes',
url: '/api/out/stIvtIostorinvYl/getInvTypes',
method: 'get'
})
}
export function insertDtl(data) {
return request({
url: '//api/out/stIvtIostorinvYl/insertDtl',
url: '/api/out/stIvtIostorinvYl/insertDtl',
method: 'post',
data
})
}
export function allDiv(data) {
return request({
url: '//api/out/stIvtIostorinvYl/allDiv',
url: '/api/out/stIvtIostorinvYl/allDiv',
method: 'post',
data
})
}
export function allDivOne(data) {
return request({
url: '//api/out/stIvtIostorinvYl/allDivOne',
url: '/api/out/stIvtIostorinvYl/allDivOne',
method: 'post',
data
})
}
export function allCancel(data) {
return request({
url: '//api/out/stIvtIostorinvYl/allCancel',
url: '/api/out/stIvtIostorinvYl/allCancel',
method: 'post',
data
})
}
export function oneCancel(data) {
return request({
url: '//api/out/stIvtIostorinvYl/oneCancel',
url: '/api/out/stIvtIostorinvYl/oneCancel',
method: 'post',
data
})
}
export function setPoint(data) {
return request({
url: '//api/out/stIvtIostorinvYl/setPoint',
url: '/api/out/stIvtIostorinvYl/setPoint',
method: 'post',
data
})
}
export function oneSetPoint(data) {
return request({
url: '//api/out/stIvtIostorinvYl/oneSetPoint',
url: '/api/out/stIvtIostorinvYl/oneSetPoint',
method: 'post',
data
})
}
export function getStructIvt(params) {
return request({
url: '//api/out/stIvtIostorinvYl/getStructIvt',
url: '/api/out/stIvtIostorinvYl/getStructIvt',
method: 'get',
params
})
}
export function manualDiv(data) {
return request({
url: '//api/out/stIvtIostorinvYl/manualDiv',
url: '/api/out/stIvtIostorinvYl/manualDiv',
method: 'post',
data
})
}
export function confirm(data) {
return request({
url: '//api/out/stIvtIostorinvYl/confirm',
url: '/api/out/stIvtIostorinvYl/confirm',
method: 'post',
data
})
}
export function issueTask(data) {
return request({
url: '//api/out/stIvtIostorinvYl/issueTask',
url: '/api/out/stIvtIostorinvYl/issueTask',
method: 'post',
data
})
}
export function finishTask(data) {
return request({
url: '//api/out/stIvtIostorinvYl/finishTask',
url: '/api/out/stIvtIostorinvYl/finishTask',
method: 'post',
data
})
}
export function cancleTaskfinish(data) {
return request({
url: '//api/out/stIvtIostorinvYl/cancleTaskfinish',
url: '/api/out/stIvtIostorinvYl/cancleTaskfinish',
method: 'post',
data
})
}
export function paramByCodeType(data) {
return request({
url: '//api/out/stIvtIostorinvYl/paramByCodeType',
url: '/api/out/stIvtIostorinvYl/paramByCodeType',
method: 'post',
data
})
}
export function schAreaType(data) {
return request({
url: '//api/out/stIvtIostorinvYl/schAreaType',
url: '/api/out/stIvtIostorinvYl/schAreaType',
method: 'post',
data
})
}
export function backConfirm(data) {
return request({
url: '//api/out/stIvtIostorinvYl/backConfirm',
url: '/api/out/stIvtIostorinvYl/backConfirm',
method: 'post',
data
})
}
export function getType() {
return request({
url: '//api/out/stIvtIostorinvYl/getType',
url: '/api/out/stIvtIostorinvYl/getType',
method: 'get'
})
}
export function moneySubmit(data) {
return request({
url: '//api/out/stIvtIostorinvYl/moneySubmit',
url: '/api/out/stIvtIostorinvYl/moneySubmit',
method: 'post',
data
})
}
export function getDisNum(data) {
return request({
url: '//api/out/stIvtIostorinvYl/getDisNum',
url: '/api/out/stIvtIostorinvYl/getDisNum',
method: 'post',
data
})
}
export function queryBox(data) {
return request({
url: '//api/out/stIvtIostorinvYl/queryBox',
url: '/api/out/stIvtIostorinvYl/queryBox',
method: 'post',
data
})
}
export function getOutBillTask2(data) {
return request({
url: '//api/out/stIvtIostorinvYl/getOutBillTask2',
url: '/api/out/stIvtIostorinvYl/getOutBillTask2',
method: 'post',
data
})
}
export function cancelTask(data) {
return request({
url: '//api/out/stIvtIostorinvYl/cancelTask',
url: '/api/out/stIvtIostorinvYl/cancelTask',
method: 'post',
data
})
}
export function allSetPoint(data) {
return request({
url: '//api/out/stIvtIostorinvYl/allSetPoint',
url: '/api/out/stIvtIostorinvYl/allSetPoint',
method: 'post',
data
})
}
export function oneSetPoint2(data) {
return request({
url: '//api/out/stIvtIostorinvYl/oneSetPoint2',
url: '/api/out/stIvtIostorinvYl/oneSetPoint2',
method: 'post',
data
})

97
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue
View File

@@ -11,22 +11,42 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<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-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-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
<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-input v-show="false" v-model="form.stor_code" placeholder="仓库编码"/>
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称"/>
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
:disabled="crud.status.view > 0"
placeholder="全部"
class="filter-item"
>
<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="仓库" prop="stor_id">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -57,7 +77,7 @@
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -72,7 +92,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -81,11 +101,12 @@
</el-form-item>
<el-form-item label="明细数" prop="dtl_num">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
<el-input v-model.trim="form.dtl_num" size="mini" 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.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea"
:disabled="crud.status.view > 0"/>
</el-form-item>
</el-form>
<div class="crud-opts2">
@@ -93,7 +114,7 @@
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
@@ -114,31 +135,30 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
<el-table-column prop="sect_name" label="盘点库区" align="center" />
<el-table-column prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
<el-table-column prop="base_qty" label="桶数" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="fac_qty" label="盘点桶数" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="qty_unit_name" label="计量单位" align="center" />
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="sect_name" label="盘点库区" align="center"/>
<el-table-column prop="struct_name" label="盘点货位" align="center"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center"/>
<el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip/>
<el-table-column prop="base_qty" label="重量" align="center" :formatter="crud.formatNum0"/>
<el-table-column v-if="crud.status.view > 0" prop="fac_qty" label="盘点重量" align="center" :formatter="crud.formatNum0"/>
<el-table-column prop="qty_unit_name" label="计量单位" align="center"/>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" 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)" />
<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>
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged"/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/storage_manage/rawproduct/rawproductCheck/AddDtl'
import CRUD, {crud, form} from '@crud/crud'
import AddDtl from '@/views/wms/storage_manage/rawproduct/rawproductCheck/StructIvt'
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
const defaultForm = {
check_code: '',
@@ -148,13 +168,14 @@ const defaultForm = {
status: '10',
dtl_num: '0',
check_type: '',
workshop_id: '',
remark: '',
create_mode: '',
tableData: []
}
export default {
name: 'AddDialog',
components: { AddDtl },
components: {AddDtl},
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
@@ -162,7 +183,7 @@ export default {
default: false
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'check_dtl_status', 'product_area'],
data() {
return {
dialogVisible: false,
@@ -173,10 +194,13 @@ export default {
storlist: [],
rules: {
stor_id: [
{ required: true, message: '仓库不能为空', trigger: 'blur' }
{required: true, message: '仓库不能为空', trigger: 'blur'}
],
check_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
{required: true, message: '业务类型不能为空', trigger: 'blur'}
],
workshop_id: [
{required: true, message: '车间不能为空', trigger: 'blur'}
]
}
}
@@ -191,7 +215,7 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({'stor_type': '3'}).then(res => {
this.storlist = res.content
})
},
@@ -199,7 +223,7 @@ export default {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({'check_id': this.form.check_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -210,7 +234,7 @@ export default {
})
},
[CRUD.HOOK.afterToView]() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({'check_id': this.form.check_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -220,9 +244,6 @@ export default {
}
})
},
bill_statusFormat(row) {
return this.dict.label.check_dtl_status[row.status]
},
storChange(row) {
this.storlist.forEach((item) => {
if (item.stor_id === row) {
@@ -249,17 +270,16 @@ export default {
}
}
if (!this.flagnow) {
item.edit = false
item.status = '01'
tablemap.set(item.struct_code + '间隔' + item.material_code, item)
}
} else {
item.edit = false
item.status = '01'
tablemap.set(item.struct_code + '间隔' + item.material_code, item)
}
})
for (const value of tablemap.values()) {
value.base_qty = value.canuse_qty
this.form.tableData.push(value)
}
this.form.dtl_num = this.form.tableData.length
@@ -287,6 +307,7 @@ export default {
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;

31
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog.vue
View File

@@ -23,7 +23,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -53,7 +53,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -101,8 +101,7 @@
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="sect_name" label="盘点库区" align="center" />
<el-table-column prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="100" align="center">
<template scope="scope">
<el-input v-show="isShow(scope.$index, scope.row,1)" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
@@ -111,10 +110,10 @@
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" align="center" />
<el-table-column prop="base_qty" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column show-overflow-tooltip prop="fac_qty" label="盘点桶数" width="160" align="center">
<el-table-column prop="base_qty" label="重量" :formatter="crud.formatNum0" align="center" />
<el-table-column show-overflow-tooltip prop="fac_qty" label="盘点重量" width="160" align="center">
<template scope="scope">
<el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="0" :min="0" />
<el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="3" :min="0" />
<span v-show="isShow(scope.$index, scope.row,4)">{{ scope.row.fac_qty }}</span>
</template>
</el-table-column>
@@ -135,14 +134,14 @@
<el-button type="primary" @click="saveCheck">保存</el-button>
<el-button type="primary" @click="submitCheck">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<MaterDialog :dialog-show.sync="materShow" @setMaterValue="tableChanged2" />
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import MaterDialog from '@/views/wms/pub/MaterDialog'
export default {
@@ -161,7 +160,7 @@ export default {
type: Object
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result'],
data() {
return {
dialogVisible: false,
@@ -197,15 +196,15 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
check.getOutBillDtl2({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({ 'check_id': this.form.check_id }).then(res => {
this.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.tableData.length; i++) {
const row = this.tableData[i]
row.edit = false
this.$set(row,'edit',false)
if (row.status > '04') {
row.edit = true
}
@@ -303,7 +302,7 @@ export default {
this.form = row
},
bill_statusFormat(row, column) {
return this.dict.label.check_dtl_status[row.status]
return this.dict.label.CHECK_DTL_STATUS[row.status]
},
check_resultFormat(row, column) {
return this.dict.label.check_result[row.check_result]
@@ -313,7 +312,7 @@ export default {
this.crud.notify('请先选中一条已存在的库存明细！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '42', qty_unit_name: '桶', is_down: '0', fac_qty: '', check_result: '0', edit: false })
this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '1', qty_unit_name: 'KG', is_down: '0', fac_qty: '', check_result: '0', edit: false })
this.form.dtl_num = this.tableData.length
},
async queryMater(index, row) {
@@ -323,7 +322,7 @@ export default {
},
tableChanged2(row) {
for (let i = 0; i < this.tableData.length; i++) {
if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {
if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {
this.crud.notify('不允许货位、载具、物料同时相同！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}

22
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog.vue
View File

@@ -23,7 +23,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -53,7 +53,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -82,7 +82,7 @@
:disabled="process1_flag"
@click="process1"
>
重新盘点
实盘为准
</el-button>
</span>
@@ -129,7 +129,7 @@
<script>
import { crud } from '@crud/crud'
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import ReCheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog'
export default {
@@ -148,7 +148,7 @@ export default {
type: Object
}
},
dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result'],
data() {
return {
dialogVisible: false,
@@ -185,7 +185,7 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
this.getOutBillDtl()
@@ -214,7 +214,7 @@ export default {
this.form = row
},
bill_statusFormat(row, column) {
return this.dict.label.check_dtl_status[row.status]
return this.dict.label.CHECK_DTL_STATUS[row.status]
},
check_resultFormat(row, column) {
return this.dict.label.check_result[row.check_result]
@@ -225,12 +225,12 @@ export default {
})
},
process1() {
if (this.nowrow !== null) {
this.$refs.child3.setReForm(this.nowrow)
}
check.process1({ 'form': this.form, 'row': this.nowrow }).then(res => {
this.getOutBillDtl()
})
},
getOutBillDtl() {
check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
check.getCheckDtl({ 'check_id': this.form.check_id,'check_result': '-1'}).then(res => {
this.tableData = res
})
}

4
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog.vue
View File

@@ -138,7 +138,7 @@
<el-button type="primary" @click="process1">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
<!-- <BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />-->
</el-dialog>
</template>
@@ -150,7 +150,7 @@ import MaterDialog from '@/views/wms/pub/MaterDialog'
export default {
name: 'ReCheckDialog',
components: { MaterDialog, BucketDialog },
components: { MaterDialog },
mixins: [crud()],
props: {
dialogShow: {

156
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/StructIvt.vue Normal file
View File

@@ -0,0 +1,156 @@
<!--suppress ALL -->
<template>
<el-dialog
title="库存选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1200px"
@close="close"
@open="open"
>
<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="日期">
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="库区/货位">
<el-input
v-model="query.bill_code"
clearable
size="mini"
placeholder="单据号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料">
<el-input
v-model="query.material_search"
clearable
size="mini"
placeholder="物料"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation/>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip width="150" prop="sect_code" label="库区"/>
<el-table-column show-overflow-tooltip width="150" prop="struct_name" label="货位"/>
<el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号"/>
<el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip width="150" prop="class_name" label="物料类别"/>
<el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="重量"/>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位"/>
</el-table>
<!--分页组件-->
<pagination/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, {crud, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
const start = new Date()
export default {
name: 'AddDtl',
components: {crudOperation, rrOperation, pagination, DateRangePicker},
cruds() {
return CRUD({
title: '原材料可用库存',
url: '/api/stIvtStructivtYl/getRawIvt',
crudMethod: {},
optShow: {
reset: true
}
})
},
mixins: [presenter(), header(), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
rows: [],
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
objectSpanMethod({row, column, rowIndex, columnIndex}) {
if (columnIndex === 0) {
if (rowIndex % 2 === 0) {
return {
rowspan: 2,
colspan: 1
}
} else {
return {
rowspan: 0,
colspan: 0
}
}
}
},
open() {
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
this.$emit('tableChanged', this.rows)
// this.form = this.$options.data().form
}
}
}
</script>

41
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js
View File

@@ -10,27 +10,28 @@ export function add(data) {
export function del(ids) {
return request({
url: 'api/check/',
method: 'delete',
url: 'api/check/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/check',
method: 'put',
url: 'api/check/update',
method: 'post',
data
})
}
export function getOutBillDtl(params) {
export function getCheckDtl(data) {
return request({
url: '/api/check/getOutBillDtl',
method: 'get',
params
url: '/api/check/getCheckDtl',
method: 'post',
data
})
}
export function getOutBillDtl2(params) {
return request({
url: '/api/check/getOutBillDtl2',
@@ -38,6 +39,7 @@ export function getOutBillDtl2(params) {
params
})
}
export function getOutBillDis(params) {
return request({
url: '/api/check/getOutBillDis',
@@ -45,12 +47,14 @@ export function getOutBillDis(params) {
params
})
}
export function getInvTypes() {
return request({
url: '/api/check/getInvTypes',
method: 'get'
})
}
export function insertDtl(data) {
return request({
url: '/api/check/insertDtl',
@@ -58,6 +62,7 @@ export function insertDtl(data) {
data
})
}
export function getStructIvt(params) {
return request({
url: '/api/check/getStructIvt',
@@ -73,6 +78,7 @@ export function confirm(data) {
data
})
}
export function handdown(data) {
return request({
url: '/api/check/handdown',
@@ -80,6 +86,7 @@ export function handdown(data) {
data
})
}
export function saveCheck(data) {
return request({
url: '/api/check/saveCheck',
@@ -87,6 +94,7 @@ export function saveCheck(data) {
data
})
}
export function process0(data) {
return request({
url: '/api/check/process0',
@@ -94,6 +102,7 @@ export function process0(data) {
data
})
}
export function process1(data) {
return request({
url: '/api/check/process1',
@@ -101,4 +110,18 @@ export function process1(data) {
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 }
export default {
add,
edit,
del,
getCheckDtl,
getStructIvt,
getOutBillDtl2,
confirm,
getInvTypes,
saveCheck,
process0,
getOutBillDis,
process1
}

68
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue
View File

@@ -78,7 +78,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.check_bill_status"
v-for="item in dict.CHECK_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -97,14 +97,14 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_TYPE_CK"
v-for="item in dict.ST_INV_CK_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -173,32 +173,32 @@
/>
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="check_code" min-width="130" label="订单编码">
<el-table-column :selectable="checkboxT" type="selection" width="55"/>
<el-table-column prop="check_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
</template>
</el-table-column>
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态"/>
<el-table-column prop="stor_name" label="仓库" min-width="100"/>
<el-table-column prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型"/>
<el-table-column prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态"/>
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100"/>
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100"/>
<el-table-column prop="create_time" min-width="135" label="创建日期"/>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<AddDialog @AddChanged="querytable" />
<CheckDialog ref="child" @AddChanged="querytable" />
<ProcessDialog ref="child2" @AddChanged="querytable" />
<AddDialog @AddChanged="querytable"/>
<CheckDialog ref="child" @AddChanged="querytable"/>
<ProcessDialog ref="child2" @AddChanged="querytable"/>
</div>
</template>
<script>
import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
import CRUD, { crud, header, presenter } from '@crud/crud'
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'
@@ -206,31 +206,33 @@ import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog'
import CheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog'
import ProcessDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import {download} from '@/api/data'
import {downloadFile} from '@/utils'
export default {
name: 'Check',
components: { CheckDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, ProcessDialog },
components: {CheckDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, ProcessDialog},
cruds() {
return CRUD({ title: '用户',
return CRUD({
title: '用户',
props: {
// 每页数据条数
size: 20
},
idField: 'check_id', url: 'api/check', crudMethod: { ...check },
idField: 'check_id', url: 'api/check', crudMethod: {...check},
optShow: {
add: true,
edit: false,
del: false,
reset: true,
download: false
}})
}
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['check_bill_status', 'ST_CREATE_MODE', 'ST_INV_TYPE_CK'],
dicts: ['CHECK_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_CK_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -246,14 +248,14 @@ export default {
storlist: []
}
},
mounted: function() {
mounted: function () {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({'stor_type': '3'}).then(res => {
this.storlist = res.content
})
},
@@ -272,7 +274,7 @@ export default {
this.buttonChange(row)
} else if (val.length === 1) {
this.buttonChange(row)
}else{
} else {
this.handleCurrentChange(null)
}
},
@@ -289,7 +291,7 @@ export default {
} else {
this.check_flag = true
}
if (current.status === '30' && current.is_nok === '1') {
if (current.status === '30' && current.is_nok) {
this.confirm_flag = false
} else {
this.confirm_flag = true
@@ -297,16 +299,16 @@ export default {
}
},
stateFormat(row) {
return this.dict.label.check_bill_status[row.status]
return this.dict.label.CHECK_BILL_STATUS[row.status]
},
bill_typeFormat(row) {
return this.dict.label.ST_INV_TYPE_CK[row.check_type]
return this.dict.label.ST_INV_CK_TYPE[row.check_type]
},
create_modeFormat(row) {
return this.dict.label.ST_CREATE_MODE[row.create_mode]
},
is_nokFormat(row) {
if (row.is_nok === '1') {
if (row.is_nok) {
return '异常'
} else {
return '正常'
@@ -336,7 +338,7 @@ export default {
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/check/download', { check_id: this.currentRow.check_id }).then(result => {
download('/api/check/download', {check_id: this.currentRow.check_id}).then(result => {
downloadFile(result, this.currentRow.check_code + '盘点数据', 'xlsx')
crud.downloadLoading = false
}).catch(() => {

202
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog.vue
View File

@@ -11,20 +11,35 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<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-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
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.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -64,12 +79,12 @@
<el-form-item label="货位" prop="struct_code">
<label slot="label">货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位:</label>
<el-input v-model.trim="form.struct_code" style="width: 210px" disabled placeholder="选择货位">
<el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()" />
<el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()"/>
</el-input>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
<el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px"/>
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -84,7 +99,13 @@
</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.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-input
v-model.trim="form.remark"
style="width: 380px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
/>
</el-form-item>
</el-form>
@@ -92,7 +113,7 @@
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<!--<el-button
slot="left"
class="filter-item"
@@ -127,89 +148,30 @@
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="storagevehicle_code" label="载具号" align="center" width="150px">
<el-table-column type="index" label="序号" width="55" align="center"/>
<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 && scope.row.is_add" v-model="scope.row.storagevehicle_code" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.storagevehicle_code }}</span>
<span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.storagevehicle_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" width="190" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.bucketunique" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-plus" @click="queryBucket(scope.$index, scope.row)" />
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)"/>
</el-input>
<span v-show="scope.row.edit">{{ scope.row.bucketunique }}</span>
<span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.bucketunique }}</span>
<span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次号" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="150px">
<template slot-scope="scope">
<el-select
v-model="scope.row.quality_scode"
size="mini"
clearable
class="filter-item"
disabled
>
<el-option
v-for="item in dict.ST_QUALITY_SCODE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="ivt_level" label="库存等级" align="center" width="150px">
<template slot-scope="scope">
<el-select
v-model="scope.row.ivt_level"
size="mini"
clearable
class="filter-item"
placeholder="无"
disabled
>
<el-option
v-for="item in dict.ST_IVT_LEVEL"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="is_active" label="是否可用" align="center" width="150px">
<template slot-scope="scope">
<el-select
v-model="scope.row.is_active"
size="mini"
clearable
class="filter-item"
placeholder="无"
disabled
>
<el-option
v-for="item in dict.is_used"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="ivt_qty" label="库存重量" align="center" :formatter="crud.formatNum3" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="200" show-overflow-tooltip/>
<el-table-column prop="ivt_qty" label="库存重量" align="center" :formatter="crud.formatNum3"/>
<el-table-column prop="mol_qty" width="220" label="损溢重量" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.mol_qty" :disabled="scope.row.edit" :precision="3" :controls="false" :min="0" style="width: 120px" />
<el-input-number
v-model="scope.row.mol_qty"
:disabled="scope.row.edit"
:precision="3"
:controls="false"
:min="0"
style="width: 120px"
/>
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center"/>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="190" fixed="right">
<template scope="scope">
<el-button
@@ -241,17 +203,16 @@
</el-table-column>
</el-table>
<MaterDtl :dialog-show.sync="materShow" :dialog-matertype="materType" @tableChanged2="tableChanged2" />
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged" />
<BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
<MaterDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged"/>
</el-dialog>
</template>
<script>
import crudOperation from '@crud/CRUD.operation'
import BucketDialog from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog'
import CRUD, { crud, form } from '@crud/crud'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import CRUD, {crud, form} from '@crud/crud'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import crudMoreOrless from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import StructDiv from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv'
@@ -275,7 +236,7 @@ const defaultForm = {
export default {
name: 'AddDialog',
components: { crudOperation, MaterDtl, StructDiv, BucketDialog },
components: {crudOperation, MaterDtl, StructDiv, BucketDialog},
mixins: [crud(), form(defaultForm)],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'ST_MOL_TYPE'],
props: {
@@ -301,13 +262,13 @@ export default {
storlist: [],
rules: {
stor_id: [
{ required: true, message: '仓库不能为空', trigger: 'blur' }
{required: true, message: '仓库不能为空', trigger: 'blur'}
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
{required: true, message: '业务类型不能为空', trigger: 'blur'}
],
biz_date: [
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
{required: true, message: '业务日期不能为空', trigger: 'blur'}
]
}
}
@@ -322,13 +283,13 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({'stor_type': '3'}).then(res => {
this.storlist = res.content
})
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
crudMoreOrless.queryMolDtl({'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -341,7 +302,7 @@ export default {
},
[CRUD.HOOK.afterToView]() {
this.mater_btn = true
crudMoreOrless.queryMolDetail({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
crudMoreOrless.queryMolDetail({'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -385,13 +346,13 @@ export default {
return false
}
if (this.crud.status.add > 0) {
crudMoreOrless.getStructIvt({ 'struct_id': this.form.struct_id }).then(res => {
crudMoreOrless.getStructIvt({'struct_id': this.form.struct_id}).then(res => {
this.form.tableData = res
this.form.dtl_num = this.form.tableData.length
})
}
if (this.crud.status.edit > 0) {
crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
crudMoreOrless.queryMolDtl({'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id}).then(res => {
this.form.tableData = res
this.form.dtl_num = this.form.tableData.length
})
@@ -399,17 +360,11 @@ export default {
},
tableChanged2(row) {
// 新增一行物料时，给行进行赋值
this.nowrow.material_code = row.material_code
this.nowrow.material_id = row.material_id
this.nowrow.material_name = row.material_name
this.nowrow.qty_unit_id = row.qty_unit_id
this.nowrow.qty_unit_name = row.qty_unit_name
this.nowrow.quality_scode = row.quality_scode
this.nowrow.is_active = row.is_active
this.nowrow.ivt_level = row.ivt_level
this.nowrow.pcsn = row.pcsn
this.nowrow.mol_qty = row.storage_qty
this.nowrow.bucketunique = row.bucketunique
this.$set(this.nowrow, 'material_code', row.material_code)
this.$set(this.nowrow, 'material_id', row.material_id)
this.$set(this.nowrow, 'material_name', row.material_name)
this.$set(this.nowrow, 'qty_unit_id', row.qty_unit_id)
this.$set(this.nowrow, 'qty_unit_name', row.base_unit_name)
this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
},
tableChanged(row) {
@@ -418,8 +373,13 @@ export default {
this.form.sect_id = row.sect_id
this.form.sect_name = row.sect_name
this.form.struct_name = row.struct_name
crudMoreOrless.getStructIvt({ 'struct_id': row.struct_id }).then(res => {
crudMoreOrless.getStructIvt({'struct_id': row.struct_id}).then(res => {
this.form.tableData = res
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.$set(row, 'edit', false)
this.form.tableData.splice(i, 1, row)
}
this.form.dtl_num = this.form.tableData.length
})
},
@@ -443,7 +403,15 @@ export default {
this.nowrow = row
},
async insertdtl() {
this.form.tableData.push({ quality_scode: '02', ivt_qty: 0, mol_qty: 0, is_active: '1', ivt_level: '01', edit: false, is_add: true })
this.form.tableData.push({
quality_scode: '02',
ivt_qty: 0,
mol_qty: 0,
is_active: '1',
ivt_level: '01',
edit: false,
is_add: true
})
this.form.dtl_num = this.form.tableData.length
},
typeChange(val) {
@@ -461,7 +429,7 @@ export default {
},
handleEdit(index, row) {
if (!row.edit) {
if (parseFloat(row.mol_qty) <= 0) {
if (typeof (row.mol_qty) === 'undefined' | (parseFloat(row.mol_qty) <= 0)) {
this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
@@ -469,18 +437,6 @@ export default {
this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.storagevehicle_code) {
this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.bucketunique) {
this.crud.notify('桶号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!row.pcsn) {
this.crud.notify('批次不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
return false

48
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv.vue
View File

@@ -29,10 +29,11 @@
placeholder="输入货位编码、名称"
prefix-icon="el-icon-search"
class="filter-item"
/> </el-col>
/>
</el-col>
<el-col :span="6">
<rrOperation />
<rrOperation/>
</el-col>
</el-row>
<!--表格渲染-->
@@ -46,15 +47,15 @@
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="struct_code" label="货位编码" />
<el-table-column prop="struct_name" label="货位名称" />
<el-table-column prop="sect_name" label="库区名称" />
<el-table-column prop="lock_type" :formatter="lockFormat" label="是否锁定" />
<el-table-column prop="storagevehicle_code" label="存储载具号" />
<el-table-column type="selection" width="55"/>
<el-table-column prop="struct_code" label="货位编码"/>
<el-table-column prop="struct_name" label="货位名称"/>
<el-table-column prop="sect_name" label="库区名称"/>
<el-table-column prop="lock_type" :formatter="lockFormat" label="是否锁定"/>
<el-table-column prop="storagevehicle_code" label="存储载具号"/>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
@@ -64,7 +65,7 @@
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import CRUD, {crud, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
@@ -73,7 +74,7 @@ import crudSectattr from '@/api/wms/basedata/st/sectattr'
export default {
name: 'StructDiv',
components: { crudOperation, rrOperation, pagination },
components: {crudOperation, rrOperation, pagination},
cruds() {
return CRUD({
title: '仓位',
@@ -81,8 +82,8 @@ export default {
url: 'api/structattr',
idField: 'struct_id',
sort: 'struct_id,desc',
query: { search: '', is_lock: '1', sect_id: '', stor_id: '' },
crudMethod: { ...crudStructattr }
query: {search: '', is_lock: '1', sect_id: '', stor_id: ''},
crudMethod: {...crudStructattr}
})
},
mixins: [presenter(), header()],
@@ -122,7 +123,7 @@ export default {
methods: {
open() {
this.crud.resetQuery(false)
crudSectattr.getSect({ 'is_materialstore': '1' }).then(res => {
crudSectattr.getSect({ 'stor_type': '3' }).then(res => {
this.sects = res.content
})
if (this.sect) {
@@ -192,22 +193,9 @@ export default {
return
}
// 溢单不允许选择已锁定或者有载具的货位
if (this.mol_type === '1') {
if (this.checkrow.lock_type !== '00') {
this.$message('溢单不允许选择已锁定的货位！')
return
}
}
// 损单不允许选择已锁定或者无载具的货位
if (this.mol_type === '0') {
if (this.checkrow.lock_type !== '00') {
this.$message('损单不允许选择已锁定的货位！')
return
}
if (this.checkrow.storagevehicle_code === '') {
this.$message('损单不允许选择无载具的货位！')
return
}
if (this.checkrow.lock_type !== '0') {
this.$message('不允许选择已锁定的货位！')
return
}
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.checkrow)

13
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/index.vue
View File

@@ -77,7 +77,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.mol_bill_status"
v-for="item in dict.MOL_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -170,10 +170,11 @@ import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import AddDialog from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import crudMoreOrless from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless'
export default {
name: 'MoreOrLess',
name: 'RawProductMl',
components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
@@ -190,7 +191,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['mol_bill_status', 'ST_CREATE_MODE', 'ST_MOL_TYPE'],
dicts: ['MOL_BILL_STATUS', 'ST_CREATE_MODE', 'ST_MOL_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -217,7 +218,7 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},
@@ -266,7 +267,7 @@ export default {
}
},
stateFormat(row, column) {
return this.dict.label.mol_bill_status[row.status]
return this.dict.label.MOL_BILL_STATUS[row.status]
},
typeFormat(row, column) {
return this.dict.label.ST_MOL_TYPE[row.mol_type]

4
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless.js
View File

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