add:策略管理，单据管理
This commit is contained in:
@@ -0,0 +1,90 @@
|
||||
package org.nl.common.utils;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/*
|
||||
* @author ZZQ
|
||||
* @Date 2022/11/29 2:55 下午
|
||||
* 三叉Map
|
||||
*/
|
||||
public class ForkMap<L,M,R> implements Serializable {
|
||||
|
||||
transient Map<Integer,Node> items=new HashMap<>();
|
||||
transient Set<L> keySet = new HashSet<>();
|
||||
|
||||
public <M> M getM(L key){
|
||||
Node<L,M,R> node = items.get(hash(key));
|
||||
if (node==null){
|
||||
return null;
|
||||
}
|
||||
return node.middle;
|
||||
}
|
||||
|
||||
public <L> L getNode(M desc){
|
||||
for (Node<L,M,R> value : items.values()) {
|
||||
if (value.middle.equals(desc)){
|
||||
return value.left;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public <R> R getR(L key){
|
||||
Node<L,M,R> node = items.get(hash(key));
|
||||
if (node==null){
|
||||
return null;
|
||||
}
|
||||
return node.right;
|
||||
}
|
||||
public Set<L> getKeySet(){
|
||||
return keySet;
|
||||
}
|
||||
|
||||
public static <L,M,R> ForkMap pushAll(ForkMap... maps){
|
||||
ForkMap<L,M,R> forkMap = new ForkMap();
|
||||
for (ForkMap<L,M,R> map : maps) {
|
||||
for (L key : map.getKeySet()) {
|
||||
L key1 = key;
|
||||
M m = map.getM(key1);
|
||||
R r = map.getR(key1);
|
||||
forkMap.put(key1, m, r);
|
||||
}
|
||||
}
|
||||
return forkMap;
|
||||
}
|
||||
|
||||
public static <V> ForkMap of(V...keys){
|
||||
ForkMap<V,V,V> map = new ForkMap<V,V,V>();
|
||||
for (int i = 0; i < keys.length/3; i++) {
|
||||
map.put(keys[i*3+1],keys[i*3],keys[i*3+2]);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
public ForkMap put(L key, M middle,R right) {
|
||||
Node node = new Node(key, middle, right);
|
||||
items.put(hash(key),node);
|
||||
keySet.add(key);
|
||||
return this;
|
||||
}
|
||||
|
||||
static class Node<L,M,R>{
|
||||
private L left;
|
||||
private M middle;
|
||||
private R right;
|
||||
Node(L left, M middle, R right) {
|
||||
this.left = left;
|
||||
this.middle = middle;
|
||||
this.right = right;
|
||||
}
|
||||
}
|
||||
static final int hash(Object key) {
|
||||
int h;
|
||||
return (key == null) ? 0 : (h = key.hashCode()) ^ (h >>> 16);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
package org.nl.wms.pm_manage.form_data.controller;
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.parser.Feature;
|
||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.nl.common.base.TableDataInfo;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.utils.SecurityUtils;
|
||||
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import org.nl.common.logging.annotation.Log;
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/pmFormData")
|
||||
@SaIgnore
|
||||
public class PmFormDataController {
|
||||
|
||||
@Autowired
|
||||
private IPmFormDataService iPmFormDataService;
|
||||
@Autowired
|
||||
private PmFormDataMapper pFormDataMapper;
|
||||
|
||||
|
||||
@GetMapping()
|
||||
@Log("查询数据")
|
||||
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
|
||||
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query, page)), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PutMapping()
|
||||
@Log("修改单据结构")
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseEntity<Object> update(@RequestBody JSONObject param) {
|
||||
//逻辑判断：如果有数据了则不允许修改
|
||||
String s = param.toString(SerializerFeature.SortField);
|
||||
PmFormData pmFormData = JSONObject.parseObject(s, PmFormData.class, Feature.OrderedField);
|
||||
//生产入库单存在报工数超过合格数，需要人工修改正确报工数=合格数，进行手动回传
|
||||
String id = pmFormData.getId();
|
||||
PmFormData pmFormData1 = iPmFormDataService.getById(id);
|
||||
pmFormData1.setRemark(pmFormData.getRemark());
|
||||
pmFormData1.setUpdate_name(SecurityUtils.getCurrentUserId());
|
||||
pmFormData1.setUpdate_time(DateUtil.now());
|
||||
iPmFormDataService.updateById(pmFormData1);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
@DeleteMapping
|
||||
@Transactional
|
||||
@Log("删除单据")
|
||||
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
|
||||
if (ids.length > 0) {
|
||||
pFormDataMapper.delete(new LambdaUpdateWrapper<PmFormData>().in(PmFormData::getId, ids));
|
||||
pFormDataMapper.delete(new LambdaUpdateWrapper<PmFormData>().in(PmFormData::getParent_id, ids));
|
||||
}
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@GetMapping("/getSonFormData/{id}")
|
||||
public ResponseEntity<Object> getSonDtlFormData(@PathVariable String id) {
|
||||
//参数判读，参数解析，调用参数入库
|
||||
//Page<BmFormStruc> page = iBmFormStrucService.page(pageQuery.build(), query.build());
|
||||
return new ResponseEntity<>(iPmFormDataService.getSonDtlFormData(id), HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/confirmStatus")
|
||||
@SaIgnore
|
||||
@Log("单据完成")
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseEntity<Object> confirmStatus(@RequestBody JSONObject form) {
|
||||
JSONArray data = form.getJSONArray("data");
|
||||
String status = form.getString("status");
|
||||
if (!ObjectUtils.isEmpty(data)) {
|
||||
Set<String> ids = data.stream()
|
||||
.map(item -> (String) item)
|
||||
.collect(Collectors.toSet());
|
||||
iPmFormDataService.update(
|
||||
new LambdaUpdateWrapper<PmFormData>()
|
||||
.set(PmFormData::getStatus,status)
|
||||
.set(PmFormData::getUpdate_time,DateUtil.now())
|
||||
.set(PmFormData::getUpdate_name, "人工手动完成")
|
||||
.in(PmFormData::getId, ids));
|
||||
}
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/sync/{type}")
|
||||
@Log("单据同步")
|
||||
public ResponseEntity<Object> sync(@RequestParam String type, String formDtl) {
|
||||
//参数判读，参数解析，调用参数入库
|
||||
iPmFormDataService.syncFormData("type", formDtl);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package org.nl.wms.pm_manage.form_data.service;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
public interface IPmFormDataService extends IService<PmFormData> {
|
||||
|
||||
Integer syncFormData(String type,String dataString);
|
||||
|
||||
|
||||
|
||||
List<PmFormData> getByType(String from_type);
|
||||
|
||||
Object queryAll(FormDataQuery query, PageQuery page);
|
||||
|
||||
Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery page);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Object getSonDtlFormData(String id);
|
||||
|
||||
void dynamicSql(String sql);
|
||||
|
||||
List<PmFormData> getByParentId(String...parent_id);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.dao;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FormDataIdCode {
|
||||
private String id;
|
||||
private String code;
|
||||
}
|
||||
@@ -0,0 +1,371 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.dao;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.nl.common.domain.handler.FastjsonSortTypeHandler;
|
||||
import org.nl.wms.sch_manage.enums.StatusEnum;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@TableName(value = "pm_form_data", autoResultMap = true)
|
||||
public class PmFormData implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 业务单据单据id
|
||||
*/
|
||||
private String id;
|
||||
/**
|
||||
* 单据编码
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 对应流程实例id
|
||||
*/
|
||||
private String proc_inst_id;
|
||||
|
||||
/**
|
||||
* 业务单据编号
|
||||
*/
|
||||
private String source_form_id;
|
||||
|
||||
/**
|
||||
* 业务单据编号
|
||||
*/
|
||||
private String source_form_type;
|
||||
|
||||
/**
|
||||
* 业务单据日期
|
||||
*/
|
||||
private String source_form_date;
|
||||
|
||||
/**
|
||||
* 单据类型
|
||||
*/
|
||||
private String form_type;
|
||||
|
||||
/**
|
||||
* 业务单据状态
|
||||
*/
|
||||
private String status = StatusEnum.FORM_STATUS.code("生成");
|
||||
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private String material_id;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-入库数量FRealQty/采购入库单-采购数量FRealQty
|
||||
*/
|
||||
private BigDecimal qty;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal plan_qty;
|
||||
/**
|
||||
* 已分配数量
|
||||
*/
|
||||
private BigDecimal assign_qty;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
private BigDecimal actual_qty;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
private String unit_id;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String pcsn;
|
||||
/**
|
||||
* 载具
|
||||
*/
|
||||
private String vehicle_code;
|
||||
/**
|
||||
* 载具组盘id
|
||||
*/
|
||||
private String vehicle_id;
|
||||
|
||||
/**
|
||||
* 自定义表单字段
|
||||
*/
|
||||
@TableField(typeHandler = FastjsonSortTypeHandler.class)
|
||||
private JSONObject form_data = new JSONObject();;
|
||||
|
||||
/**
|
||||
* 关联上级表单id
|
||||
*/
|
||||
private String parent_id;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String create_time;
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String create_name;
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String update_time;
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String update_name;
|
||||
|
||||
/**
|
||||
* 备注说明
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 条码
|
||||
*/
|
||||
private String bar_code;
|
||||
|
||||
|
||||
/**
|
||||
* 对应表头：生产入库单-生产组织prdOrgId/采购入库单-采购组织FPurchaseOrgId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String prdOrgId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应表头：生产入库单-入库组织FStockOrgId/采购入库单-收料组织FStockOrgId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String stockOrgId;
|
||||
|
||||
/**
|
||||
* 拣选出库的载具
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String outVehicleCode;
|
||||
|
||||
|
||||
/**
|
||||
* 货主类型1
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String ownerTypeIdHead;
|
||||
|
||||
/**
|
||||
* 对应表头：生产入库单-货主FOwnerId0
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String ownerIdHead_Id;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String material_name;
|
||||
|
||||
|
||||
/**
|
||||
* 单重
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String single_weight;
|
||||
|
||||
|
||||
/**
|
||||
* 物料规格
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String material_spec;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-关联物料编码FMaterialId/采购入库单-关联物料编码FMaterialId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String material_code;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单,采购入库单-单位FUnitCode
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String unit_code;
|
||||
|
||||
|
||||
/**
|
||||
* 生产订单行号
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String moEntrySeq;
|
||||
|
||||
/**
|
||||
* 单据编号
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String billNo;
|
||||
|
||||
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String unit_name;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-货主类型FOwnerTypeId,默认(BD_OwnerOrg)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String ownerTypeId;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-货主FOwnerId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String ownerId_Id;
|
||||
|
||||
/**
|
||||
* 供应商
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String supplierId;
|
||||
|
||||
/**
|
||||
* 计价单位
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String remainInStockUnitId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-关联订单号FMoBillNo/采购入库单-关联订单号FPoOrderNo
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String moNumber;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-关联订单号Id-FMoId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String moId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-关联订单号明细Id-FMoEntryId/采购入库单-关联订单号明细FPoOrderEntryId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String moEntryId;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-关联源头订单号明细Id-FSrcEntryId/采购入库单-关联源头订单号编号FSrcBillNo
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String srcBillNo;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-生产车间FWorkShopId1
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String workShopId1;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-应收数量FMustQty
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private BigDecimal mustQty;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-入库类型FInStockType,默认: 1
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String inStockType;
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-库存状态FStockStatusId,默认: 10000
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String stockStatusId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-ERP仓库FStockId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String stockId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-保管者类型FKeeperTypeId,默认(BD_KeeperOrg)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String keeperTypeId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-保管者FKeeperId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String keeperId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应表头：采购入库单-业务类型FBusinessType:默认(CG)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String businessType;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：采购入库单-采购员FPurchaserId
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String purchaserId;
|
||||
|
||||
|
||||
/**
|
||||
* 对应明细：生产入库单-含税价FTaxPrice
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String taxPrice;
|
||||
|
||||
|
||||
/**
|
||||
* 自定义表单字段
|
||||
*/
|
||||
@TableField(typeHandler = FastjsonSortTypeHandler.class)
|
||||
private JSONObject erp_data = new JSONObject();
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.dao.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
public interface PmFormDataMapper extends BaseMapper<PmFormData> {
|
||||
|
||||
List<PmFormData> query(@Param("query") FormDataQuery query);
|
||||
|
||||
List<PmFormDataDto> queryTree(@Param("query") FormDataQuery query);
|
||||
|
||||
List<PmFormDataDto> queryTree2(@Param("query") FormDataQuery query);
|
||||
|
||||
List<PmFormDataDto> queryCtuOrderList(@Param("query") FormDataQuery query);
|
||||
|
||||
|
||||
List<PmFormDataDto> selectChilds(List<String> parents);
|
||||
|
||||
@Update("${sql}")
|
||||
void dynamicSql(@Param("sql") String sql);
|
||||
|
||||
|
||||
Set<String> existFormDataList(@Param("form_type") String form_type);
|
||||
|
||||
Set<String> existFormCodeDataList();
|
||||
|
||||
BigDecimal queryTreeCounts(@Param("query") FormDataQuery query);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.nl.wms.pm_manage.form_data.service.dao.PmFormDataDao">
|
||||
<resultMap id="BaseResultMap" type="org.nl.wms.pm_manage.form_data.service.dao.PmFormData">
|
||||
<!--
|
||||
WARNING - This element is automatically generated by MyBatis Generator !
|
||||
Do not modify this file directly, any changes will be overwritten.
|
||||
-->
|
||||
<id column="id" property="id" jdbcType="BIGINT"/>
|
||||
<result property="form_id" column="form_id" jdbcType="BIGINT"/>
|
||||
<result property="form_type" column="form_type" jdbcType="VARCHAR"/>
|
||||
<result property="status" column="status" jdbcType="VARCHAR"/>
|
||||
<result property="create_name" column="create_name" jdbcType="VARCHAR"/>
|
||||
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="material_id" column="material_id" jdbcType="BIGINT"/>
|
||||
<result property="qty" column="qty" jdbcType="DECIMAL"/>
|
||||
<result property="pcsn" column="pcsn" jdbcType="VARCHAR"/>
|
||||
<result property="vehicle_code" column="vehicle_code" jdbcType="VARCHAR"/>
|
||||
<result property="parent_id" column="parent_id" jdbcType="BIGINT"/>
|
||||
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.handler.FastjsonSortTypeHandler"/>
|
||||
<result property="unit_id" column="unit_id" jdbcType="BIGINT"/>
|
||||
</resultMap>
|
||||
<resultMap id="ResultMapWithBLOBs" type="org.nl.wms.pm_manage.form_data.service.dao.PmFormData" extends="BaseResultMap">
|
||||
<!--
|
||||
WARNING - This element is automatically generated by MyBatis Generator !
|
||||
Do not modify this file directly, any changes will be overwritten.
|
||||
-->
|
||||
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.handler.FastjsonSortTypeHandler"/>
|
||||
</resultMap>
|
||||
</mapper>
|
||||
@@ -0,0 +1,34 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.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.pm_manage.form_data.service.dao.PmFormData;
|
||||
import java.util.Map;
|
||||
|
||||
/*
|
||||
* @author ZZQ
|
||||
* @Date 2024/5/11 17:46
|
||||
*/
|
||||
@Data
|
||||
public class FormDataQuery extends BaseQuery<PmFormData> {
|
||||
private String form_type;
|
||||
private String code;
|
||||
private String bill_code;
|
||||
private String site_code;
|
||||
private String search;
|
||||
private String pcsn;
|
||||
private String parent_id;
|
||||
private String mater;
|
||||
private String[] status;
|
||||
private String start_time;
|
||||
private String end_time;
|
||||
|
||||
private Map<String,String> form_query;
|
||||
|
||||
@Override
|
||||
public void paramMapping() {
|
||||
super.doP.put("search", QParam.builder().k(new String[]{"code"}).type(QueryTEnum.EQ).build());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,201 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.dto;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import lombok.Data;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
@Data
|
||||
public class PmFormDataDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 业务单据单据id
|
||||
*/
|
||||
private String id;
|
||||
/**
|
||||
* 单据编码
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 对应流程实例id
|
||||
*/
|
||||
private String proc_inst_id;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 业务单据编号
|
||||
*/
|
||||
private String source_form_id;
|
||||
/**
|
||||
* 业务单据编号
|
||||
*/
|
||||
private String source_form_type;
|
||||
|
||||
/**
|
||||
* 业务单据日期
|
||||
*/
|
||||
private String source_form_date;
|
||||
|
||||
/**
|
||||
* 单据类型
|
||||
*/
|
||||
private String form_type;
|
||||
|
||||
/**
|
||||
* 业务单据状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 业务单据状态
|
||||
*/
|
||||
private String bill_status;
|
||||
|
||||
/**
|
||||
* 物料状态
|
||||
*/
|
||||
private String material_status;
|
||||
/**
|
||||
* 业务单据状态
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String create_time;
|
||||
|
||||
/**
|
||||
* 创建id
|
||||
*/
|
||||
private String create_name;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private String material_id;
|
||||
/**
|
||||
* 物料name
|
||||
*/
|
||||
private String material_name;
|
||||
/**
|
||||
* 物料code
|
||||
*/
|
||||
private String material_code;
|
||||
/**
|
||||
* 物料spec
|
||||
*/
|
||||
private String material_spec;
|
||||
/**
|
||||
* 物料单重
|
||||
*/
|
||||
private String single_weight;
|
||||
/**
|
||||
* 单据编号
|
||||
*/
|
||||
private String billNo;
|
||||
/**
|
||||
* 源单编号
|
||||
*/
|
||||
private String srcBillNo;
|
||||
|
||||
/**
|
||||
* 条码
|
||||
*/
|
||||
private String bar_code;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal qty;
|
||||
/**
|
||||
* 冻结数量
|
||||
*/
|
||||
private BigDecimal frozen_qty;
|
||||
|
||||
/**
|
||||
* 库存数量
|
||||
*/
|
||||
private BigDecimal sto_qty;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal plan_qty;
|
||||
/**
|
||||
* 已分配数量
|
||||
*/
|
||||
private BigDecimal assign_qty;
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
private BigDecimal actual_qty;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
private String unit_id;
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
private String unit_name;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String pcsn;
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String product_area;
|
||||
|
||||
/**
|
||||
* 是否删除
|
||||
*/
|
||||
private String is_delete;
|
||||
/**
|
||||
* 载具
|
||||
*/
|
||||
private String vehicle_code;
|
||||
/**
|
||||
* 载具组盘id
|
||||
*/
|
||||
private String vehicle_id;
|
||||
/**
|
||||
* 出库单据号
|
||||
*/
|
||||
private String prd_ppbom_no;
|
||||
|
||||
/**
|
||||
* 自定义表单字段
|
||||
*/
|
||||
private JSONObject form_data;
|
||||
|
||||
|
||||
/**
|
||||
* 关联上级表单id
|
||||
*/
|
||||
private String parent_id;
|
||||
|
||||
private Boolean HasChildren=Boolean.FALSE;
|
||||
|
||||
private List<PmFormDataDto> children;
|
||||
|
||||
public void setChildren(List<PmFormDataDto> children) {
|
||||
if (!CollectionUtils.isEmpty(children)){
|
||||
this.HasChildren=Boolean.TRUE;
|
||||
}
|
||||
this.children = children;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,195 @@
|
||||
package org.nl.wms.pm_manage.form_data.service.impl;
|
||||
|
||||
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.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.nl.common.base.TableDataInfo;
|
||||
import org.nl.common.domain.constant.DictConstantPool;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.exception.BadRequestException;
|
||||
import org.nl.common.utils.CopyUtil;
|
||||
import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
|
||||
import org.nl.wms.basedata_manage.service.IStructattrService;
|
||||
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
|
||||
import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
|
||||
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 表单信息表 服务实现类
|
||||
* 表单结构
|
||||
* ---------------BmFormStruc---------------
|
||||
* /\
|
||||
* / \
|
||||
* / \
|
||||
* 表单数据 / \表单同步配置表
|
||||
* PmFormData BmFormSync
|
||||
* 表单回显时：自定义字段通过表单结构获取lebel
|
||||
* 表单同步设置时：通过表单结构获取所有字段，进行配置字段映射，或者class处理
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @since 2024-03-25
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormData> implements IPmFormDataService {
|
||||
|
||||
@Autowired
|
||||
private IMdMeMaterialbaseService iMdMeMaterialbaseService;
|
||||
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
IPmFormDataService iPmFormDataService;
|
||||
|
||||
@Autowired
|
||||
private IStructattrService iStIvtStructattrService;
|
||||
|
||||
|
||||
@Override
|
||||
public Integer syncFormData(String form_type, String dataString) {
|
||||
if (StringUtils.isEmpty(form_type) || StringUtils.isEmpty(dataString)) {
|
||||
throw new BadRequestException("请求参数不能为空");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Object queryAll(FormDataQuery query, PageQuery pageQuery) {
|
||||
Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
|
||||
page.setOrderBy("id DESC");
|
||||
this.baseMapper.query(query);
|
||||
List<PmFormData> content = page.getResult();
|
||||
List<String> ids = content.stream().map(PmFormData::getId).collect(Collectors.toList());
|
||||
Map<String, List<PmFormData>> childMap = new HashMap<>();
|
||||
if (!CollectionUtils.isEmpty(ids)) {
|
||||
List<PmFormData> childs = this.list(new QueryWrapper<PmFormData>().in("parent_id", ids));
|
||||
childMap = childs.stream().collect(Collectors.groupingBy(PmFormData::getParent_id));
|
||||
}
|
||||
List<PmFormDataDto> list = new ArrayList<>();
|
||||
for (PmFormData record : content) {
|
||||
PmFormDataDto strucDto = new PmFormDataDto();
|
||||
BeanUtils.copyProperties(record, strucDto);
|
||||
list.add(strucDto);
|
||||
List<PmFormData> dtl = childMap.get(record.getId());
|
||||
if (!CollectionUtils.isEmpty(dtl)) {
|
||||
strucDto.setHasChildren(true);
|
||||
strucDto.setChildren(CopyUtil.copyList(dtl, PmFormDataDto.class));
|
||||
}
|
||||
}
|
||||
TableDataInfo build = TableDataInfo.build(page);
|
||||
build.setContent(list);
|
||||
return build;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
|
||||
Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
|
||||
page.setOrderBy("id DESC");
|
||||
if (ObjectUtil.isNotEmpty(query.getMater()) || ObjectUtil.isNotEmpty(query.getPcsn()) || ObjectUtil.isNotEmpty(query.getBill_code())) {
|
||||
if (ObjectUtil.isNotEmpty(query.getPcsn())) {
|
||||
query.setPcsn(query.getPcsn().trim());
|
||||
}
|
||||
if (ObjectUtil.isNotEmpty(query.getMater())) {
|
||||
query.setMater(query.getMater().trim());
|
||||
}
|
||||
if (ObjectUtil.isNotEmpty(query.getBill_code())) {
|
||||
query.setBill_code(query.getBill_code().trim());
|
||||
}
|
||||
}
|
||||
List<PmFormDataDto> pmFormDataList = this.baseMapper.queryTree2(query);
|
||||
if (ObjectUtil.isNotEmpty(pmFormDataList)) {
|
||||
handleFormDataList(pmFormDataList, query);
|
||||
}
|
||||
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
|
||||
dtoPage.setRecords(pmFormDataList);
|
||||
return dtoPage;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void handleFormDataList(List<PmFormDataDto> pmFormDataDtos, FormDataQuery query) {
|
||||
List<String> parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList());
|
||||
List<PmFormDataDto> childs = this.baseMapper.selectChilds(parents);
|
||||
if (!CollectionUtils.isEmpty(childs)) {
|
||||
Map<String, List<PmFormDataDto>> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id));
|
||||
for (PmFormDataDto dataDto : pmFormDataDtos) {
|
||||
String productArea = dataDto.getForm_data().getString("product_area");
|
||||
dataDto.setProduct_area(productArea);
|
||||
List<PmFormDataDto> children = childMap.get(dataDto.getId());
|
||||
if (children != null) {
|
||||
for (PmFormDataDto child : children) {
|
||||
String childProductArea = child.getForm_data().getString("product_area");
|
||||
child.setProduct_area(childProductArea);
|
||||
if (child.getPlan_qty() != null && child.getAssign_qty().compareTo(BigDecimal.ZERO) == 0) {
|
||||
BigDecimal total = child.getPlan_qty().subtract(child.getAssign_qty().add(child.getActual_qty() == null ? BigDecimal.ZERO : child.getActual_qty()));
|
||||
child.setQty(total.compareTo(BigDecimal.ZERO) > 0 ? total : BigDecimal.ZERO);
|
||||
}
|
||||
}
|
||||
}
|
||||
dataDto.setChildren(children);
|
||||
}
|
||||
} else {
|
||||
if (ObjectUtil.isNotEmpty(query.getMater()) || ObjectUtil.isNotEmpty(query.getPcsn()) || ObjectUtil.isNotEmpty(query.getBill_code()) || ObjectUtil.isNotEmpty(query.getStatus())) {
|
||||
BigDecimal counts = this.baseMapper.queryTreeCounts(query);
|
||||
for (PmFormDataDto r : pmFormDataDtos) {
|
||||
r.setSto_qty(counts);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getSonDtlFormData(String id) {
|
||||
if (StringUtils.isEmpty(id)) {
|
||||
throw new BadRequestException("请求参数不能为空");
|
||||
}
|
||||
FormDataQuery query = new FormDataQuery();
|
||||
query.setParent_id(id);
|
||||
return this.baseMapper.queryTree(query);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<PmFormData> getByType(String from_type) {
|
||||
Assert.notNull(from_type, "表单类型参数不能为空");
|
||||
return this.list(new QueryWrapper<PmFormData>().eq("form_type", from_type));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dynamicSql(String sql) {
|
||||
if (StringUtils.isNotEmpty(sql)) {
|
||||
this.baseMapper.dynamicSql(sql);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PmFormData> getByParentId(String[] parent_id) {
|
||||
Assert.notNull(parent_id, "请求参数不能为空");
|
||||
QueryWrapper<PmFormData> query = new QueryWrapper<PmFormData>().in("parent_id", parent_id);
|
||||
return this.list(query);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
package org.nl.wms.sch_manage.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.nl.common.exception.BadRequestException;
|
||||
import org.nl.common.utils.ForkMap;
|
||||
|
||||
/*
|
||||
* @author ZZQ
|
||||
* @Date 2024/4/23 10:49
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum StatusEnum {
|
||||
//单据状态库类型
|
||||
/**
|
||||
* 流程相关
|
||||
*/
|
||||
MODEL_STATUS(ForkMap.of("发布", "10", null, "未发布", "30", null)),
|
||||
FLOW_STATUS(ForkMap.of("启动", "10", null, "节点完成", "20", null, "暂停", "30", null, "完成", "80", null, "异常完成", "82", null)),
|
||||
/**
|
||||
* 单据状态
|
||||
*/
|
||||
FORM_STATUS(ForkMap.of("生成", "10", null, "已分配", "13", null, "下发", "15", null, "执行中", "20", null, "暂停", "30", null, "完成", "80", null, "强制完成", "82", null, "取消", "90", null)),
|
||||
|
||||
/**
|
||||
* 出入库单据类型退货出库
|
||||
*/
|
||||
IOBILL_TYPE_IN(ForkMap.of("生产入库", "10", "inStorageTask", "调拨入库", "11", "inStorageTask", "退货入库", "12", "inStorageTask", "拣选回库",
|
||||
"13", "inStorageTask", "盘点入库", "14", "inStorageTask", "托盘入库", "30", "inStorageTask", "二楼CTU入库", "80", "inStorageTask")),
|
||||
IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20", "outStorageTask", "生产出库", "21", "outStorageTask", "调拨出库", "22", "outStorageTask",
|
||||
"拣选出库", "23", "conveyorOutStorageTask", "盘点出库", "24", "outStorageTask", "出库拣选", "25", "toPickPlatformTask",
|
||||
"退货出库", "26", "outStorageTask", "托盘出库", "40", "outStorageTask", "二楼CTU出库", "81", "inStorageTask", "二楼出库AGV搬运",
|
||||
"82", "inStorageTask", "二楼空架AGV搬运", "83", "inStorageTask")),
|
||||
|
||||
|
||||
IOBILL_TYPE_MOVE(ForkMap.of("移库", "50", "moveStorageTask", "异常位移库", "51", "moveStorageTask")),
|
||||
EXT_TASK_TYPE(ForkMap.of("盘点", "60", "moveStorageTask")),
|
||||
OTHER_TASK_TYPE(ForkMap.of("转运", "70", "tranforTask")),
|
||||
profit_loss(ForkMap.of("盘亏", "0", null, "盘盈", "1", null, "实盘", "2", null)),
|
||||
|
||||
/**
|
||||
* ERP回传单据类型
|
||||
*/
|
||||
ERP_TYPE(ForkMap.of("PRD_MO", "10", "生产订单", "PUR_ReceiveBill", "11", "收料通知单",
|
||||
"SAL_SaleOrder", "12", "销售订单", "PRD_INSTOCK", "13", "生产入库单", "STK_InStock", "14", "采购入库单",
|
||||
"SAL_RETURNSTOCK", "15", "销售退货入库单", "PUR_MRB", "18", "采购退料出库单",
|
||||
"SUB_PickMtrl", "19", "委外用料清单", "PRD_PPBOM", "20", "生产用料清单", "PRD_PickMtrl", "21", "生产领料单",
|
||||
"SP_PickMtrl", "22", "简单生产领料单", "STK_TransferDirect", "23", "调拨出库单", "STK_MisDelivery", "26", "其他出库单", "PRD_ReturnMtrl", "27", "生产退料单", "PRD_FeedMtrl", "28", "生产补料单", "SUB_RETURNMTRL", "29", "委外退料单")),
|
||||
|
||||
/**
|
||||
* 任务优先级
|
||||
*/
|
||||
PRIORITY_TYPE(ForkMap.of(
|
||||
"最低", "1", null, "普通", "5", null, "较高", "6", null, "加急", "7", null, "移库", "8", null
|
||||
)),
|
||||
|
||||
/**
|
||||
* 任务类型
|
||||
*/
|
||||
TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code, IOBILL_TYPE_OUT.code, IOBILL_TYPE_MOVE.code, EXT_TASK_TYPE.code, OTHER_TASK_TYPE.code)),
|
||||
|
||||
ACS_TYPE(ForkMap.of(
|
||||
"立库", "1", null, "AGV任务", "2", null, "CTU任务", "3", null,"三楼CTU", "4", null
|
||||
)),
|
||||
ACS_SYSTEM_TYPE(ForkMap.of(
|
||||
"NDC", "1", null, "仙工", "2", null,"海柔CTU", "5", null, "海康CTU", "6", null
|
||||
)),
|
||||
|
||||
/**
|
||||
* 点位锁类型
|
||||
*/
|
||||
LOCK(ForkMap.of("无锁", "00", null, "入库锁", "10", null, "入库盘点锁", "16", null, "出库锁", "20", null, "盘点出库锁", "26", null, "移库锁", "50", null, "异常锁定", "60", null, "空出锁", "70", null)),
|
||||
STRATEGY_TYPE(ForkMap.of("入库", "1", null, "出库", "2", null, "出入库", "3", null)),
|
||||
|
||||
|
||||
PRODUCT_AREA(ForkMap.of("一层车间", "A1", null, "二层车间", "A2", null, "三层车间", "A3", null)),
|
||||
|
||||
|
||||
REGION_INFO(ForkMap.of("主存区拣选平台", "PICK01", null, "一楼出入库输送线", "IOConveyor", null, "二楼出入库输送线", "IOConveyor2", null, "拣选台秤重区", "WEIGH01", null,
|
||||
"二楼CTU货架对接位", "CTU_POSITION", null, "二楼AGV产线对接位", "AGV_POSITION", null,"二楼空货架缓存区", "SHELF_POSITION", null)),
|
||||
|
||||
|
||||
STOCK_INFO(ForkMap.of("托盘库", "FStockPallet", null, "料箱库", "FStockId", null, "虚拟库", "FicStockId", null, "二楼ctu缓存库", "CStockId", null,
|
||||
"二楼货架缓存库", "HStockId", null)),
|
||||
|
||||
|
||||
SORT_TYPE(ForkMap.of(
|
||||
"升序", "1", null, "降序", "2", null
|
||||
)),
|
||||
POINT_TYPE(ForkMap.of(
|
||||
"空货架", "0", null, "满货架", "1", null
|
||||
)),
|
||||
BIND_TYPE(ForkMap.of(
|
||||
"解绑", "0", null, "绑定", "1", null, "不操作", "3", null
|
||||
));
|
||||
/**
|
||||
* L:label
|
||||
* M：编码
|
||||
* R:指定服务类
|
||||
*/
|
||||
private ForkMap<String, String, String> code;
|
||||
|
||||
public String code(String desc) {
|
||||
String code = this.getCode().getNode(desc);
|
||||
if (StringUtils.isNotEmpty(code)) {
|
||||
return code;
|
||||
}
|
||||
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
|
||||
}
|
||||
|
||||
public String getR(String code) {
|
||||
for (String key : this.getCode().getKeySet()) {
|
||||
if (key.equals(code)){
|
||||
String r = this.getCode().getR(key);
|
||||
if (StringUtils.isEmpty(r)) {
|
||||
throw new BadRequestException(this.name() + "对应编码" + code + "未定义R的数据");
|
||||
}
|
||||
return r;
|
||||
}
|
||||
}
|
||||
throw new BadRequestException(this.name() + "对应编码" + code + "未定义x的数据");
|
||||
}
|
||||
|
||||
public Boolean check(String code) {
|
||||
ForkMap<String, String, String> map = this.getCode();
|
||||
return map.getKeySet().contains(code);
|
||||
}
|
||||
}
|
||||
@@ -87,7 +87,7 @@
|
||||
<script>
|
||||
import crudStrategy from './strategy'
|
||||
import AddDialog from './AddDialog'
|
||||
import CRUD, { crud, form, 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'
|
||||
|
||||
253
nladmin-ui/src/views/wms/pm_manage/form_data/FormDialog.vue
Normal file
253
nladmin-ui/src/views/wms/pm_manage/form_data/FormDialog.vue
Normal file
@@ -0,0 +1,253 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="单据选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="单据类型">
|
||||
<el-select
|
||||
v-model="query.form_type"
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="请选择/搜索"
|
||||
class="filter-item"
|
||||
@change="crud.toQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in tableEnum.bm_form_struc"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据编码">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="编码、名称"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
row-key="id"
|
||||
@select="crud.selectChange"
|
||||
@select-all="crud.selectAllChange"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
@current-change="clickChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="210px">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.code }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130"/>
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
|
||||
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
|
||||
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间"/>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="120px"
|
||||
align="center"
|
||||
fixed="right"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
style="display: inline"
|
||||
:data="scope.row"
|
||||
:disabled-edit="scope.row.is_modify === '0'"
|
||||
:disabled-dle="scope.row.is_modify === '0'"
|
||||
msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
<el-dialog
|
||||
title="单据明细"
|
||||
append-to-body
|
||||
:visible.sync="dtlVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
:data="childrenList">
|
||||
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="210px" />
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130"/>
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
|
||||
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
|
||||
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间"/>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dtlVisible = false">取 消</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
// import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
|
||||
// import crudClassstandard from '@/views/wms/base_manage/class_standard/classstandard'
|
||||
import crudFormData from "./formData";
|
||||
export default {
|
||||
name: 'FormDia',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '单据', url: 'api/pmFormData', crudMethod: { ...crudFormData }, optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
tableEnums: [ 'bm_form_struc#form_name#form_type' ],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
isSingle: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
cols: [],
|
||||
dialogVisible: false,
|
||||
dtlVisible: false,
|
||||
childrenList: [],
|
||||
tableRadio: null,
|
||||
checkrow: null,
|
||||
rows: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
},
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
// if (this.query.form_type !=null){
|
||||
// formstruc.getHeader(this.query.form_type).then(res => {
|
||||
// this.cols = res
|
||||
// })
|
||||
// return true
|
||||
// }
|
||||
// return false
|
||||
},
|
||||
|
||||
toView(row){
|
||||
if (row.hasChildren){
|
||||
this.dtlVisible = true
|
||||
this.childrenList = row.children;
|
||||
}
|
||||
},
|
||||
clickChange(item) {
|
||||
this.tableRadio = item
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (this.isSingle) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
} else {
|
||||
this.checkrow = row
|
||||
}
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
// 处理单选
|
||||
if (this.isSingle && this.tableRadio) {
|
||||
this.dialogVisible = false
|
||||
let subData = {}
|
||||
this.$set(subData, 't', this.form)
|
||||
this.$set(subData, 'item', this.tableRadio)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('setMaterValue', subData)
|
||||
return
|
||||
}
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料')
|
||||
return
|
||||
}
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
let subData = {}
|
||||
this.$set(subData, 't', this.rows[0])
|
||||
this.$set(subData, 'item', this.rows[0].children)
|
||||
this.$emit('setMaterValue', subData)
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
125
nladmin-ui/src/views/wms/pm_manage/form_data/UploadDialog.vue
Normal file
125
nladmin-ui/src/views/wms/pm_manage/form_data/UploadDialog.vue
Normal file
@@ -0,0 +1,125 @@
|
||||
<!--<template>-->
|
||||
<!-- <el-dialog-->
|
||||
<!-- title="导入Excel文件"-->
|
||||
<!-- append-to-body-->
|
||||
<!-- :visible.sync="dialogVisible"-->
|
||||
<!-- destroy-on-close-->
|
||||
<!-- width="400px"-->
|
||||
<!-- :show-close="true"-->
|
||||
<!-- @close="close"-->
|
||||
<!-- @open="open"-->
|
||||
<!-- >-->
|
||||
<!-- <el-upload-->
|
||||
<!-- ref="upload"-->
|
||||
<!-- class="upload-demo"-->
|
||||
<!-- action=""-->
|
||||
<!-- drag-->
|
||||
<!-- :on-exceed="is_one"-->
|
||||
<!-- :limit="1"-->
|
||||
<!-- :auto-upload="false"-->
|
||||
<!-- :multiple="false"-->
|
||||
<!-- :show-file-list="true"-->
|
||||
<!-- :on-change="uploadByJsqd"-->
|
||||
<!-- :file-list="fileList"-->
|
||||
<!-- accept=".xlsx,.xls"-->
|
||||
<!-- >-->
|
||||
<!-- <i class="el-icon-upload" />-->
|
||||
<!-- <div class="el-upload__text">-->
|
||||
<!-- 将文件拖到此处，或-->
|
||||
<!-- <em>点击上传</em>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>-->
|
||||
<!-- </el-upload>-->
|
||||
<!-- <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 crudClassstandard from './classstandard'-->
|
||||
<!--import CRUD, { crud } from '@crud/crud'-->
|
||||
<!--import { download2 } from '@/api/data'-->
|
||||
<!--import { downloadFile } from '@/utils'-->
|
||||
|
||||
<!--export default {-->
|
||||
<!-- name: 'UploadDialog',-->
|
||||
<!-- mixins: [crud()],-->
|
||||
<!-- components: {},-->
|
||||
<!-- props: {-->
|
||||
<!-- dialogShow: {-->
|
||||
<!-- type: Boolean,-->
|
||||
<!-- default: false-->
|
||||
<!-- },-->
|
||||
<!-- openParam: {-->
|
||||
<!-- type: String-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- data() {-->
|
||||
<!-- return {-->
|
||||
<!-- dialogVisible: false,-->
|
||||
<!-- fileList: [],-->
|
||||
<!-- file1: ''-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- watch: {-->
|
||||
<!-- dialogShow: {-->
|
||||
<!-- handler(newValue, oldValue) {-->
|
||||
<!-- this.dialogVisible = newValue-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- openParam: {-->
|
||||
<!-- handler(newValue, oldValue) {-->
|
||||
<!-- this.opendtlParam = newValue-->
|
||||
<!-- }-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- methods: {-->
|
||||
<!-- open() {-->
|
||||
<!-- },-->
|
||||
<!-- close() {-->
|
||||
<!-- this.$emit('update:dialogShow', false)-->
|
||||
<!-- },-->
|
||||
<!-- is_one() {-->
|
||||
<!-- this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)-->
|
||||
<!-- },-->
|
||||
<!-- // 文件校验方法-->
|
||||
<!-- beforeAvatarUpload(file) {-->
|
||||
<!-- // 不能导入大小超过2Mb的文件-->
|
||||
<!-- if (file.size > 10 * 1024 * 1024) {-->
|
||||
<!-- return false-->
|
||||
<!-- }-->
|
||||
<!-- return true-->
|
||||
<!-- },-->
|
||||
<!-- // 文件发生改变就会触发的事件-->
|
||||
<!-- uploadByJsqd(file) {-->
|
||||
<!-- this.file1 = file-->
|
||||
<!-- },-->
|
||||
<!-- submit() {-->
|
||||
<!-- if (this.beforeAvatarUpload(this.file1)) {-->
|
||||
<!-- this.fileList.name = this.file1.name-->
|
||||
<!-- this.fileList.url = ''-->
|
||||
<!-- var formdata = new FormData()-->
|
||||
<!-- formdata.append('file', this.file1.raw)-->
|
||||
<!-- // excelImport：请求接口 formdata：传递参数-->
|
||||
<!-- crudClassstandard.excelImport(formdata).then((res) => {-->
|
||||
<!-- this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)-->
|
||||
<!-- this.$emit('tableChanged3', '')-->
|
||||
<!-- this.$emit('update:dialogShow', false)-->
|
||||
<!-- }).catch(err => {-->
|
||||
|
||||
<!-- const list = err.response.data.message-->
|
||||
<!-- download2('/api/produceWorkorder/download', list).then(result => {-->
|
||||
<!-- downloadFile(result, '错误信息汇总', 'xlsx')-->
|
||||
<!-- crud.downloadLoading = false-->
|
||||
<!-- })-->
|
||||
<!-- })-->
|
||||
<!-- } else {-->
|
||||
<!-- this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)-->
|
||||
<!-- }-->
|
||||
<!-- }-->
|
||||
<!-- }-->
|
||||
<!--}-->
|
||||
<!--</script>-->
|
||||
|
||||
272
nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
Normal file
272
nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
Normal file
@@ -0,0 +1,272 @@
|
||||
<!--suppress ALL -->
|
||||
<template>
|
||||
<el-dialog
|
||||
append-to-body
|
||||
title="单据详情"
|
||||
:visible.sync="dialogVisible"
|
||||
fullscreen
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
|
||||
:model="form" size="mini" label-width="100px" label-suffix=":">
|
||||
<el-form-item label="单据编号" prop="code">
|
||||
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据类型" prop="form_type">
|
||||
<el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="业务单据类型" prop="source_form_type">
|
||||
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="业务单据id" prop="source_form_id">
|
||||
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="业务单据时间" prop="source_form_date">
|
||||
<!-- <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"-->
|
||||
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
|
||||
<el-input v-model="form.biz_date" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="批次" prop="pcsn">
|
||||
<el-input v-model="form.pcsn" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料数量" prop="qty">
|
||||
<el-input v-model="form.qty" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="载具编号" prop="vehicle_code">
|
||||
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态" prop="status">
|
||||
<el-select
|
||||
v-model="form.status"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="请选择"
|
||||
class="filter-item"
|
||||
style="width: 180px;"
|
||||
disabled
|
||||
>
|
||||
<el-option
|
||||
v-for="item in formStatus"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<!-- <el-input v-model="form.status" disabled clearable style="width: 210px"/>-->
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="create_time">
|
||||
<!-- <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
|
||||
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
|
||||
<el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
<template v-for="(col,index) in cols">
|
||||
<el-form-item label="col.lable" prop="bill_code">
|
||||
<label slot="label">{{ col.lable }}:</label>
|
||||
<el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-form>
|
||||
<div class="crud-opts2">
|
||||
<span class="role-span2">单据明细</span>
|
||||
</div>
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
:data="tableDtl"
|
||||
style="width: 100%;"
|
||||
max-height="300"
|
||||
size="mini"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
@current-change="handleDtlCurrentChange"
|
||||
>
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
|
||||
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
|
||||
<el-table-column prop="assign_qty" label="分配数量" show-overflow-tooltip/>
|
||||
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
|
||||
<template slot-scope="scope">
|
||||
<template v-for="item in formStatus">
|
||||
<span v-if="item.value === scope.row.status">{{ item.label }}</span>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130"/>
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
|
||||
:label="item.lable">
|
||||
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间"/>
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import {crud} from '@crud/crud'
|
||||
import crudFormData, {getSonFormData} from './formData'
|
||||
//import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
|
||||
|
||||
export default {
|
||||
name: 'ViewDialog',
|
||||
mixins: [crud()],
|
||||
dicts: ['ST_INV_CP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
rowmst: {
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
cols: [],
|
||||
dtlCols: [],
|
||||
dialogVisible: false,
|
||||
tableDtl: [],
|
||||
tabledis: [],
|
||||
billtypelist: [],
|
||||
storlist: [],
|
||||
currentdtl: null,
|
||||
currentDis: {},
|
||||
form: {},
|
||||
formStatus: [
|
||||
{
|
||||
value: '10',
|
||||
label: '生成'
|
||||
},
|
||||
{
|
||||
value: '20',
|
||||
label: '执行中'
|
||||
},
|
||||
{
|
||||
value: '99',
|
||||
label: '完成'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
},
|
||||
rowmst: {
|
||||
handler(newValue) {
|
||||
this.form = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
|
||||
},
|
||||
setForm(row) {
|
||||
this.dialogVisible = true
|
||||
this.form = row
|
||||
let dtl_form_type = this.form.children[0].form_type;
|
||||
// formstruc.getHeader(this.form.form_type).then(res => {
|
||||
// this.cols = res
|
||||
// })
|
||||
// formstruc.getHeader(dtl_form_type).then(res => {
|
||||
// this.dtlCols = res
|
||||
// })
|
||||
this.queryTableDtl(row.id)
|
||||
},
|
||||
close() {
|
||||
this.dialogVisible = false
|
||||
},
|
||||
stateFormat(row, column) {
|
||||
return this.dict.label.IO_BILL_STATUS[row.bill_status]
|
||||
},
|
||||
taskdtl_typeFormat(row) {
|
||||
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
|
||||
},
|
||||
statusFormat(row) {
|
||||
return this.dict.label.status[row.status]
|
||||
},
|
||||
work_statusFormat(row) {
|
||||
return this.dict.label.work_status[row.work_status]
|
||||
},
|
||||
handleDtlCurrentChange(current) {
|
||||
if (current !== null) {
|
||||
this.tabledis = []
|
||||
this.currentdtl = current
|
||||
this.queryTableDdis()
|
||||
} else {
|
||||
this.tabledis = []
|
||||
this.currentdtl = {}
|
||||
}
|
||||
},
|
||||
invtypeFormat(row, column) {
|
||||
for (const item of this.billtypelist) {
|
||||
if (item.code === row.source_bill_type) {
|
||||
return item.name
|
||||
}
|
||||
}
|
||||
},
|
||||
handleDisCurrentChange(current) {
|
||||
this.currentDis = current
|
||||
},
|
||||
queryTableDtl(id) {
|
||||
crudFormData.getSonFormData(id).then(res => {
|
||||
this.tableDtl = res
|
||||
})
|
||||
},
|
||||
queryTableDdis() {
|
||||
if (this.currentdtl !== null) {
|
||||
crudProductIn.getVehicleTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
|
||||
this.tabledis = res
|
||||
}).catch(() => {
|
||||
this.tabledis = []
|
||||
})
|
||||
}
|
||||
},
|
||||
formatStatus(row) {
|
||||
return this.dict.label.status[row.status]
|
||||
},
|
||||
formatBaseType(row) {
|
||||
return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .el-dialog__title2 {
|
||||
line-height: 24px;
|
||||
font-size: 20px;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.crud-opts2 .role-span2 {
|
||||
padding: 0px 0px 20px 0px;
|
||||
}
|
||||
|
||||
.crud-opts2 {
|
||||
padding: 10px 0px 0px 50px;
|
||||
}
|
||||
|
||||
</style>
|
||||
48
nladmin-ui/src/views/wms/pm_manage/form_data/formData.js
Normal file
48
nladmin-ui/src/views/wms/pm_manage/form_data/formData.js
Normal file
@@ -0,0 +1,48 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/pmFormData',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/pmFormData',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/pmFormData',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getFormType() {
|
||||
return request({
|
||||
url: 'api/bmFormStruc/getTypes',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
export function getParentFormTypes() {
|
||||
return request({
|
||||
url: 'api/bmFormStruc/getParentFormTypes',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
export function getSonFormData(id) {
|
||||
return request({
|
||||
url: 'api/pmFormData/getSonFormData/' + id,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData}
|
||||
303
nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
Normal file
303
nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
Normal file
@@ -0,0 +1,303 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!-- 搜索 -->
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="90px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="单据类型">
|
||||
<el-select
|
||||
v-model="query.form_type"
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="请选择/搜索"
|
||||
class="filter-item"
|
||||
popper-append-to-body="false"
|
||||
@change="crud.toQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fromTypes"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.lable"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="单据编码">
|
||||
<el-input
|
||||
v-model="query.code"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="编码"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态">
|
||||
<el-select
|
||||
v-model="query.status"
|
||||
size="mini"
|
||||
placeholder="单据状态"
|
||||
class="filter-item"
|
||||
clearable
|
||||
@change="crud.toQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in statusEnum.FORM_STATUS"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<template v-for="(col,index) in cols" v-if="hideShowDialog">
|
||||
<el-form-item label="col.lable">
|
||||
<label slot="label">{{ col.lable }}:</label>
|
||||
<el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
|
||||
</el-form-item>
|
||||
</template>
|
||||
<rrOperation :crud="crud" />
|
||||
</el-form>
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<crudOperation :permission="permission">
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
type="success"
|
||||
icon="el-icon-s-operation"
|
||||
>
|
||||
全部展开
|
||||
</el-button>
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
type="warning"
|
||||
icon="el-icon-upload2"
|
||||
size="mini"
|
||||
>
|
||||
导入
|
||||
</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- slot="right"-->
|
||||
<!-- class="filter-item"-->
|
||||
<!-- icon="el-icon-view"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="hideShow"-->
|
||||
<!-- >-->
|
||||
<!-- </el-button>-->
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
icon="el-icon-view"
|
||||
size="mini"
|
||||
@click="hideShow"
|
||||
/>
|
||||
</crudOperation>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
lazy
|
||||
:data="crud.data"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
|
||||
scope.row.code
|
||||
}}
|
||||
</el-link>
|
||||
<span v-else>{{ scope.row.code }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
|
||||
<template slot-scope="scope">
|
||||
<template v-for="item in formStatus">
|
||||
<span v-if="item.value === scope.row.status">{{ item.label }}</span>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120" />-->
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="unit_id" label="单位" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130" />
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
|
||||
<el-table-column
|
||||
v-for="(item, index) in cols"
|
||||
:key="item.value"
|
||||
width="130"
|
||||
show-overflow-tooltip
|
||||
:label="item.lable"
|
||||
>
|
||||
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间" />
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
|
||||
<el-table-column
|
||||
v-permission="['admin','Classstandard:edit','Classstandard:del']"
|
||||
label="操作"
|
||||
width="120px"
|
||||
align="center"
|
||||
fixed="right"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
style="display: inline"
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
:disabled-edit="scope.row.is_modify === '0'"
|
||||
:disabled-dle="scope.row.is_modify === '0'"
|
||||
msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
<ViewDialog ref="viewDialog" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudFormData from './formData'
|
||||
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
// import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
|
||||
import ViewDialog from './ViewDialog'
|
||||
|
||||
// import UploadDialog from './UploadDialog'
|
||||
|
||||
const defaultForm = {
|
||||
id: null,
|
||||
code: null,
|
||||
proc_inst_id: null,
|
||||
biz_id: null,
|
||||
boz_code: null,
|
||||
biz_date: null,
|
||||
form_type: null,
|
||||
status: null,
|
||||
create_time: null,
|
||||
create_name: null,
|
||||
material_id: null,
|
||||
qty: null,
|
||||
pcsn: null,
|
||||
vehicle_code: null,
|
||||
from_data: null,
|
||||
parent_id: null
|
||||
}
|
||||
export default {
|
||||
name: 'FormData',
|
||||
dicts: ['base_data'],
|
||||
components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
statusEnums: ['FORM_STATUS'],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '表单数据',
|
||||
url: 'api/pmFormData',
|
||||
idField: 'id',
|
||||
sort: 'id,desc',
|
||||
crudMethod: { ...crudFormData },
|
||||
optShow: {
|
||||
add: true,
|
||||
reset: true
|
||||
},
|
||||
query: {
|
||||
form_data: {}
|
||||
}
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
cols: [],
|
||||
classes: [],
|
||||
uploadShow: false,
|
||||
fromTypes: [],
|
||||
permission: {},
|
||||
rules: {},
|
||||
hideShowDialog: false,
|
||||
formStatus: [
|
||||
{
|
||||
value: '10',
|
||||
label: '生成'
|
||||
},
|
||||
{
|
||||
value: '20',
|
||||
label: '执行中'
|
||||
},
|
||||
{
|
||||
value: '30',
|
||||
label: '暂停'
|
||||
},
|
||||
{
|
||||
value: '80',
|
||||
label: '完成'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// 获取分类
|
||||
this.getFromTypes()
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
methods: {
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
if (this.fromTypes.length > 0) {
|
||||
// formstruc.getHeader(this.query.form_type).then(res => {
|
||||
// this.cols = res
|
||||
// res.forEach(a => {
|
||||
// this.form.form_data[a.value, '']
|
||||
// this.$set(this.query, 'form_query', {})
|
||||
// })
|
||||
// })
|
||||
// return true
|
||||
}
|
||||
return false
|
||||
},
|
||||
getFromTypes() {
|
||||
crudFormData.getParentFormTypes().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
|
||||
this.fromTypes = res
|
||||
if (this.fromTypes.length > 0) {
|
||||
this.$set(this.query, 'form_type', this.fromTypes[0].value)
|
||||
this.crud.toQuery()
|
||||
}
|
||||
})
|
||||
},
|
||||
hideShow() {
|
||||
if (this.hideShowDialog) {
|
||||
// this.$set(this.query, 'form_query', {})
|
||||
}
|
||||
this.hideShowDialog = !this.hideShowDialog
|
||||
},
|
||||
toView(row) {
|
||||
if (row !== null) {
|
||||
this.$refs.viewDialog.setForm(row)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user