add:新增原材料入库功能

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java

@@ -1,6 +1,8 @@
 package org.nl.wms.storage_manage.basedata.controller.storage;
 
 
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,8 +44,16 @@ public class StIvtBsrealstorattrController {
     @PostMapping("/queryStor")
     @Log("查询仓库")
     @ApiOperation("查询仓库")
-    public ResponseEntity<Object> queryStor() {
+    public ResponseEntity<Object> queryStor(@RequestBody JSONObject whereJson) {
-        List<StIvtBsrealstorattr> list = stIvtBsrealstorattrService.list(new QueryWrapper<StIvtBsrealstorattr>().eq("is_used", true));
+        List<StIvtBsrealstorattr> list;
+        //1虚拟库2半成品库3原料库4成品库5备件库
+        String stor_type = whereJson.getString("stor_type");
+        QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
+        wrapper.eq("is_used", true);
+        if (StrUtil.isNotEmpty(stor_type)) {
+            wrapper.eq("stor_type", stor_type);
+        }
+        list = stIvtBsrealstorattrService.list(wrapper);
         return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java

@@ -1,8 +1,17 @@
 package org.nl.wms.storage_manage.basedata.controller.storage;
 
 
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.nl.common.anno.Log;
 
 /**
  * <p>
@@ -13,8 +22,17 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-05-04
  */
 @RestController
-@RequestMapping("/stIvtStructattr")
+@RequestMapping("/api/stIvtStructattr")
 public class StIvtStructattrController {
 
+    @Autowired
+    protected IStIvtStructattrService iStIvtStructattrService;
+
+    @PostMapping("/getSectCascader")
+    @Log("获取库区对应仓位下拉框-多级下拉框")
+    @ApiOperation("获取库区对应仓位下拉框-多级下拉框")
+    public ResponseEntity<Object> getSectCascader(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(iStIvtStructattrService.getSectCascader(whereJson), HttpStatus.OK);
+    }
 }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java

@@ -1,5 +1,6 @@
 package org.nl.wms.storage_manage.basedata.service.storage;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
 
@@ -13,4 +14,5 @@ import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
  */
 public interface IStIvtStructattrService extends IService<StIvtStructattr> {
 
+    JSONObject getSectCascader(JSONObject jo);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java

@@ -1,11 +1,23 @@
 package org.nl.wms.storage_manage.basedata.service.storage.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService;
 import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
 import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtStructattrMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 仓位属性表 服务实现类
@@ -17,4 +29,40 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
 
+    @Autowired
+    private IStIvtSectattrService sectattrService;
+    @Autowired
+    private IStIvtStructattrService structattrService;
+
+    @Override
+    public JSONObject getSectCascader(JSONObject jo) {
+        String stor_id = jo.getString("stor_id");
+        if (StrUtil.isEmpty(stor_id)) {
+            stor_id = "";
+        }
+        JSONArray cascader_ja = new JSONArray();
+        List<StIvtSectattr> list = sectattrService.list(new QueryWrapper<StIvtSectattr>().eq("is_used", true)
+                .eq("stor_id", stor_id));
+        list.forEach(sect -> {
+            JSONObject sect_cas = new JSONObject();
+            sect_cas.put("value", sect.getSect_id());
+            sect_cas.put("label", sect.getSect_name());
+            List<StIvtStructattr> struct_list = structattrService.list(new QueryWrapper<StIvtStructattr>().eq("is_used", true)
+                    .eq("sect_id", sect.getSect_id()));
+            if (struct_list.size() > 0) {
+                JSONArray struct_ja = new JSONArray();
+                struct_list.forEach(struct -> {
+                    JSONObject struct_cas = new JSONObject();
+                    struct_cas.put("value", struct.getStruct_id());
+                    struct_cas.put("label", struct.getStruct_name());
+                    struct_ja.add(struct_cas);
+                });
+                sect_cas.put("children", struct_ja);
+            }
+            cascader_ja.add(sect_cas);
+        });
+        JSONObject result = new JSONObject();
+        result.put("content", cascader_ja);
+        return result;
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java

@@ -1,9 +1,22 @@
 package org.nl.wms.storage_manage.rawmanage.controller.iostorInv;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.alibaba.fastjson.JSONObject;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -14,8 +27,58 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-05-10
  */
 @RestController
-@RequestMapping("/stIvtIostorinvYl")
+@RequestMapping("/api/stIvtIostorinvYl")
 public class StIvtIostorinvYlController {
 
+    @Autowired
+    private IStIvtIostorinvYlService iostorinvYlService;
+
+    @GetMapping
+    @Log("查询入库单")
+    @ApiOperation("查询入库单")
+    public ResponseEntity<Object> query(YlIostorInvQuery query, PageQuery page){
+        return new ResponseEntity<>(iostorinvYlService.pageQuery(query,page),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("创建入库单")
+    @ApiOperation("创建入库单")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        iostorinvYlService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/update")
+    @Log("修改入库单")
+    @ApiOperation("修改入库单")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        iostorinvYlService.updateBill(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @PostMapping("/delete")
+    @Log("删除入库单")
+    @ApiOperation("删除入库单")
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids){
+        iostorinvYlService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/getIODtl")
+    @Log("查询入库分配明细")
+    @ApiOperation("查询入库分配明细")
+    public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(iostorinvYlService.getInvDtl(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("强制确认")
+    @ApiOperation("强制确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        iostorinvYlService.confirm(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
 }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvYlService.java

@@ -1,7 +1,15 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv;
 
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +21,48 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IStIvtIostorinvYlService extends IService<StIvtIostorinvYl> {
 
+    /**
+     * 分页查询
+     * @param query,page /
+     * @return JSONObject
+     */
+    Object pageQuery(YlIostorInvQuery query, PageQuery page);
+
+    /**
+     * 创建
+     *
+     * @param form /
+     */
+    void create(JSONObject form);
+
+    /**
+     * 修改单据
+     * @param form
+     * @return
+     */
+    String updateBill(JSONObject form);
+
+    /**
+     * 删除
+     * @param ids
+     * {
+     *     主表id..
+     * }
+     */
+    void delete(Long[] ids);
+
+    /**
+     * 获取分配明细
+     * @param form
+     * @return
+     */
+    List<Map> getInvDtl(JSONObject form);
+
+    /**
+     * 强制确认
+     * @param form
+     * @return
+     */
+    void confirm(JSONObject form);
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdisYlService.java

@@ -1,5 +1,7 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-05-10
  */
 public interface IStIvtIostorinvdisYlService extends IService<StIvtIostorinvdisYl> {
+    /**
+     * 主单据使用
+     *
+     * @param row
+     * @param mst_jo
+     * @return
+     */
+    void create(JSONObject row, JSONObject mst_jo);
 
+    /**
+     * 根据主表删除明细
+     *
+     * @param mst_id
+     * @return
+     */
+    void deleteById(String mst_id);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java

@@ -1,8 +1,13 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库单明细表 服务类
@@ -13,4 +18,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IStIvtIostorinvdtlYlService extends IService<StIvtIostorinvdtlYl> {
 
+    /**
+     * 主单据使用
+     * @param row
+     * @param iostorinvCp_id
+     * @return
+     */
+    double create(JSONArray row, String iostorinvCp_id);
+
+    List<Map> getDtlList(JSONObject json);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java

@@ -1,9 +1,14 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -25,6 +30,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 出入单标识
      */
+    @TableId(value = "iostorinv_id")
     private String iostorinv_id;
 
     /**
@@ -35,7 +41,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 出入类型
      */
-    private Boolean io_type;
+    private String io_type;
 
     /**
      * 业务类型
@@ -90,7 +96,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 明细数
      */
-    private BigDecimal detail_count;
+    private Integer detail_count;
 
     /**
      * 单据状态
@@ -115,6 +121,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date create_time;
 
     /**
@@ -130,6 +137,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date update_time;
 
     /**
@@ -145,6 +153,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 分配时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dis_time;
 
     /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java

@@ -1,8 +1,11 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao;
 
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,7 +42,7 @@ public class StIvtIostorinvdisYl implements Serializable {
     /**
      * 明细序号
      */
-    private BigDecimal seq_no;
+    private Integer seq_no;
 
     /**
      * 库区标识

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java

@@ -34,7 +34,7 @@ public class StIvtIostorinvdtlYl implements Serializable {
     /**
      * 明细序号
      */
-    private BigDecimal seq_no;
+    private Integer seq_no;
 
     /**
      * 物料标识

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvYlMapper.java

@@ -1,7 +1,13 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StIvtIostorinvYlMapper extends BaseMapper<StIvtIostorinvYl> {
 
+    List<Map> getMstDetail(@Param("query") YlIostorInvQuery query, @Param("pageQuery") PageQuery pageQuery);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlYlMapper.java

@@ -1,8 +1,12 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库单明细表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StIvtIostorinvdtlYlMapper extends BaseMapper<StIvtIostorinvdtlYl> {
 
+    List<Map> getIostorinvdtl(Map query);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml

@@ -2,4 +2,62 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper">
 
+    <select id="getMstDetail" resultType="java.util.Map">
+        SELECT DISTINCT
+        mst.iostorinv_id,
+        mst.bill_code,
+        mst.io_type,
+        mst.buss_type,
+        mst.bill_type,
+        mst.biz_date,
+        mst.stor_id,
+        mst.stor_code,
+        mst.stor_name,
+        mst.source_id,
+        mst.source_name,
+        mst.source_type,
+        mst.total_qty,
+        mst.detail_count,
+        mst.bill_status,
+        mst.remark,
+        mst.create_id,
+        mst.create_name,
+        DATE_FORMAT( mst.create_time,'%Y-%m-%d %H:%i:%s') AS create_time,
+        mst.update_id,
+        mst.update_name,
+        DATE_FORMAT( mst.update_time,'%Y-%m-%d %H:%i:%s') AS update_time,
+        mst.confirm_id,
+        mst.confirm_name,
+        DATE_FORMAT( mst.confirm_time,'%Y-%m-%d %H:%i:%s') AS confirm_time,
+        dis.struct_id,
+        dis.sect_id
+        FROM
+        st_ivt_iostorinv_yl mst
+        LEFT JOIN st_ivt_iostorinvdis_yl dis ON dis.iostorinv_id = mst.iostorinv_id
+	    <where>
+            mst.is_delete = '0'
+        AND
+            io_type = '1'
+            <if test="query.start_time  != null">
+                and mst.create_time >= #{query.start_time}
+            </if>
+            <if test="query.end_time  != null">
+                and #{query.end_time} >= mst.create_time
+            </if>
+            <if test="query.stor_id != null and query.stor_id != ''">
+                and mst.stor_id = #{query.stor_id}
+            </if>
+            <if test="query.bill_status != null and query.bill_status != ''">
+                and mst.bill_status = #{query.bill_status}
+            </if>
+            <if test="query.bill_type != null and query.bill_type != ''">
+                and mst.bill_type = #{query.bill_type}
+            </if>
+            <if test="query.bill_code != null and query.bill_code != ''">
+                and mst.bill_code = #{query.bill_code}
+            </if>
+        </where>
+
+
+    </select>
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlYlMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdtlYlMapper">
 
+    <select id="getIostorinvdtl" resultType="java.util.Map">
+		SELECT
+			dtl.*,
+			mb.material_code,
+			mb.material_name
+		FROM
+			st_ivt_iostorinvdtl_yl dtl
+			LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+		<where>
+			<if test="bill_code != null and bill_code != ''">
+				and dtl.bill_code = #{bill_code}
+			</if>
+			<if test="iostorinv_id != null and iostorinv_id != ''">
+				and dtl.iostorinv_id = #{iostorinv_id}
+			</if>
+		</where>
+		order by dtl.seq_no ASC
+    </select>
 </mapper>

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

@@ -1,11 +1,40 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.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 io.jsonwebtoken.lang.Assert;
+import org.jetbrains.annotations.NotNull;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper;
-import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
+import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库单主表 服务实现类
@@ -17,4 +46,119 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMapper, StIvtIostorinvYl> implements IStIvtIostorinvYlService {
 
+    @Autowired
+    private IStIvtBsrealstorattrService stIvtBsrealstorattrService;
+
+    @Autowired
+    private IStIvtIostorinvdtlYlService iostorinvdtlYlService;
+
+    @Autowired
+    private StIvtIostorinvYlMapper iostorinvYlMapper;
+
+
+    @Override
+    public Object pageQuery(YlIostorInvQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        List<Map> mst_detail = iostorinvYlMapper.getMstDetail(query, pageQuery);
+        TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
+    @Override
+    public void create(JSONObject form) {
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+
+        // 调用主表 插入/更新方法
+        StIvtIostorinvYl stIvtIostorinvYl = packageMstForm(new StIvtIostorinvYl(), form, false);
+        // 插入主表
+        this.save(stIvtIostorinvYl);
+
+        // 调用明细表 插入/更新方法
+        iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id());
+    }
+
+    @Override
+    public String updateBill(JSONObject form) {
+        Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空");
+        StIvtIostorinvYl mst = form.toJavaObject(StIvtIostorinvYl.class);
+        mst.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mst.setUpdate_name(SecurityUtils.getCurrentNickName());
+        mst.setUpdate_time(new Date());
+        this.updateById(mst);
+
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+        // 调用明细表 插入/更新方法
+        iostorinvdtlYlService.create(rows, form.getString("iostorinv_id"));
+        return mst.getIostorinv_id();
+    }
+
+    @Override
+    public void delete(Long[] ids) {
+
+        for (Long id : ids) {
+            StIvtIostorinvYl dao = this.getOne(new QueryWrapper<StIvtIostorinvYl>().eq("iostorinv_id", id));
+            dao.setIs_delete(true);
+
+            this.updateById(dao);
+        }
+    }
+
+    @Override
+    public List<Map> getInvDtl(JSONObject form) {
+        return iostorinvdtlYlService.getDtlList(form);
+    }
+
+    @Override
+    public void confirm(JSONObject form) {
+
+    }
+
+    @NotNull
+    private StIvtIostorinvYl packageMstForm(StIvtIostorinvYl stIvtIostorinvYl, JSONObject whereJson, Boolean isUpdate) {
+        JSONArray rows = whereJson.getJSONArray("tableData");
+        if (!isUpdate) {
+            // 新增
+            stIvtIostorinvYl.setIostorinv_id(IdUtil.getStringId());
+            stIvtIostorinvYl.setBill_code(CodeUtil.getNewCode("IO_CODE"));
+            stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("入库"));
+            stIvtIostorinvYl.setBuss_type(whereJson.getString("bill_type"));
+            stIvtIostorinvYl.setBill_type(stIvtIostorinvYl.getBuss_type());
+            stIvtIostorinvYl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+            stIvtIostorinvYl.setCreate_id(SecurityUtils.getCurrentUserId());
+            stIvtIostorinvYl.setCreate_name(SecurityUtils.getCurrentNickName());
+            stIvtIostorinvYl.setCreate_time(new Date());
+            stIvtIostorinvYl.setIs_delete(false);
+            stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId());
+            stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName());
+            stIvtIostorinvYl.setUpdate_time(new Date());
+            // TODO 暂时写死
+            stIvtIostorinvYl.setSysdeptid("111");
+            stIvtIostorinvYl.setSyscompanyid("111");
+        } else {
+            // 修改
+            stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId());
+            stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName());
+            stIvtIostorinvYl.setUpdate_time(new Date());
+        }
+
+        stIvtIostorinvYl.setBiz_date(whereJson.getString("biz_date").substring(0, 10));
+        // 获取仓库信息
+        QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
+        wrapper.eq("stor_id", whereJson.getString("stor_id"));
+        wrapper.eq("is_used", true);
+        StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper);
+        if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！");
+
+        stIvtIostorinvYl.setStor_id(bsrealDao.getStor_id());
+        stIvtIostorinvYl.setStor_code(bsrealDao.getStor_code());
+        stIvtIostorinvYl.setStor_name(bsrealDao.getStor_name());
+        stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty"));
+        stIvtIostorinvYl.setDetail_count(rows.size());
+        stIvtIostorinvYl.setRemark(whereJson.getString("remark"));
+
+        return stIvtIostorinvYl;
+    }
 }

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

@@ -1,11 +1,28 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdisYlMapper;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 出入库单分配表 服务实现类
@@ -17,4 +34,54 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl<StIvtIostorinvdisYlMapper, StIvtIostorinvdisYl> implements IStIvtIostorinvdisYlService {
 
+    @Autowired
+    private IStIvtSectattrService sectattrService;
+    @Autowired
+    private IStIvtStructattrService structattrService;
+
+    @Override
+    public void create(JSONObject jo, JSONObject mst_jo) {
+        if (ObjectUtil.isNotEmpty(mst_jo)) {
+            // 先删除在插入
+            String mst_id = mst_jo.getString("mst_id");
+            String dtl_id = mst_jo.getString("dtl_id");
+            String iostorinvdisYl_id = IdUtil.getStringId();
+            StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class);
+            row.setIostorinv_id(mst_id);
+            row.setIostorinvdtl_id(dtl_id);
+            row.setIostorinvdtl_id(dtl_id);
+            row.setIostorinvdis_id(iostorinvdisYl_id);
+            List<StIvtIostorinvdisYl> list = this.list(new QueryWrapper<StIvtIostorinvdisYl>().eq("iostorinvdtl_id", dtl_id));
+            row.setSeq_no(list.size() + 1);
+            row.setIs_active(true);
+            row.setWork_status(IOSEnum.WORK_STATUS.code("未生成"));
+            row.setPlan_qty(row.getPlan_qty());
+
+            // 获取库区信息
+            QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();
+            sect_wrapper.eq("sect_id", row.getSect_id());
+            sect_wrapper.eq("is_used", true);
+            StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper);
+            if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！");
+
+            row.setSect_code(sectDao.getSect_code());
+            row.setSect_name(sectDao.getSect_name());
+            // 获取仓位信息
+            QueryWrapper<StIvtStructattr> struct_wrapper = new QueryWrapper<>();
+            struct_wrapper.eq("struct_id", row.getStruct_id());
+            struct_wrapper.eq("is_used", true);
+            StIvtStructattr structDao = structattrService.getOne(struct_wrapper);
+            if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
+
+            row.setStruct_code(structDao.getStruct_code());
+            row.setStruct_name(structDao.getStruct_name());
+            row.setPcsn(DateUtil.today());
+            this.save(row);
+        }
+    }
+
+    @Override
+    public void deleteById(String mst_id) {
+        this.remove(new QueryWrapper<StIvtIostorinvdisYl>().eq("iostorinv_id", mst_id));
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java

@@ -1,11 +1,26 @@
 package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.utils.IdUtil;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdtlYlMapper;
-import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库单明细表 服务实现类
@@ -17,4 +32,45 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtIostorinvdtlYlServiceImpl extends ServiceImpl<StIvtIostorinvdtlYlMapper, StIvtIostorinvdtlYl> implements IStIvtIostorinvdtlYlService {
 
+    @Autowired
+    private IStIvtIostorinvdisYlService iostorinvdisYlService;
+
+    @Override
+    public double create(JSONArray rows, String iostorinvYl_id) {
+        double total_qty = 0;
+
+        if (rows.size() > 0 && StringUtils.isNotEmpty(iostorinvYl_id)) {
+            // 先删除在插入
+            this.remove(new QueryWrapper<StIvtIostorinvdtlYl>().eq("iostorinv_id", iostorinvYl_id));
+            //删除分配记录
+            iostorinvdisYlService.deleteById(iostorinvYl_id);
+
+            for (int i = 0; i < rows.size(); i++) {
+                String iostorinvdtlYl_id = IdUtil.getStringId();
+                StIvtIostorinvdtlYl row = rows.getJSONObject(i).toJavaObject(StIvtIostorinvdtlYl.class);
+                row.setIostorinv_id(iostorinvYl_id);
+                row.setIostorinvdtl_id(iostorinvdtlYl_id);
+                row.setSeq_no(i + 1);
+                row.setIs_active(true);
+                row.setPcsn(DateUtil.today());
+                row.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+                row.setUnassign_qty(row.getPlan_qty());
+                this.save(row);
+                total_qty += row.getPlan_qty().doubleValue();
+                JSONObject mst_jo = new JSONObject();
+                mst_jo.put("mst_id", iostorinvYl_id);
+                mst_jo.put("dtl_id", iostorinvdtlYl_id);
+                iostorinvdisYlService.create(rows.getJSONObject(i), mst_jo);
+            }
+        }
+        return total_qty;
+    }
+
+    @Override
+    public List<Map> getDtlList(JSONObject form) {
+        if (ObjectUtil.isEmpty(form) || (StrUtil.isEmpty(form.getString("iostorinv_id")) && StrUtil.isEmpty(form.getString("bill_code")))) {
+            return new ArrayList<>();
+        }
+        return baseMapper.getIostorinvdtl(form);
+    }
 }

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

@@ -147,6 +147,7 @@ public class StIvtIostorinvBcp implements Serializable {
     /**
      * 创建人姓名
      */
+
     private String create_name;
 
     /**

mes/qd/src/api/wms/basedata/st/structattr.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/structattr',
+    url: 'api/stIvtStructattr',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/structattr/',
+    url: 'api/stIvtStructattr/',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/structattr',
+    url: 'api/stIvtStructattr',
     method: 'put',
     data
   })
@@ -26,10 +26,18 @@ export function edit(data) {
 
 export function changeActive(data) {
   return request({
-    url: 'api/structattr/changeActive',
+    url: 'api/stIvtStructattr/stIvtStructattr',
     method: 'put',
     data
   })
 }
 
-export default { add, edit, del, changeActive }
+export function getSectCascader(data) {
+  return request({
+    url: '/api/stIvtStructattr/getSectCascader',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, changeActive, getSectCascader }

mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue

@@ -26,6 +26,25 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          size="mini"
+          placeholder="业务类型"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_IN_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="仓库" prop="stor_id">
         <label slot="label">仓库</label>
         <el-select
@@ -43,22 +62,28 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
+      <el-form-item label="车间" prop="workshop_id">
+        <label slot="label">车间</label>
         <el-select
-          v-model="form.bill_type"
+          v-model="form.workshop_id"
           clearable
           size="mini"
-          placeholder="业务类型3"
+          placeholder="全部"
           class="filter-item"
+          @change="crud.toQuery"
         >
           <el-option
-            v-for="item in dict.ST_INV_IN_TYPE"
+            v-for="item in dict.product_area"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="仓位" prop="struct_id">
+        <label slot="label">仓位:</label>
+        <el-input v-model="form.struct_id" size="mini" disabled style="width: 210px" />
+      </el-form-item>
       <el-form-item label="单据状态" prop="bill_status">
         <el-select
           v-model="form.bill_status"
@@ -91,9 +116,6 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -214,6 +236,8 @@ const defaultForm = {
   detail_count: '0',
   bill_type: '',
   remark: '',
+  workshop_id: '',
+  stor_id: '',
   biz_date: new Date(),
   create_mode: '',
   tableData: []

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

@@ -12,44 +12,33 @@
   >
     <el-row v-show="crud.status.cu > 0" :gutter="20">
       <el-col :span="20" style="border: 1px solid white">
-        <span />
+        <span/>
       </el-col>
       <el-col :span="4">
         <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary"
+                     @click="crud.submitCU">保存</el-button>
           <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
         </span>
       </el-col>
     </el-row>
 
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
       </el-form-item>
-      <el-form-item label="仓库" prop="product_code">
+      <el-form-item label="业务日期" prop="biz_date">
-        <label slot="label">生产车间:</label>
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
-        <el-select
+                        value-format="yyyy-MM-dd" :disabled="crud.status.view > 0"/>
-          v-model="form.product_code"
-          clearable
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-        >
-          <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
       </el-form-item>
-      <el-form-item label="业务类型">
+      <el-form-item label="业务类型" prop="bill_type">
         <el-select
           v-model="form.bill_type"
           clearable
           size="mini"
-          placeholder="业务类型3"
+          placeholder="业务类型"
           class="filter-item"
         >
           <el-option
@@ -60,6 +49,52 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓库</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          class="filter-item"
+          @change="storChange"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车间" prop="workshop_id">
+        <label slot="label">车间</label>
+        <el-select
+          v-model="form.workshop_id"
+          clearable
+          size="mini"
+          placeholder="全部"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓位" prop="struct_id">
+        <label slot="label">仓位:</label>
+        <el-cascader
+          v-model="form.struct_id"
+          placeholder="请选择"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-form-item>
       <el-form-item label="单据状态" prop="bill_status">
         <el-select
           v-model="form.bill_status"
@@ -79,7 +114,7 @@
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -92,12 +127,10 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"
+                  :disabled="crud.status.view > 0"/>
       </el-form-item>
     </el-form>
 
@@ -105,7 +138,7 @@
     <div class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
-        <slot name="left" />
+        <slot name="left"/>
         <el-button
           slot="left"
           class="filter-item"
@@ -127,23 +160,11 @@
       border
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center"/>
 
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
-      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="入库重量">
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].pcsn"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
         <template slot-scope="scope">
           <el-input-number
             v-model="form.tableData[scope.$index].plan_qty"
@@ -156,6 +177,21 @@
           />
         </template>
       </el-table-column>
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位"/>
+      <el-table-column show-overflow-tooltip prop="remark" label="明细备注">
+        <template slot-scope="scope">
+          <el-input
+            v-model="form.tableData[scope.$index].remark"
+            size="small"
+            :controls="false"
+            controls-position="right"
+            @change="changeQty"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型"/>
+      <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号"/>
+      <el-table-column show-overflow-tooltip prop="supp_name" label="供应商"/>
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
           <el-button
@@ -180,9 +216,11 @@
 </template>
 
 <script>
-import CRUD, { crud, form } from '@crud/crud'
+import CRUD, {crud, form} from '@crud/crud'
-import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
+import crudStorattr from "@/api/wms/basedata/st/storattr";
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import crudStructattr from "@/api/wms/basedata/st/structattr";
 
 const defaultForm = {
   bill_code: '',
@@ -190,6 +228,8 @@ const defaultForm = {
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
+  stor_id: '',
+  struct_id: '',
   bill_type: '',
   remark: '',
   biz_date: new Date(),
@@ -199,7 +239,7 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { MaterDtl },
+  components: {MaterDtl},
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
   props: {
@@ -216,19 +256,22 @@ export default {
       dialogVisible: false,
       materShow: false,
       dtlShow: false,
+      struct_id: '',
+      sect_id: '',
       opendtlParam: null,
       materType: '03', // 关键成品
       storlist: [],
+      sects: [],
       billtypelist: [],
       rules: {
         product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+          {required: true, message: '生产车间不能为空', trigger: 'blur'}
         ],
         bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+          {required: true, message: '业务类型不能为空', trigger: 'blur'}
         ],
         biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+          {required: true, message: '业务日期不能为空', trigger: 'blur'}
         ]
       }
     }
@@ -242,8 +285,8 @@ export default {
   },
   methods: {
     open() {
-      crudProductIn.queryStor().then(res => {
+      crudStorattr.queryStor({"stor_type": "3"}).then(res => {
-        this.storlist = res
+        this.storlist = res.content
       })
     },
     close() {
@@ -251,7 +294,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -260,8 +303,16 @@ export default {
         }
       })
     },
+    [CRUD.HOOK.beforeToEdit]() {
+      this.struct_id = this.crud.form.struct_id
+      this.sect_id = this.crud.form.sect_id
+      crudStructattr.getSectCascader({'stor_id': this.crud.form.stor_id}).then(res => {
+        this.sects = res.content
+        this.form.struct_id = this.search(this.sects, this.struct_id)
+      })
+    },
     [CRUD.HOOK.afterToView]() {
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -278,13 +329,60 @@ export default {
         return false
       }
 
+      if (!this.form.stor_id) {
+        this.crud.notify('仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+
+      if (!this.struct_id) {
+        this.crud.notify('仓位不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+
       for (let i = 0; i < this.form.tableData.length; i++) {
         const row = this.form.tableData[i]
-        if (!row.pcsn || !row.plan_qty) {
+        if (!row.plan_qty) {
-          this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }
+
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        const row = this.form.tableData[i]
+        row.sect_id = this.sect_id
+        row.struct_id = this.struct_id
+      }
+    },
+    storChange(value) {
+      crudStructattr.getSectCascader({'stor_id': value}).then(res => {
+        this.sects = res.content
+      })
+    },
+    search(object, value) {
+      debugger
+      for (var key in object) {
+        if (object[key].value == value) return [object[key].value];
+        if (object[key].children && Object.keys(object[key].children).length > 0) {
+          var temp = search(object[key].children, value);
+          if (temp) return [object[key].value, temp].flat();
+        }
+      }
+    },
+    sectQueryChange(val) {
+      debugger
+      this.sectProp = val
+      if (val.length === 1) {
+        this.sect_id = val[0]
+        this.struct_id = ''
+      }
+      if (val.length === 0) {
+        this.sect_id = ''
+        this.struct_id = ''
+      }
+      if (val.length === 2) {
+        this.sect_id = val[0]
+        this.struct_id = val[1]
+      }
     },
     deleteRow(index, rows) {
       const material_code = rows[index].material_code
@@ -304,6 +402,7 @@ export default {
     tableChanged(rows) {
       // 对新增的行进行校验不能存在相同物料批次
       rows.forEach((item) => {
+        debugger
         let same_mater = true
         this.form.tableData.forEach((row) => {
           if (row.material_code === item.material_code) {
@@ -315,6 +414,8 @@ export default {
           item.ivt_level = '01'
           item.is_active = '1'
           item.plan_qty = '1'
+          item.qty_unit_id = item.base_unit_id
+          item.qty_unit_name = item.base_unit_name
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           this.form.tableData.splice(-1, 0, item)
         }

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue

@@ -201,14 +201,13 @@
 
 <script>
 import CRUD, { crud } from '@crud/crud'
-import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 import crudPoint from '@/api/wms/sch/point'
 import crudRegion from '@/api/wms/sch/region'
 
 export default {
   name: 'DivDialog',
-  components: { StructDiv },
+  components: {},
   mixins: [crud()],
   dicts: ['IO_BILL_STATUS', 'MD_OVERSTRUCT_TYPE'],
   props: {

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue

@@ -9,10 +9,11 @@
     @close="close"
     @open="open"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
       </el-form-item>
       <el-form-item label="生产车间">
         <el-select
@@ -70,7 +71,7 @@
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -84,11 +85,12 @@
         />
       </el-form-item>
       <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
+                        value-format="yyyy-MM-dd" :disabled="true"/>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true"/>
       </el-form-item>
     </el-form>
     <div class="crud-opts2">
@@ -107,41 +109,13 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDtlCurrentChange"
       >
-        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="55" align="center"/>
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center"/>
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center"/>
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="订单号" width="150" align="center"/>
-        <el-table-column prop="pcsn" label="订单号" width="150" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center"/>
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="qty_unit_name" label="单位" align="center"/>
-        <el-table-column prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center"/>
-        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
-      </el-table>
-    </el-card>
-    <div class="crud-opts2">
-      <span class="role-span">作业明细</span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="tabledis"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDisCurrentChange"
-      >
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" align="center" width="150" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="point_code1" label="起始位置" align="center" />
-        <el-table-column prop="point_code2" label="目的位置" align="center" />
-        <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
       </el-table>
     </el-card>
   </el-dialog>
@@ -149,12 +123,12 @@
 
 <script>
 
-import { crud } from '@crud/crud'
+import {crud} from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 
 export default {
   name: 'ViewDialog',
-  components: { },
+  components: {},
   mixins: [crud()],
   dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
   props: {
@@ -235,13 +209,13 @@ export default {
       this.currentDis = current
     },
     queryTableDtl() {
-      crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        crudProductIn.getDisTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []
@@ -262,13 +236,14 @@ export default {
 
 .crud-opts2 .el-dialog__title2 {
   line-height: 24px;
-  font-size:20px;
+  font-size: 20px;
-  color:#303133;
+  color: #303133;
 }
 
 .crud-opts2 .role-span2 {
   padding: 0px 0px 20px 0px;
 }
+
 .crud-opts2 {
   padding: 10px 0px 0px 50px;
 }

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

@@ -23,10 +23,10 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
+                v-for="item in storlist"
-                :key="item.value"
+                :key="item.stor_id"
-                :label="item.label"
+                :label="item.stor_name"
-                :value="item.value"
+                :value="item.stor_id"
               />
             </el-select>
           </el-form-item>
@@ -52,7 +52,7 @@
 
           <el-form-item label="生成方式">
             <el-select
-              v-model="query.bill_type"
+              v-model="query.create_mode"
               clearable
               filterable
               size="mini"
@@ -61,7 +61,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.ST_INV_CREATE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -127,7 +127,7 @@
             </el-select>
           </el-form-item>
 
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -157,31 +157,32 @@
         @select="handleSelectionChange"
         @select-all="onSelectAll"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="55"/>
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态"/>
         <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
+        <el-table-column prop="stor_name" label="生产车间" width="130" show-overflow-tooltip/>
-        <el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
+        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型"
-        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
+                         :formatter="bill_typeFormat"/>
-        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期"/>
-        <el-table-column label="明细数" align="center" prop="detail_count" />
+        <el-table-column label="明细数量" align="center" prop="detail_count"/>
         <el-table-column label="总重量" align="center" prop="total_qty">
           <template slot-scope="scope">
             {{ fun(scope.row.total_qty) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="备注" align="center" prop="remark"/>
-        <el-table-column label="制单人" align="center" prop="create_name" />
+        <el-table-column label="制单人" align="center" prop="create_name"/>
-        <el-table-column label="制单时间" align="center" prop="create_time" width="150" />
+        <el-table-column label="制单时间" align="center" prop="create_time" width="150"/>
-        <el-table-column label="修改人" align="center" prop="update_name" />
+        <el-table-column label="修改人" align="center" prop="update_name"/>
-        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
+        <el-table-column label="修改时间" align="center" prop="update_time" width="150"/>
-        <el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
+        <el-table-column label="分配人" align="center" prop="dis_name" width="140px"/>
-        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
+        <el-table-column label="分配时间" align="center" prop="dis_time" width="150"/>
-        <el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
+        <el-table-column label="确认人" align="center" prop="confirm_name" width="150"/>
-        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
+        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -194,18 +195,18 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
-    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable"/>
-    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable"/>
   </div>
 </template>
 
 <script>
-import productIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import rawProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import CRUD, { crud, header, presenter } from '@crud/crud'
+import CRUD, {crud, header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -214,23 +215,25 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
+import crudStorattr from "@/api/wms/basedata/st/storattr";
 
 export default {
   name: 'RawProductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  components: {ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog},
   cruds() {
     return CRUD({
       title: '',
-      optShow: { add: true, reset: true },
+      optShow: {add: true, reset: true},
       idField: 'iostorinv_id',
-      url: '/api/in/productIn',
+      url: '/api/stIvtIostorinvYl',
-      crudMethod: { ...productIn }
+      sort: ['bill_code,desc'],
+      crudMethod: {...rawProductIn}
     })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -252,15 +255,15 @@ export default {
       'user'
     ])
   },
-  mounted: function() {
+  mounted: function () {
     const that = this
     window.onresize = function temp() {
       that.height = document.documentElement.clientHeight - 180 + 'px;'
     }
   },
   created() {
-    crudProductIn.queryStor().then(res => {
+    crudStorattr.queryStor({"stor_type": "3"}).then(res => {
-      this.storlist = res
+      this.storlist = res.content
     })
   },
   methods: {
@@ -328,7 +331,7 @@ export default {
       return this.dict.label.IO_BILL_STATUS[row.bill_status]
     },
     divOpen() {
-      crudProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
+      crudProductIn.getIODtl({'bill_code': this.currentRow.bill_code, 'open_flag': '1'}).then(res => {
         this.openParam = res
         debugger
         this.storId = this.currentRow.product_code

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: '/api/in/productIn',
+    url: '/api/stIvtIostorinvYl',
     method: 'post',
     data
   })
@@ -10,23 +10,23 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: '/api/in/productIn',
+    url: '/api/stIvtIostorinvYl/delete',
-    method: 'delete',
+    method: 'post',
     data: ids
   })
 }
 
 export function edit(data) {
   return request({
-    url: '/api/in/productIn',
+    url: '/api/stIvtIostorinvYl/update',
-    method: 'put',
+    method: 'post',
     data
   })
 }
 
 export function getType(params) {
   return request({
-    url: '/api/in/productIn/getType',
+    url: '/api/stIvtIostorinvYl/getType',
     method: 'get',
     params
   })
@@ -34,7 +34,7 @@ export function getType(params) {
 
 export function getIODtl(data) {
   return request({
-    url: '/api/in/productIn/getIODtl',
+    url: '/api/stIvtIostorinvYl/getIODtl',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function getIODtl(data) {
 
 export function insertDtl(data) {
   return request({
-    url: '/api/in/productIn/insertDtl',
+    url: '/api/stIvtIostorinvYl/insertDtl',
     method: 'post',
     data
   })
@@ -50,7 +50,7 @@ export function insertDtl(data) {
 
 export function commit(data) {
   return request({
-    url: '/api/in/productIn/commit',
+    url: '/api/stIvtIostorinvYl/commit',
     method: 'post',
     data
   })
@@ -58,7 +58,7 @@ export function commit(data) {
 
 export function checkVehicle(data) {
   return request({
-    url: '/api/in/productIn/checkVehicle',
+    url: '/api/stIvtIostorinvYl/checkVehicle',
     method: 'post',
     data
   })
@@ -66,7 +66,7 @@ export function checkVehicle(data) {
 
 export function confirmvehicle(data) {
   return request({
-    url: '/api/in/productIn/confirmvehicle',
+    url: '/api/stIvtIostorinvYl/confirmvehicle',
     method: 'post',
     data
   })
@@ -74,7 +74,7 @@ export function confirmvehicle(data) {
 
 export function getDisDtl(data) {
   return request({
-    url: '/api/in/productIn/getDisDtl',
+    url: '/api/stIvtIostorinvYl/getDisDtl',
     method: 'post',
     data
   })
@@ -82,7 +82,7 @@ export function getDisDtl(data) {
 
 export function divStruct(data) {
   return request({
-    url: '/api/in/productIn/divStruct',
+    url: '/api/stIvtIostorinvYl/divStruct',
     method: 'post',
     data
   })
@@ -90,7 +90,7 @@ export function divStruct(data) {
 
 export function unDivStruct(data) {
   return request({
-    url: '/api/in/productIn/unDivStruct',
+    url: '/api/stIvtIostorinvYl/unDivStruct',
     method: 'post',
     data
   })
@@ -98,7 +98,7 @@ export function unDivStruct(data) {
 
 export function divPoint(data) {
   return request({
-    url: '/api/in/productIn/divPoint',
+    url: '/api/stIvtIostorinvYl/divPoint',
     method: 'post',
     data
   })
@@ -106,7 +106,7 @@ export function divPoint(data) {
 
 export function bucketDtl(data) {
   return request({
-    url: '/api/in/productIn/bucketDtl',
+    url: '/api/stIvtIostorinvYl/bucketDtl',
     method: 'post',
     data
   })
@@ -114,7 +114,7 @@ export function bucketDtl(data) {
 
 export function updateTask(data) {
   return request({
-    url: '/api/in/productIn/updateTask',
+    url: '/api/stIvtIostorinvYl/updateTask',
     method: 'post',
     data
   })
@@ -122,7 +122,7 @@ export function updateTask(data) {
 
 export function confirmTask(data) {
   return request({
-    url: '/api/in/productIn/confirmTask',
+    url: '/api/stIvtIostorinvYl/confirmTask',
     method: 'post',
     data
   })
@@ -130,7 +130,7 @@ export function confirmTask(data) {
 
 export function confirm(data) {
   return request({
-    url: '/api/in/productIn/confirm',
+    url: '/api/stIvtIostorinvYl/confirm',
     method: 'post',
     data
   })
@@ -138,7 +138,7 @@ export function confirm(data) {
 
 export function delDis(data) {
   return request({
-    url: '/api/in/productIn/delDis',
+    url: '/api/stIvtIostorinvYl/delDis',
     method: 'post',
     data
   })
@@ -146,7 +146,7 @@ export function delDis(data) {
 
 export function queryBoxMater(data) {
   return request({
-    url: '/api/in/productIn/queryBoxMater',
+    url: '/api/stIvtIostorinvYl/queryBoxMater',
     method: 'post',
     data
   })
@@ -154,14 +154,14 @@ export function queryBoxMater(data) {
 
 export function queryStor() {
   return request({
-    url: '/api/in/productIn/queryStor',
+    url: '/api/stIvtIostorinvYl/queryStor',
     method: 'post'
   })
 }
 
 export function getDisTask(data) {
   return request({
-    url: '/api/in/productIn/getDisTask',
+    url: '/api/stIvtIostorinvYl/getDisTask',
     method: 'post',
     data
   })