no message

wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/rest/CribbinginfoController.java

@@ -0,0 +1,71 @@
+
+package org.nl.wms.Cribbing.rest;
+
+
+import org.nl.wms.Cribbing.service.CribbinginfoService;
+import org.nl.wms.Cribbing.service.dto.CribbinginfoDto;
+import org.springframework.data.domain.Pageable;
+import lombok.RequiredArgsConstructor;
+import org.nl.annotation.Log;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author qinx
+ * @date 2022-09-26
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "基础垛形参数管理")
+@RequestMapping("/api/cribbinginfo")
+@Slf4j
+public class CribbinginfoController {
+
+    private final CribbinginfoService cribbinginfoService;
+
+    @GetMapping
+    @Log("查询基础垛形参数")
+    @ApiOperation("查询基础垛形参数")
+    //@PreAuthorize("@el.check('cribbinginfo:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(cribbinginfoService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增基础垛形参数")
+    @ApiOperation("新增基础垛形参数")
+    //@PreAuthorize("@el.check('cribbinginfo:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody CribbinginfoDto dto) {
+        cribbinginfoService.create(dto);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改基础垛形参数")
+    @ApiOperation("修改基础垛形参数")
+    //@PreAuthorize("@el.check('cribbinginfo:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody CribbinginfoDto dto) {
+        cribbinginfoService.update(dto);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除基础垛形参数")
+    @ApiOperation("删除基础垛形参数")
+    //@PreAuthorize("@el.check('cribbinginfo:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        cribbinginfoService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}

wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/CribbinginfoService.java

@@ -0,0 +1,66 @@
+
+package org.nl.wms.Cribbing.service;
+
+import org.nl.wms.Cribbing.service.dto.CribbinginfoDto;
+import org.springframework.data.domain.Pageable;
+import java.util.Map;
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @description 服务接口
+* @author qinx
+* @date 2022-09-26
+**/
+public interface CribbinginfoService {
+
+    /**
+    * 查询数据分页
+    * @param whereJson 条件
+    * @param page 分页参数
+    * @return Map<String,Object>
+    */
+    Map<String,Object> queryAll(Map whereJson, Pageable page);
+
+    /**
+    * 查询所有数据不分页
+    * @param whereJson 条件参数
+    * @return List<CribbinginfoDto>
+    */
+    List<CribbinginfoDto> queryAll(Map whereJson);
+
+    /**
+     * 根据ID查询
+     * @param info_id ID
+     * @return Cribbinginfo
+     */
+    CribbinginfoDto findById(Long info_id);
+
+    /**
+    * 根据编码查询
+    * @param code code
+    * @return Cribbinginfo
+    */
+    CribbinginfoDto findByCode(String code);
+
+
+    /**
+    * 创建
+    * @param dto /
+    */
+    void create(CribbinginfoDto dto);
+
+    /**
+    * 编辑
+    * @param dto /
+    */
+    void update(CribbinginfoDto dto);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(Long[] ids);
+
+}

wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/dto/CribbinginfoDto.java

@@ -0,0 +1,227 @@
+package org.nl.wms.Cribbing.service.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+    import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+/**
+* @description /
+* @author qinx
+* @date 2022-09-26
+**/
+@Data
+public class CribbinginfoDto implements Serializable {
+
+            /** 对应标识 */
+                /** 防止精度丢失 */
+                @JsonSerialize(using= ToStringSerializer.class)
+        private Long info_id;
+
+            /** 物料标志 */
+        private Long material_id;
+
+            /** 物料编码 */
+        private String material_code;
+
+            /** 物料名称  */
+        private String material_name;
+
+            /** 规格 */
+        private String material_spec;
+
+            /** 产品编号 */
+        private String product_code;
+
+            /** A长边 */
+        private String AlongSide;
+
+            /** B短边 */
+        private String BshortSide;
+
+            /** H梯形高 */
+        private String Htrapezoidal;
+
+            /** W厚度 */
+        private String Wthickness;
+
+            /** 当前垛盘数 */
+        private String tray_qty;
+
+            /** 垛盘高度 */
+        private String tray_high;
+
+            /** 垛型类别 */
+        private String crib_category;
+
+            /** 码垛X1行 */
+        private String palletX1_line;
+
+            /** 码垛Y1列 */
+        private String palletY1_row;
+
+            /** 码垛A1角度 */
+        private String palletA1_angle;
+
+            /** 码垛X2行 */
+        private String palletX2_line;
+
+            /** 码垛Y2列 */
+        private String palletY2_row;
+
+            /** 码垛A2角度 */
+        private String palletA2_angle;
+
+            /** 码垛X3行 */
+        private String palletX3_line;
+
+            /** 码垛Y3列 */
+        private String palletY3_row;
+
+            /** 码垛A3角度 */
+        private String palletA3_angle;
+
+            /** 压垛X1行 */
+        private String pressCribX1_line;
+
+            /** 压垛Y1列 */
+        private String pressCribY1_row;
+
+            /** 压垛A1角度 */
+        private String pressCribA1_angle;
+
+            /** 压垛X2行 */
+        private String pressCribX2_line;
+
+            /** 压垛Y2列 */
+        private String pressCribY2_row;
+
+            /** 压垛A2角度 */
+        private String pressCribA2_angle;
+
+            /** 压垛X3行 */
+        private String pressCribX3_line;
+
+            /** 压垛Y3列 */
+        private String pressCribY3_row;
+
+            /** 压垛A3角度 */
+        private String pressCribA3_angle;
+
+            /** Z轴偏移 */
+        private String Zoffset;
+
+            /** 码垛层数 */
+        private String pallet_layerQty;
+
+            /** 压垛层数 */
+        private String pressCrib_layerQty;
+
+            /** 码层X1间隔 */
+        private String codeLayerX1_interval;
+
+            /** 码层Y1间隔 */
+        private String codeLayerY1_interval;
+
+            /** 码层X2间隔 */
+        private String codeLayerX2_interval;
+
+            /** 码层Y2间隔 */
+        private String codeLayerY2_interval;
+
+            /** 码层X3间隔 */
+        private String codeLayerX3_interval;
+
+            /** 码层Y3间隔 */
+        private String codeLayerY3_interval;
+
+            /** 码层X1偏移 */
+        private String codeLayerX1_offset;
+
+            /** 码层Y1偏移 */
+        private String codeLayerY1_offset;
+
+            /** 码层X2偏移 */
+        private String codeLayerX2_offset;
+
+            /** 码层Y2偏移 */
+        private String codeLayerY2_offset;
+
+            /** 码层X3偏移 */
+        private String codeLayerX3_offset;
+
+            /** 码层Y3偏移 */
+        private String codeLayerY3_offset;
+
+            /** 压层X1间隔 */
+        private String pressLayerX1_interval;
+
+            /** 压层Y1间隔 */
+        private String pressLayerY1_interval;
+
+            /** 压层X2间隔 */
+        private String pressLayerX2_interval;
+
+            /** 压层Y2间隔 */
+        private String pressLayerY2_interval;
+
+            /** 压层X3间隔 */
+        private String pressLayerX3_interval;
+
+            /** 压层Y3间隔 */
+        private String pressLayerY3_interval;
+
+            /** 压层X1偏移 */
+        private String pressLayerX1_offset;
+
+            /** 压层Y1偏移 */
+        private String pressLayerY1_offset;
+
+            /** 压层X2偏移 */
+        private String pressLayerX2_offset;
+
+            /** 压层Y2偏移 */
+        private String pressLayerY2_offset;
+
+            /** 压层X3偏移 */
+        private String pressLayerX3_offset;
+
+            /** 压层Y3偏移 */
+        private String pressLayerY3_offset;
+
+            /** 1#垛总数 */
+        private String one_cribTotal;
+
+            /** 2#垛总数 */
+        private String two_cribTotal;
+
+            /** 1#垛当前数 */
+        private String one_qty;
+
+            /** 2#垛当前数 */
+        private String two_qty;
+
+            /** 工具坐标 */
+        private String tool_coordinate;
+
+            /** 组盘人 */
+        private Long create_id;
+
+            /** 组盘人姓名 */
+        private String create_name;
+
+            /** 组盘时间 */
+        private String create_time;
+
+            /** 修改人 */
+        private Long update_optid;
+
+            /** 修改人姓名 */
+        private String update_optname;
+
+            /** 修改时间 */
+        private String update_time;
+
+            /** 是否删除 */
+        private String is_delete;
+}

wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java

@@ -0,0 +1,131 @@
+
+package org.nl.wms.Cribbing.service.impl;
+
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import org.nl.exception.BadRequestException;
+import org.nl.wms.Cribbing.service.CribbinginfoService;
+import org.nl.wms.Cribbing.service.dto.CribbinginfoDto;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+import java.util.Map;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSONArray;
+import org.nl.utils.SecurityUtils;
+import org.nl.wql.core.bean.ResultBean;
+import org.nl.wql.core.bean.WQLObject;
+import org.nl.wql.util.WqlUtil;
+import lombok.extern.slf4j.Slf4j;
+import cn.hutool.core.util.ObjectUtil;
+
+/**
+* @description 服务实现
+* @author qinx
+* @date 2022-09-26
+**/
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class CribbinginfoServiceImpl implements CribbinginfoService {
+
+    @Override
+    public Map<String,Object> queryAll(Map whereJson, Pageable page){
+            WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+            ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
+            final JSONObject json = rb.pageResult();
+            return json;
+    }
+
+    @Override
+    public List<CribbinginfoDto> queryAll(Map whereJson){
+             WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+            JSONArray arr = wo.query().getResultJSONArray(0);
+             if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CribbinginfoDto.class);
+            return null;
+    }
+
+    @Override
+    public CribbinginfoDto findById(Long info_id) {
+        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+        JSONObject json = wo.query("info_id = '" + info_id + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)){
+                 return  json.toJavaObject( CribbinginfoDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    public CribbinginfoDto findByCode(String  code) {
+        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)){
+             return  json.toJavaObject( CribbinginfoDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(CribbinginfoDto dto) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+        String now = DateUtil.now();
+
+        dto.setInfo_id(IdUtil.getSnowflake(1, 1).nextId());
+        dto.setCreate_id(currentUserId);
+        dto.setCreate_name(nickName);
+        dto.setUpdate_optid(currentUserId);
+        dto.setUpdate_optname(nickName);
+        dto.setUpdate_time(now);
+        dto.setCreate_time(now);
+
+        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+        JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto));
+        wo.insert(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CribbinginfoDto dto) {
+        CribbinginfoDto entity = this.findById(dto.getInfo_id());
+        if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
+
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+
+        String now = DateUtil.now();
+        dto.setUpdate_time(now);
+        dto.setUpdate_optid(currentUserId);
+        dto.setUpdate_optname(nickName);
+
+        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+        JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(dto));
+        wo.update(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Long[] ids) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
+        for (Long info_id: ids) {
+            JSONObject param = new JSONObject();
+            param.put("info_id", String.valueOf(info_id));
+            param.put("is_delete", "1");
+            param.put("update_optid", currentUserId);
+            param.put("update_optname", nickName);
+            param.put("update_time", now);
+            wo.update(param);
+        }
+    }
+        
+}

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -291,7 +291,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             vehicle_code = jsonObject.get("vehicle_code").toString();
         }
         String qty = String.valueOf(jsonObject.get("qty"));
+        //产品编码
+        String product_code = String.valueOf(jsonObject.get("product_code"));
         //String material_code = (String) jsonObject.get("material_code");
+        if (StrUtil.isEmpty(product_code)){
+            throw new BadRequestException("产品编号不能为空！");
+        }
         produceInfoByCode = this.getProduceInfoByCode(device_code);
         String material_id = (String) produceInfoByCode.get("material_id");
         String cust_id = (String) produceInfoByCode.get("cust_id");
@@ -305,6 +310,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         groubObj.put("material_id", material_id);
         groubObj.put("material_code", materialObj.getString("material_code"));
         groubObj.put("material_name", materialObj.getString("material_name"));
+        groubObj.put("product_code", product_code);
         groubObj.put("cust_id", cust_id);
         groubObj.put("qty", qty);
         groubObj.put("producetask_id", producetask_id);
@@ -508,7 +514,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             code = "2";
         }
         //更新窑的信息
-//        KilnUtil.outKiln(vehicle_code);
+        KilnUtil.outKiln(vehicle_code);
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
         result.put("message", "任务状态反馈成功!");

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_ProduceTask_01.wql

@@ -112,13 +112,19 @@
                 	material.material_code,
                 	material.material_name,
                 	material.material_spec,
-                	material.material_model
+                	material.material_model,
+                	info.product_code,
+                	info.AlongSide,
+                	info.BshortSide,
+                	info.Htrapezoidal,
+                	info.Wthickness
                 FROM
                 	pdm_mg_producetask task
                 	LEFT JOIN sch_base_point point ON point.device_id = task.device_id
                 	AND point.point_code <> 'MDJXS101'
                 	LEFT JOIN md_me_material material ON material.material_id = task.material_id
                 	LEFT JOIN pdm_base_device device ON device.device_id = task.device_id
+                	left join MD_ME_CribbingInfo info on info.material_id = material.material_id
                 WHERE
                 	1 =1
                  OPTION 输入.producetask_id <> ""
@@ -136,12 +142,18 @@
                         	material.material_code,
                         	material.material_name,
                         	material.material_spec,
-                        	material.material_model
+                        	material.material_model,
+                        	info.product_code,
+                            info.AlongSide,
+                            info.BshortSide,
+                            info.Htrapezoidal,
+                            info.Wthickness
                         FROM
                         	pdm_mg_producetask task
                         	LEFT JOIN sch_base_point point ON point.device_id = task.device_id
                         	AND point.point_code <> 'MDJXS101'
                         	LEFT JOIN md_me_material material ON material.material_id = task.material_id
+                        	left join MD_ME_CribbingInfo info on info.material_id = material.material_id
                         WHERE
                         	1 =1
                          OPTION 输入.producetask_id <> ""

wms/hd/qinx/cribbinginfo.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/cribbinginfo',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/cribbinginfo/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/cribbinginfo',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

wms/hd/qinx/index.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="物料标志">
+            <el-input v-model="form.material_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input v-model="form.material_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料名称 ">
+            <el-input v-model="form.material_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="产品编号">
+            <el-input v-model="form.product_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="A长边">
+            <el-input v-model="form.AlongSide" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="B短边">
+            <el-input v-model="form.BshortSide" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="H梯形高">
+            <el-input v-model="form.Htrapezoidal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="W厚度">
+            <el-input v-model="form.Wthickness" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="当前垛盘数">
+            <el-input v-model="form.tray_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="垛盘高度">
+            <el-input v-model="form.tray_high" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="垛型类别">
+            <el-input v-model="form.crib_category" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X1行">
+            <el-input v-model="form.palletX1_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y1列">
+            <el-input v-model="form.palletY1_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A1角度">
+            <el-input v-model="form.palletA1_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X2行">
+            <el-input v-model="form.palletX2_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y2列">
+            <el-input v-model="form.palletY2_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A2角度">
+            <el-input v-model="form.palletA2_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X3行">
+            <el-input v-model="form.palletX3_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y3列">
+            <el-input v-model="form.palletY3_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A3角度">
+            <el-input v-model="form.palletA3_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X1行">
+            <el-input v-model="form.pressCribX1_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y1列">
+            <el-input v-model="form.pressCribY1_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A1角度">
+            <el-input v-model="form.pressCribA1_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X2行">
+            <el-input v-model="form.pressCribX2_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y2列">
+            <el-input v-model="form.pressCribY2_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A2角度">
+            <el-input v-model="form.pressCribA2_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X3行">
+            <el-input v-model="form.pressCribX3_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y3列">
+            <el-input v-model="form.pressCribY3_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A3角度">
+            <el-input v-model="form.pressCribA3_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="Z轴偏移">
+            <el-input v-model="form.Zoffset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛层数">
+            <el-input v-model="form.pallet_layerQty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛层数">
+            <el-input v-model="form.pressCrib_layerQty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X1间隔">
+            <el-input v-model="form.codeLayerX1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y1间隔">
+            <el-input v-model="form.codeLayerY1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X2间隔">
+            <el-input v-model="form.codeLayerX2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y2间隔">
+            <el-input v-model="form.codeLayerY2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X3间隔">
+            <el-input v-model="form.codeLayerX3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y3间隔">
+            <el-input v-model="form.codeLayerY3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X1偏移">
+            <el-input v-model="form.codeLayerX1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y1偏移">
+            <el-input v-model="form.codeLayerY1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X2偏移">
+            <el-input v-model="form.codeLayerX2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y2偏移">
+            <el-input v-model="form.codeLayerY2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X3偏移">
+            <el-input v-model="form.codeLayerX3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y3偏移">
+            <el-input v-model="form.codeLayerY3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X1间隔">
+            <el-input v-model="form.pressLayerX1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y1间隔">
+            <el-input v-model="form.pressLayerY1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X2间隔">
+            <el-input v-model="form.pressLayerX2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y2间隔">
+            <el-input v-model="form.pressLayerY2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X3间隔">
+            <el-input v-model="form.pressLayerX3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y3间隔">
+            <el-input v-model="form.pressLayerY3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X1偏移">
+            <el-input v-model="form.pressLayerX1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y1偏移">
+            <el-input v-model="form.pressLayerY1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X2偏移">
+            <el-input v-model="form.pressLayerX2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y2偏移">
+            <el-input v-model="form.pressLayerY2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X3偏移">
+            <el-input v-model="form.pressLayerX3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y3偏移">
+            <el-input v-model="form.pressLayerY3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="1#垛总数">
+            <el-input v-model="form.one_cribTotal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="2#垛总数">
+            <el-input v-model="form.two_cribTotal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="1#垛当前数">
+            <el-input v-model="form.one_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="2#垛当前数">
+            <el-input v-model="form.two_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="工具坐标">
+            <el-input v-model="form.tool_coordinate" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="组盘人">
+            <el-input v-model="form.create_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="组盘人姓名">
+            <el-input v-model="form.create_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="组盘时间">
+            <el-input v-model="form.create_time" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="修改人">
+            <el-input v-model="form.update_optid" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="修改人姓名">
+            <el-input v-model="form.update_optname" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="修改时间">
+            <el-input v-model="form.update_time" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="material_id" label="物料标志" />
+        <el-table-column prop="material_code" label="物料编码" />
+        <el-table-column prop="material_name" label="物料名称 " />
+        <el-table-column prop="product_code" label="产品编号" />
+        <el-table-column prop="AlongSide" label="A长边" />
+        <el-table-column prop="BshortSide" label="B短边" />
+        <el-table-column prop="Htrapezoidal" label="H梯形高" />
+        <el-table-column prop="Wthickness" label="W厚度" />
+        <el-table-column prop="tray_qty" label="当前垛盘数" />
+        <el-table-column prop="tray_high" label="垛盘高度" />
+        <el-table-column prop="crib_category" label="垛型类别" />
+        <el-table-column prop="palletX1_line" label="码垛X1行" />
+        <el-table-column prop="palletY1_row" label="码垛Y1列" />
+        <el-table-column prop="palletA1_angle" label="码垛A1角度" />
+        <el-table-column prop="palletX2_line" label="码垛X2行" />
+        <el-table-column prop="palletY2_row" label="码垛Y2列" />
+        <el-table-column prop="palletA2_angle" label="码垛A2角度" />
+        <el-table-column prop="palletX3_line" label="码垛X3行" />
+        <el-table-column prop="palletY3_row" label="码垛Y3列" />
+        <el-table-column prop="palletA3_angle" label="码垛A3角度" />
+        <el-table-column prop="pressCribX1_line" label="压垛X1行" />
+        <el-table-column prop="pressCribY1_row" label="压垛Y1列" />
+        <el-table-column prop="pressCribA1_angle" label="压垛A1角度" />
+        <el-table-column prop="pressCribX2_line" label="压垛X2行" />
+        <el-table-column prop="pressCribY2_row" label="压垛Y2列" />
+        <el-table-column prop="pressCribA2_angle" label="压垛A2角度" />
+        <el-table-column prop="pressCribX3_line" label="压垛X3行" />
+        <el-table-column prop="pressCribY3_row" label="压垛Y3列" />
+        <el-table-column prop="pressCribA3_angle" label="压垛A3角度" />
+        <el-table-column prop="Zoffset" label="Z轴偏移" />
+        <el-table-column prop="pallet_layerQty" label="码垛层数" />
+        <el-table-column prop="pressCrib_layerQty" label="压垛层数" />
+        <el-table-column prop="codeLayerX1_interval" label="码层X1间隔" />
+        <el-table-column prop="codeLayerY1_interval" label="码层Y1间隔" />
+        <el-table-column prop="codeLayerX2_interval" label="码层X2间隔" />
+        <el-table-column prop="codeLayerY2_interval" label="码层Y2间隔" />
+        <el-table-column prop="codeLayerX3_interval" label="码层X3间隔" />
+        <el-table-column prop="codeLayerY3_interval" label="码层Y3间隔" />
+        <el-table-column prop="codeLayerX1_offset" label="码层X1偏移" />
+        <el-table-column prop="codeLayerY1_offset" label="码层Y1偏移" />
+        <el-table-column prop="codeLayerX2_offset" label="码层X2偏移" />
+        <el-table-column prop="codeLayerY2_offset" label="码层Y2偏移" />
+        <el-table-column prop="codeLayerX3_offset" label="码层X3偏移" />
+        <el-table-column prop="codeLayerY3_offset" label="码层Y3偏移" />
+        <el-table-column prop="pressLayerX1_interval" label="压层X1间隔" />
+        <el-table-column prop="pressLayerY1_interval" label="压层Y1间隔" />
+        <el-table-column prop="pressLayerX2_interval" label="压层X2间隔" />
+        <el-table-column prop="pressLayerY2_interval" label="压层Y2间隔" />
+        <el-table-column prop="pressLayerX3_interval" label="压层X3间隔" />
+        <el-table-column prop="pressLayerY3_interval" label="压层Y3间隔" />
+        <el-table-column prop="pressLayerX1_offset" label="压层X1偏移" />
+        <el-table-column prop="pressLayerY1_offset" label="压层Y1偏移" />
+        <el-table-column prop="pressLayerX2_offset" label="压层X2偏移" />
+        <el-table-column prop="pressLayerY2_offset" label="压层Y2偏移" />
+        <el-table-column prop="pressLayerX3_offset" label="压层X3偏移" />
+        <el-table-column prop="pressLayerY3_offset" label="压层Y3偏移" />
+        <el-table-column prop="one_cribTotal" label="1#垛总数" />
+        <el-table-column prop="two_cribTotal" label="2#垛总数" />
+        <el-table-column prop="one_qty" label="1#垛当前数" />
+        <el-table-column prop="two_qty" label="2#垛当前数" />
+        <el-table-column prop="tool_coordinate" label="工具坐标" />
+        <el-table-column prop="create_id" label="组盘人" />
+        <el-table-column prop="create_name" label="组盘人姓名" />
+        <el-table-column prop="create_time" label="组盘时间" />
+        <el-table-column prop="update_optid" label="修改人" />
+        <el-table-column prop="update_optname" label="修改人姓名" />
+        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudCribbinginfo from '@/api/cribbinginfo'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, AlongSide: null, BshortSide: null, Htrapezoidal: null, Wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null }
+export default {
+  name: 'Cribbinginfo',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }})
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      }    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

wms/qd/src/api/wms/Cribbing/cribbinginfo.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/cribbinginfo',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/cribbinginfo/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/cribbinginfo',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

wms/qd/src/views/wms/Cribbing/index.vue

@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-form-item v-if = "false" label="物料标志">
+            <el-input v-model="form.material_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input v-model="form.material_code" style="width: 370px;" @focus="getMater"/>
+          </el-form-item>
+          <el-form-item v-if = "false" label="物料名称 ">
+            <el-input v-model="form.material_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="产品编号">
+            <el-input v-model="form.product_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="A长边">
+            <el-input v-model="form.AlongSide" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="B短边">
+            <el-input v-model="form.BshortSide" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="H梯形高">
+            <el-input v-model="form.Htrapezoidal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="W厚度">
+            <el-input v-model="form.Wthickness" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="当前垛盘数">
+            <el-input v-model="form.tray_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="垛盘高度">
+            <el-input v-model="form.tray_high" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="垛型类别">
+            <el-input v-model="form.crib_category" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X1行">
+            <el-input v-model="form.palletX1_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y1列">
+            <el-input v-model="form.palletY1_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A1角度">
+            <el-input v-model="form.palletA1_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X2行">
+            <el-input v-model="form.palletX2_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y2列">
+            <el-input v-model="form.palletY2_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A2角度">
+            <el-input v-model="form.palletA2_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛X3行">
+            <el-input v-model="form.palletX3_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛Y3列">
+            <el-input v-model="form.palletY3_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛A3角度">
+            <el-input v-model="form.palletA3_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X1行">
+            <el-input v-model="form.pressCribX1_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y1列">
+            <el-input v-model="form.pressCribY1_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A1角度">
+            <el-input v-model="form.pressCribA1_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X2行">
+            <el-input v-model="form.pressCribX2_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y2列">
+            <el-input v-model="form.pressCribY2_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A2角度">
+            <el-input v-model="form.pressCribA2_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛X3行">
+            <el-input v-model="form.pressCribX3_line" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛Y3列">
+            <el-input v-model="form.pressCribY3_row" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛A3角度">
+            <el-input v-model="form.pressCribA3_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="Z轴偏移">
+            <el-input v-model="form.Zoffset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码垛层数">
+            <el-input v-model="form.pallet_layerQty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压垛层数">
+            <el-input v-model="form.pressCrib_layerQty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X1间隔">
+            <el-input v-model="form.codeLayerX1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y1间隔">
+            <el-input v-model="form.codeLayerY1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X2间隔">
+            <el-input v-model="form.codeLayerX2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y2间隔">
+            <el-input v-model="form.codeLayerY2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X3间隔">
+            <el-input v-model="form.codeLayerX3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y3间隔">
+            <el-input v-model="form.codeLayerY3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X1偏移">
+            <el-input v-model="form.codeLayerX1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y1偏移">
+            <el-input v-model="form.codeLayerY1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X2偏移">
+            <el-input v-model="form.codeLayerX2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y2偏移">
+            <el-input v-model="form.codeLayerY2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层X3偏移">
+            <el-input v-model="form.codeLayerX3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="码层Y3偏移">
+            <el-input v-model="form.codeLayerY3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X1间隔">
+            <el-input v-model="form.pressLayerX1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y1间隔">
+            <el-input v-model="form.pressLayerY1_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X2间隔">
+            <el-input v-model="form.pressLayerX2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y2间隔">
+            <el-input v-model="form.pressLayerY2_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X3间隔">
+            <el-input v-model="form.pressLayerX3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y3间隔">
+            <el-input v-model="form.pressLayerY3_interval" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X1偏移">
+            <el-input v-model="form.pressLayerX1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y1偏移">
+            <el-input v-model="form.pressLayerY1_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X2偏移">
+            <el-input v-model="form.pressLayerX2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y2偏移">
+            <el-input v-model="form.pressLayerY2_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层X3偏移">
+            <el-input v-model="form.pressLayerX3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="压层Y3偏移">
+            <el-input v-model="form.pressLayerY3_offset" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="1#垛总数">
+            <el-input v-model="form.one_cribTotal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="2#垛总数">
+            <el-input v-model="form.two_cribTotal" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="1#垛当前数">
+            <el-input v-model="form.one_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="2#垛当前数">
+            <el-input v-model="form.two_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="工具坐标">
+            <el-input v-model="form.tool_coordinate" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <MaterDialog :dialog-show.sync="materDialog" :dialog-matertype="materType" @tableChanged3="tableChanged3" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="material_id" label="物料标志" />
+        <el-table-column prop="material_code" label="物料编码" />
+        <el-table-column prop="material_name" label="物料名称 " />
+        <el-table-column prop="product_code" label="产品编号" />
+        <el-table-column prop="AlongSide" label="A长边" />
+        <el-table-column prop="BshortSide" label="B短边" />
+        <el-table-column prop="Htrapezoidal" label="H梯形高" />
+        <el-table-column prop="Wthickness" label="W厚度" />
+        <el-table-column prop="tray_qty" label="当前垛盘数" />
+        <el-table-column prop="tray_high" label="垛盘高度" />
+        <el-table-column prop="crib_category" label="垛型类别" />
+        <el-table-column prop="palletX1_line" label="码垛X1行" />
+        <el-table-column prop="palletY1_row" label="码垛Y1列" />
+        <el-table-column prop="palletA1_angle" label="码垛A1角度" />
+        <el-table-column prop="palletX2_line" label="码垛X2行" />
+        <el-table-column prop="palletY2_row" label="码垛Y2列" />
+        <el-table-column prop="palletA2_angle" label="码垛A2角度" />
+        <el-table-column prop="palletX3_line" label="码垛X3行" />
+        <el-table-column prop="palletY3_row" label="码垛Y3列" />
+        <el-table-column prop="palletA3_angle" label="码垛A3角度" />
+        <el-table-column prop="pressCribX1_line" label="压垛X1行" />
+        <el-table-column prop="pressCribY1_row" label="压垛Y1列" />
+        <el-table-column prop="pressCribA1_angle" label="压垛A1角度" />
+        <el-table-column prop="pressCribX2_line" label="压垛X2行" />
+        <el-table-column prop="pressCribY2_row" label="压垛Y2列" />
+        <el-table-column prop="pressCribA2_angle" label="压垛A2角度" />
+        <el-table-column prop="pressCribX3_line" label="压垛X3行" />
+        <el-table-column prop="pressCribY3_row" label="压垛Y3列" />
+        <el-table-column prop="pressCribA3_angle" label="压垛A3角度" />
+        <el-table-column prop="Zoffset" label="Z轴偏移" />
+        <el-table-column prop="pallet_layerQty" label="码垛层数" />
+        <el-table-column prop="pressCrib_layerQty" label="压垛层数" />
+        <el-table-column prop="codeLayerX1_interval" label="码层X1间隔" />
+        <el-table-column prop="codeLayerY1_interval" label="码层Y1间隔" />
+        <el-table-column prop="codeLayerX2_interval" label="码层X2间隔" />
+        <el-table-column prop="codeLayerY2_interval" label="码层Y2间隔" />
+        <el-table-column prop="codeLayerX3_interval" label="码层X3间隔" />
+        <el-table-column prop="codeLayerY3_interval" label="码层Y3间隔" />
+        <el-table-column prop="codeLayerX1_offset" label="码层X1偏移" />
+        <el-table-column prop="codeLayerY1_offset" label="码层Y1偏移" />
+        <el-table-column prop="codeLayerX2_offset" label="码层X2偏移" />
+        <el-table-column prop="codeLayerY2_offset" label="码层Y2偏移" />
+        <el-table-column prop="codeLayerX3_offset" label="码层X3偏移" />
+        <el-table-column prop="codeLayerY3_offset" label="码层Y3偏移" />
+        <el-table-column prop="pressLayerX1_interval" label="压层X1间隔" />
+        <el-table-column prop="pressLayerY1_interval" label="压层Y1间隔" />
+        <el-table-column prop="pressLayerX2_interval" label="压层X2间隔" />
+        <el-table-column prop="pressLayerY2_interval" label="压层Y2间隔" />
+        <el-table-column prop="pressLayerX3_interval" label="压层X3间隔" />
+        <el-table-column prop="pressLayerY3_interval" label="压层Y3间隔" />
+        <el-table-column prop="pressLayerX1_offset" label="压层X1偏移" />
+        <el-table-column prop="pressLayerY1_offset" label="压层Y1偏移" />
+        <el-table-column prop="pressLayerX2_offset" label="压层X2偏移" />
+        <el-table-column prop="pressLayerY2_offset" label="压层Y2偏移" />
+        <el-table-column prop="pressLayerX3_offset" label="压层X3偏移" />
+        <el-table-column prop="pressLayerY3_offset" label="压层Y3偏移" />
+        <el-table-column prop="one_cribTotal" label="1#垛总数" />
+        <el-table-column prop="two_cribTotal" label="2#垛总数" />
+        <el-table-column prop="one_qty" label="1#垛当前数" />
+        <el-table-column prop="two_qty" label="2#垛当前数" />
+        <el-table-column prop="tool_coordinate" label="工具坐标" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+
+  </div>
+</template>
+
+<script>
+import crudCribbinginfo from '@/api/wms/Cribbing/cribbinginfo'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import MaterDialog from '@/views/wms/st/in/MaterDialog'
+
+const defaultForm = { info_id: null, material_id: null, material_code: null, material_name: null, material_spec: null, product_code: null, AlongSide: null, BshortSide: null, Htrapezoidal: null, Wthickness: null, tray_qty: null, tray_high: null, crib_category: null, palletX1_line: null, palletY1_row: null, palletA1_angle: null, palletX2_line: null, palletY2_row: null, palletA2_angle: null, palletX3_line: null, palletY3_row: null, palletA3_angle: null, pressCribX1_line: null, pressCribY1_row: null, pressCribA1_angle: null, pressCribX2_line: null, pressCribY2_row: null, pressCribA2_angle: null, pressCribX3_line: null, pressCribY3_row: null, pressCribA3_angle: null, Zoffset: null, pallet_layerQty: null, pressCrib_layerQty: null, codeLayerX1_interval: null, codeLayerY1_interval: null, codeLayerX2_interval: null, codeLayerY2_interval: null, codeLayerX3_interval: null, codeLayerY3_interval: null, codeLayerX1_offset: null, codeLayerY1_offset: null, codeLayerX2_offset: null, codeLayerY2_offset: null, codeLayerX3_offset: null, codeLayerY3_offset: null, pressLayerX1_interval: null, pressLayerY1_interval: null, pressLayerX2_interval: null, pressLayerY2_interval: null, pressLayerX3_interval: null, pressLayerY3_interval: null, pressLayerX1_offset: null, pressLayerY1_offset: null, pressLayerX2_offset: null, pressLayerY2_offset: null, pressLayerX3_offset: null, pressLayerY3_offset: null, one_cribTotal: null, two_cribTotal: null, one_qty: null, two_qty: null, tool_coordinate: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null }
+export default {
+  name: 'Cribbinginfo',
+  components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }})
+  },
+  data() {
+    return {
+      permission: {
+      },
+      materType: '',
+      materDialog: false,
+      rules: {
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    getMater() {
+      this.materDialog = true
+    },
+    tableChanged3(row) {
+      console.log(row)
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+      this.form.material_name = row.material_name
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

wms/qd/src/views/wms/pdm/produceTask/index.vue

@@ -138,16 +138,20 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="780px">
         <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="120px" >
-          <el-form-item label="物料名称" prop="material_id">
-            <el-select v-model="form.material_id" filterable clearable style="width: 200px;" placeholder="请选择物料">
+           <!-- <el-select v-model="form.material_id" filterable clearable style="width: 200px;" placeholder="请选择物料">
               <el-option
                 v-for="item in materialList"
                 :key="item.material_id"
                 :label="item.material_name"
                 :value="item.material_id"
               />
-            </el-select>
+            </el-select>-->
+          <el-form-item v-if="false" label="物料编码">
+            <el-input   v-model="form.material_id" style="width: 200px;" @focus="getMater"/>
           </el-form-item>
+            <el-form-item label="物料编码">
+              <el-input v-model="form.material_code" style="width: 200px;" @focus="getMater"/>
+            </el-form-item>
           <el-form-item label="设备名称" prop="device_id">
             <el-select v-model="form.device_id" filterable clearable style="width: 200px" placeholder="请选择设备">
               <el-option
@@ -241,6 +245,7 @@
           <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
+      <MaterDialog :dialog-show.sync="materDialog" :dialog-matertype="materType" @tableChanged3="tableChanged5" />
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -335,6 +340,7 @@ import pagination from '@crud/Pagination'
 import UploadDialog from '@/views/wms/pdm/produceTask/UploadDialog'
 import CopyDialog from '@/views/wms/pdm/produceTask/CopyDialog'
 import SortDialog from '@/views/wms/pdm/produceTask/SortDialog'
+import MaterDialog from '@/views/wms/st/in/MaterDialog'
 
 const defaultForm = {
   producetask_id: null,
@@ -376,7 +382,7 @@ const defaultForm = {
 export default {
   name: 'Producetask',
   dicts: ['PRODUCETASK_STATUS', 'PRODUCETASK_STATUS_TYPE', 'MD_MTPVEHICLE_TYPE'],
-  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog, CopyDialog, SortDialog },
+  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog, CopyDialog, SortDialog, MaterDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: '生产任务', url: 'api/producetask', idField: 'producetask_id', sort: 'producetask_id,desc', optShow: { add: true, edit: false, del: false, download: false, reset: true }, crudMethod: { ...crudProducetask }})
@@ -386,6 +392,8 @@ export default {
       permission: {
       },
       custList: [],
+      materType: '',
+      materDialog: false,
       deviceList: [],
       deviceList1: [],
       producelineList: [],
@@ -497,6 +505,15 @@ export default {
         }
       }
     },
+    getMater() {
+      this.materDialog = true
+    },
+    tableChanged5(row) {
+      console.log(row)
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+      this.form.material_name = row.material_name
+    },
     handleSelectionChange(val, row) {
       if (val.length > 1) {
         this.$refs.table.clearSelection()