生产订单和优化

src/main/java/com/jeesite/modules/mes/dao/MesMaterialBlDao.java

@@ -0,0 +1,15 @@
+package com.jeesite.modules.mes.dao;
+
+import com.jeesite.common.dao.CrudDao;
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.mes.entity.MesMaterialBl;
+
+/**
+ * 备料表DAO接口
+ * @author sxl
+ * @version 2026-06-27
+ */
+@MyBatisDao
+public interface MesMaterialBlDao extends CrudDao<MesMaterialBl> {
+	
+}

src/main/java/com/jeesite/modules/mes/entity/MesMaterialBl.java

@@ -0,0 +1,97 @@
+package com.jeesite.modules.mes.entity;
+
+import javax.validation.constraints.Size;
+
+import com.jeesite.common.entity.DataEntity;
+import com.jeesite.common.mybatis.annotation.Column;
+import com.jeesite.common.mybatis.annotation.Table;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
+
+/**
+ * 备料表Entity
+ * @author sxl
+ * @version 2026-06-27
+ */
+@Table(name="mes_material_bl", alias="a", label="备料表信息", columns={
+		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="order_id", attrName="orderId", label="订单编码"),
+		@Column(name="erp_sn", attrName="erpSn", label="erp编码"),
+		@Column(name="nums_qr", attrName="numsQr", label="确认数量"),
+		@Column(name="nums_yl", attrName="numsYl", label="已领数量"),
+		@Column(name="title", attrName="title", label="物料名称", queryType=QueryType.LIKE),
+		@Column(name="spec", attrName="spec", label="规格"),
+	}, orderBy="a.id DESC"
+)
+public class MesMaterialBl extends DataEntity<MesMaterialBl> {
+	
+	private static final long serialVersionUID = 1L;
+	private String orderId;		// 订单编码
+	private String erpSn;		// erp编码
+	private String numsQr;		// 确认数量
+	private String numsYl;		// 已领数量
+	private String title;		// 物料名称
+	private String spec;		// 规格
+
+	public MesMaterialBl() {
+		this(null);
+	}
+	
+	public MesMaterialBl(String id){
+		super(id);
+	}
+	
+	@Size(min=0, max=64, message="订单编码长度不能超过 64 个字符")
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+	
+	@Size(min=0, max=64, message="erp编码长度不能超过 64 个字符")
+	public String getErpSn() {
+		return erpSn;
+	}
+
+	public void setErpSn(String erpSn) {
+		this.erpSn = erpSn;
+	}
+	
+	@Size(min=0, max=64, message="确认数量长度不能超过 64 个字符")
+	public String getNumsQr() {
+		return numsQr;
+	}
+
+	public void setNumsQr(String numsQr) {
+		this.numsQr = numsQr;
+	}
+	
+	@Size(min=0, max=64, message="已领数量长度不能超过 64 个字符")
+	public String getNumsYl() {
+		return numsYl;
+	}
+
+	public void setNumsYl(String numsYl) {
+		this.numsYl = numsYl;
+	}
+	
+	@Size(min=0, max=255, message="物料名称长度不能超过 255 个字符")
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	@Size(min=0, max=64, message="规格长度不能超过 64 个字符")
+	public String getSpec() {
+		return spec;
+	}
+
+	public void setSpec(String spec) {
+		this.spec = spec;
+	}
+	
+}

src/main/java/com/jeesite/modules/mes/service/MesMaterialBlService.java

@@ -0,0 +1,84 @@
+package com.jeesite.modules.mes.service;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.service.CrudService;
+import com.jeesite.modules.mes.entity.MesMaterialBl;
+import com.jeesite.modules.mes.dao.MesMaterialBlDao;
+import com.jeesite.modules.file.utils.FileUploadUtils;
+
+/**
+ * 备料表Service
+ * @author sxl
+ * @version 2026-06-27
+ */
+@Service
+public class MesMaterialBlService extends CrudService<MesMaterialBlDao, MesMaterialBl> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesMaterialBl
+	 * @return
+	 */
+	@Override
+	public MesMaterialBl get(MesMaterialBl mesMaterialBl) {
+		return super.get(mesMaterialBl);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesMaterialBl 查询条件
+	 * @param mesMaterialBl.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesMaterialBl> findPage(MesMaterialBl mesMaterialBl) {
+		return super.findPage(mesMaterialBl);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesMaterialBl
+	 * @return
+	 */
+	@Override
+	public List<MesMaterialBl> findList(MesMaterialBl mesMaterialBl) {
+		return super.findList(mesMaterialBl);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesMaterialBl
+	 */
+	@Override
+	@Transactional
+	public void save(MesMaterialBl mesMaterialBl) {
+		super.save(mesMaterialBl);
+		// 保存上传图片
+		FileUploadUtils.saveFileUpload(mesMaterialBl, mesMaterialBl.getId(), "mesMaterialBl_image");
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesMaterialBl
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesMaterialBl mesMaterialBl) {
+		super.updateStatus(mesMaterialBl);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesMaterialBl
+	 */
+	@Override
+	@Transactional
+	public void delete(MesMaterialBl mesMaterialBl) {
+		super.delete(mesMaterialBl);
+	}
+	
+}

src/main/java/com/jeesite/modules/mes/web/MesMaterialBlController.java

@@ -0,0 +1,121 @@
+package com.jeesite.modules.mes.web;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesMaterialBl;
+import com.jeesite.modules.mes.service.MesMaterialBlService;
+
+/**
+ * 备料表Controller
+ * @author sxl
+ * @version 2026-06-27
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesMaterialBl")
+public class MesMaterialBlController extends BaseController {
+
+	@Autowired
+	private MesMaterialBlService mesMaterialBlService;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesMaterialBl get(String id, boolean isNewRecord) {
+		return mesMaterialBlService.get(id, isNewRecord);
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesMaterialBl mesMaterialBl, Model model) {
+		model.addAttribute("mesMaterialBl", mesMaterialBl);
+		return "modules/mes/mesMaterialBlList";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesMaterialBl> listData(MesMaterialBl mesMaterialBl, HttpServletRequest request, HttpServletResponse response) {
+		mesMaterialBl.setPage(new Page<>(request, response));
+		Page<MesMaterialBl> page = mesMaterialBlService.findPage(mesMaterialBl);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:view")
+	@RequestMapping(value = "form")
+	public String form(MesMaterialBl mesMaterialBl, Model model) {
+		model.addAttribute("mesMaterialBl", mesMaterialBl);
+		return "modules/mes/mesMaterialBlForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesMaterialBl mesMaterialBl) {
+		mesMaterialBlService.save(mesMaterialBl);
+		return renderResult(Global.TRUE, text("保存备料表成功！"));
+	}
+	
+	/**
+	 * 停用数据
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:edit")
+	@RequestMapping(value = "disable")
+	@ResponseBody
+	public String disable(MesMaterialBl mesMaterialBl) {
+		mesMaterialBl.setStatus(MesMaterialBl.STATUS_DISABLE);
+		mesMaterialBlService.updateStatus(mesMaterialBl);
+		return renderResult(Global.TRUE, text("停用备料表成功"));
+	}
+	
+	/**
+	 * 启用数据
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:edit")
+	@RequestMapping(value = "enable")
+	@ResponseBody
+	public String enable(MesMaterialBl mesMaterialBl) {
+		mesMaterialBl.setStatus(MesMaterialBl.STATUS_NORMAL);
+		mesMaterialBlService.updateStatus(mesMaterialBl);
+		return renderResult(Global.TRUE, text("启用备料表成功"));
+	}
+	
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("mes:mesMaterialBl:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesMaterialBl mesMaterialBl) {
+		mesMaterialBlService.delete(mesMaterialBl);
+		return renderResult(Global.TRUE, text("删除备料表成功！"));
+	}
+	
+}

src/main/resources/mappings/modules/mes/MesMaterialBlDao.xml

@@ -0,0 +1,15 @@
+<?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.jeesite.modules.mes.dao.MesMaterialBlDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesMaterialBl">
+		SELECT ${sqlMap.column.toSql()}
+		FROM ${sqlMap.table.toSql()}
+		<where>
+			${sqlMap.where.toSql()}
+		</where>
+		ORDER BY ${sqlMap.order.toSql()}
+	</select> -->
+	
+</mapper>

src/main/resources/views/modules/mes/mesMaterialBlForm.html

@@ -0,0 +1,112 @@
+<% layout('/layouts/default.html', {title: '备料表管理', libs: ['validate','fileupload']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header with-border">
+			<div class="box-title">
+				<i class="fa icon-note"></i> ${text(mesMaterialBl.isNewRecord ? '新增备料表' : '编辑备料表')}
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<#form:form id="inputForm" model="${mesMaterialBl}" action="${ctx}/mes/mesMaterialBl/save" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">${text('基本信息')}</div>
+				<#form:hidden path="id"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('订单编码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="orderId" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('erp编码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="erpSn" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('确认数量')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="numsQr" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('已领数量')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="numsYl" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('物料名称')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="title" maxlength="255" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('规格')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="spec" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2">
+								<span class="required hide">*</span> ${text('图片上传')}：</label>
+							<div class="col-sm-10">
+								<#form:fileupload id="uploadImage" bizKey="${mesMaterialBl.id}" bizType="mesMaterialBl_image"
+									uploadType="image" class="" readonly="false" preview="true"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+						<% if (hasPermi('mes:mesMaterialBl:edit')){ %>
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
+						<% } %>
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>
+					</div>
+				</div>
+			</div>
+		</#form:form>
+	</div>
+</div>
+<% } %>
+<script>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>

src/main/resources/views/modules/mes/mesMaterialBlList.html

@@ -0,0 +1,98 @@
+<% layout('/layouts/default.html', {title: '备料表管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-notebook"></i> ${text('备料表管理')}${isNotBlank(mesMaterialBl.orderId) ? ' | ' + mesMaterialBl.orderId : ''}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<% if(hasPermi('mes:mesMaterialBl:edit')){ %>
+					<a href="${ctx}/mes/mesMaterialBl/form" class="btn btn-default btnTool" title="${text('新增备料表')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<#form:form id="searchForm" model="${mesMaterialBl}" action="${ctx}/mes/mesMaterialBl/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('订单编码')}：</label>
+					<div class="control-inline">
+						<#form:input path="orderId" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('erp编码')}：</label>
+					<div class="control-inline">
+						<#form:input path="erpSn" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('确认数量')}：</label>
+					<div class="control-inline">
+						<#form:input path="numsQr" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('已领数量')}：</label>
+					<div class="control-inline">
+						<#form:input path="numsYl" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('物料名称')}：</label>
+					<div class="control-inline">
+						<#form:input path="title" maxlength="255" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('规格')}：</label>
+					<div class="control-inline">
+						<#form:input path="spec" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text("订单编码")}', name:'orderId', index:'a.order_id', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesMaterialBl/form?id='+row.id+'" class="btnList" data-title="${text("编辑备料表")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("erp编码")}', name:'erpSn', index:'a.erp_sn', width:150, align:"left"},
+		{header:'${text("确认数量")}', name:'numsQr', index:'a.nums_qr', width:150, align:"left"},
+		{header:'${text("已领数量")}', name:'numsYl', index:'a.nums_yl', width:150, align:"left"},
+		{header:'${text("物料名称")}', name:'title', index:'a.title', width:150, align:"left"},
+		{header:'${text("规格")}', name:'spec', index:'a.spec', width:150, align:"left"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('mes:mesMaterialBl:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesMaterialBl/form?id='+row.id+'" class="btnList" title="${text("编辑备料表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == Global.STATUS_NORMAL){
+					actions.push('<a href="${ctx}/mes/mesMaterialBl/disable?id='+row.id+'" class="btnList" title="${text("停用备料表")}" data-confirm="${text("确认要停用该备料表吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				} else if (row.status == Global.STATUS_DISABLE){
+					actions.push('<a href="${ctx}/mes/mesMaterialBl/enable?id='+row.id+'" class="btnList" title="${text("启用备料表")}" data-confirm="${text("确认要启用该备料表吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="${ctx}/mes/mesMaterialBl/delete?id='+row.id+'" class="btnList" title="${text("删除备料表")}" data-confirm="${text("确认要删除该备料表吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>