#erp.生产收料通知单页面查询完成

zjj

2025-09-09 2330cde874d1c4ca6763fd9fc1590fc313751df3

#erp.生产收料通知单页面查询完成

 src/main/java/com/zy/asrs/controller/DepartmentController.java

New file
@@ -0,0 +1,125 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.Department;
import com.zy.asrs.service.DepartmentService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class DepartmentController extends BaseController {

    @Autowired
    private DepartmentService departmentService;

    @RequestMapping(value = "/department/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(departmentService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/department/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Department> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(Department.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(departmentService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/department/add/auth")
    @ManagerAuth
    public R add(Department department) {
        departmentService.insert(department);
        return R.ok();
    }

    @RequestMapping(value = "/department/update/auth")
    @ManagerAuth
    public R update(Department department){
        if (Cools.isEmpty(department) || null==department.getFItemID()){
            return R.error();
        }
        departmentService.updateById(department);
        return R.ok();
    }

    @RequestMapping(value = "/department/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            departmentService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/department/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<Department> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("department"));
        convert(map, wrapper);
        List<Department> list = departmentService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/departmentQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Department> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<Department> page = departmentService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Department department : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", department.getFItemID());
            map.put("value", department.getFItemID());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/department/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Department> wrapper = new EntityWrapper<Department>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != departmentService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(Department.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

 src/main/java/com/zy/asrs/controller/ICMOController.java

@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.Department;
import com.zy.asrs.entity.ICMO;
import com.zy.asrs.service.DepartmentService;
import com.zy.asrs.service.ICMOService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -20,12 +22,16 @@
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@RestController
public class ICMOController extends BaseController {

    @Autowired
    private ICMOService iCMOService;

    @Autowired
    private DepartmentService departmentService;

    @RequestMapping(value = "/iCMO/{id}/auth")
    @ManagerAuth
@@ -44,11 +50,22 @@
        if (!Cools.isEmpty(param.get("FPlanCommitDate"))){
            param.put("FPlanCommitDate", ERPDateUtils.getERPFiltterDate(param.get("FPlanCommitDate").toString()));
        }
        String fWorkShop = null;
        if (!Cools.isEmpty(param.get("FWorkShop"))){
            fWorkShop = param.get("FWorkShop").toString();
            param.remove("FWorkShop");
        }
        EntityWrapper<ICMO> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(ICMO.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.eq("FStatus",1);
        if (!Cools.isEmpty(fWorkShop)){
            List<Department> departments = departmentService.selectList(new EntityWrapper<Department>().eq("FParentID", fWorkShop));
            List<Integer> ids = departments.stream().map(Department::getFItemID).collect(Collectors.toList());
            wrapper.in("FWorkShop",ids);
        }
        return R.ok(iCMOService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/entity/Department.java

New file
@@ -0,0 +1,41 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("t_Department")
public class Department implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "")
    @TableId(value = "FItemID", type = IdType.INPUT)
    private Integer FItemID;

    @ApiModelProperty(value= "")
    @TableField("FNumber")
    private String FNumber;

    @ApiModelProperty(value= "")
    @TableField("FName")
    private String FName;

    @ApiModelProperty(value= "")
    @TableField("FParentID")
    private Integer FParentID;



    public Department() {}




}

 src/main/java/com/zy/asrs/entity/ICMO.java

@@ -8,6 +8,7 @@

import com.core.common.SpringUtils;

import com.zy.asrs.service.DepartmentService;
import com.zy.asrs.service.ICItemCoreService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -588,6 +589,14 @@
        return icItemCoreService.selectOne(new EntityWrapper<ICItemCore>().eq("FItemID", this.FItemID));

    }
    public Department getDepartment(){
        if (Cools.isEmpty(this.FWorkShop)){
            return null;
        }
        DepartmentService departmentService = SpringUtils.getBean(DepartmentService.class);
        return departmentService.selectOne(new EntityWrapper<Department>().eq("FItemID", this.FWorkShop));

    }

    public String getFPlanCommitDate$(){
        if (Cools.isEmpty(this.FPlanCommitDate)){

 src/main/java/com/zy/asrs/mapper/DepartmentMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.Department;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface DepartmentMapper extends BaseMapper<Department> {

}

 src/main/java/com/zy/asrs/service/DepartmentService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.Department;
import com.baomidou.mybatisplus.service.IService;

public interface DepartmentService extends IService<Department> {

}

 src/main/java/com/zy/asrs/service/impl/DepartmentServiceImpl.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.zy.asrs.mapper.DepartmentMapper;
import com.zy.asrs.entity.Department;
import com.zy.asrs.service.DepartmentService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("departmentService")
@DS("slave_1")
public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {

}

 src/main/java/com/zy/common/CodeBuilder.java

@@ -20,7 +20,7 @@
        generator.url="127.0.0.1:1433;databasename=AIS20201127144525";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="t_ICItemBase";
        generator.table="t_Department";
        generator.packagePath="com.zy.asrs";
        generator.html=false;
        generator.htmlDetail=false;

 src/main/resources/mapper/DepartmentMapper.xml

New file
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.DepartmentMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Department">
        <result column="FItemID" property="FItemID" />
        <result column="FBrNO" property="FBrNO" />
        <result column="FManager" property="FManager" />
        <result column="FPhone" property="FPhone" />
        <result column="FFax" property="FFax" />
        <result column="FNote" property="FNote" />
        <result column="FNumber" property="FNumber" />
        <result column="FName" property="FName" />
        <result column="FParentID" property="FParentID" />
        <result column="FDProperty" property="FDProperty" />
        <result column="FDStock" property="FDStock" />
        <result column="FDeleted" property="FDeleted" />
        <result column="FShortNumber" property="FShortNumber" />
        <result column="FAcctID" property="FAcctID" />
        <result column="FCostAccountType" property="FCostAccountType" />
        <result column="FCalID" property="FCalID" />
        <result column="FPlanArea" property="FPlanArea" />
        <result column="FOtherARAcctID" property="FOtherARAcctID" />
        <result column="FOtherAPAcctID" property="FOtherAPAcctID" />
        <result column="FPreARAcctID" property="FPreARAcctID" />
        <result column="FPreAPAcctID" property="FPreAPAcctID" />
        <result column="FIsCreditMgr" property="FIsCreditMgr" />
        <result column="FHelpcode" property="FHelpcode" />

    </resultMap>

</mapper>

 src/main/webapp/views/erpReceiving/erpReceiving.html

@@ -24,10 +24,17 @@
                />
            </el-form-item>
            <el-form-item label="生产单号">
                <el-input v-model="tableSearchParam.produce_no" placeholder="请输入生产单号"></el-input>
                <el-input v-model="tableSearchParam.FSourceBillNo" placeholder="请输入生产单号"></el-input>
            </el-form-item>
            <el-form-item label="车间">
                <el-input v-model="tableSearchParam.produce_no" placeholder="请输入生产单号"></el-input>
                <el-select v-model="tableSearchParam.FWorkShop" placeholder="选择车间" style="width: 240px" >
                    <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value"
                    />
                </el-select>
            </el-form-item>
            <el-form-item label="">
                <el-button type="primary" @click="page" circle >
@@ -49,7 +56,7 @@
               <el-button type="primary">撤销退料</el-button>
            </el-form-item>
        </el-form>
        <el-table :data="tableData" border style="width: 100%" row-key="id" @selection-change="handleSelectionChange">
        <el-table :data="tableData" border style="width: 100%" row-key="finterID" @selection-change="handleSelectionChange">
            <el-table-column type="selection" >
            </el-table-column>
            <el-table-column type="index" width="50" >
@@ -60,21 +67,21 @@
            </el-table-column>
            <el-table-column prop="icitemCore.fnumber" label="物料编码">
            </el-table-column>
            <el-table-column prop="icitemCore.fname" label="物料名称">
            <el-table-column prop="icitemCore.fname" label="物料名称" width="300" show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="icitemCore.fmodel" label="规格">
            <el-table-column prop="icitemCore.fmodel" label="规格" width="200" show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="fworkShop" label="车间">
            <el-table-column prop="department.fname" label="车间">
            </el-table-column>
            <el-table-column prop="fauxQty" label="数量">
            <el-table-column prop="fauxQty" label="数量" width="90">
            </el-table-column>
            <el-table-column prop="fplanCommitDate$" label="计划开工时间">
            </el-table-column>
            <el-table-column prop="fplanFinishDate$" label="计划完工时间">
            </el-table-column>
            <el-table-column prop="fsourceBillNo" label="是否同步">
            <el-table-column prop="izSyncReceive" label="是否同步" width="90">
            </el-table-column>
            <el-table-column prop="fsourceBillNo" label="是否退料">
            <el-table-column prop="izSyncReceiveReturn" label="是否退料" width="90">
            </el-table-column>
        </el-table>
            <div style="margin-top: 10px">
@@ -107,11 +114,24 @@
                const pageSize = ref(15)
                const pageTotal = ref(0)
                const tableSearchParam = ref({
                    produce_no: null,
                    FPlanCommitDate: new Date()
                    FSourceBillNo: null,
                    FPlanCommitDate: new Date(),
                    FWorkShop:null
                })
                const tableData = ref([])
                const defaultTime = ref(new Date())

                const options = [
                    {
                        value: '16979',
                        label: '南区车间'
                    },
                    {
                        value: '16980',
                        label: '北区车间'
                    },

                ]
                
                function page(){
                    let data = JSON.parse(JSON.stringify(tableSearchParam.value))
@@ -172,6 +192,7 @@
                    pageTotal,
                    tableSearchParam,
                    defaultTime,
                    options,
                    page,
                    handleSizeChange,
                    handleCurrentChange,