订单

src/main/java/com/jeesite/modules/erp/dao/MesMaterialOrderDao.java

@@ -0,0 +1,15 @@
+package com.jeesite.modules.erp.dao;
+
+import com.jeesite.common.dao.CrudDao;
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.erp.entity.MesMaterialOrder;
+
+/**
+ * 订单领料表DAO接口
+ * @author sxl
+ * @version 2026-05-09
+ */
+@MyBatisDao
+public interface MesMaterialOrderDao extends CrudDao<MesMaterialOrder> {
+	
+}

src/main/java/com/jeesite/modules/erp/entity/MesMaterialOrder.java

@@ -0,0 +1,81 @@
+package com.jeesite.modules.erp.entity;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+import com.jeesite.common.mybatis.annotation.JoinTable;
+import com.jeesite.common.mybatis.annotation.JoinTable.Type;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+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-05-09
+ */
+@Table(name="mes_material_order", alias="a", label="订单领料表信息", columns={
+		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="order_id", attrName="orderId", label="订单编号"),
+		@Column(name="requisition_no", attrName="requisitionNo", label="领料单号"),
+		@Column(name="update_by", attrName="updateBy", label="更新人", isQuery=false),
+		@Column(name="update_time", attrName="updateTime", label="更新时间", isUpdateForce=true),
+		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
+		@Column(name="create_time", attrName="createTime", label="创建时间", isUpdateForce=true),
+	}, orderBy="a.id DESC"
+)
+public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
+	
+	private static final long serialVersionUID = 1L;
+	private String orderId;		// 订单编号
+	private String requisitionNo;		// 领料单号
+	private Date updateTime;		// 更新时间
+	private Date createTime;		// 创建时间
+
+	public MesMaterialOrder() {
+		this(null);
+	}
+	
+	public MesMaterialOrder(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="领料单号长度不能超过 64 个字符")
+	public String getRequisitionNo() {
+		return requisitionNo;
+	}
+
+	public void setRequisitionNo(String requisitionNo) {
+		this.requisitionNo = requisitionNo;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	
+}

src/main/java/com/jeesite/modules/erp/service/MesMaterialOrderService.java

@@ -0,0 +1,81 @@
+package com.jeesite.modules.erp.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.erp.entity.MesMaterialOrder;
+import com.jeesite.modules.erp.dao.MesMaterialOrderDao;
+
+/**
+ * 订单领料表Service
+ * @author sxl
+ * @version 2026-05-09
+ */
+@Service
+public class MesMaterialOrderService extends CrudService<MesMaterialOrderDao, MesMaterialOrder> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesMaterialOrder
+	 * @return
+	 */
+	@Override
+	public MesMaterialOrder get(MesMaterialOrder mesMaterialOrder) {
+		return super.get(mesMaterialOrder);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesMaterialOrder 查询条件
+	 * @param mesMaterialOrder.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesMaterialOrder> findPage(MesMaterialOrder mesMaterialOrder) {
+		return super.findPage(mesMaterialOrder);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesMaterialOrder
+	 * @return
+	 */
+	@Override
+	public List<MesMaterialOrder> findList(MesMaterialOrder mesMaterialOrder) {
+		return super.findList(mesMaterialOrder);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesMaterialOrder
+	 */
+	@Override
+	@Transactional
+	public void save(MesMaterialOrder mesMaterialOrder) {
+		super.save(mesMaterialOrder);
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesMaterialOrder
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesMaterialOrder mesMaterialOrder) {
+		super.updateStatus(mesMaterialOrder);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesMaterialOrder
+	 */
+	@Override
+	@Transactional
+	public void delete(MesMaterialOrder mesMaterialOrder) {
+		super.delete(mesMaterialOrder);
+	}
+	
+}

src/main/java/com/jeesite/modules/erp/web/MesMaterialOrderController.java

@@ -0,0 +1,110 @@
+package com.jeesite.modules.erp.web;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jeesite.modules.erp.entity.MesMaterialErp;
+import com.jeesite.modules.erp.service.MesMaterialErpService;
+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.erp.entity.MesMaterialOrder;
+import com.jeesite.modules.erp.service.MesMaterialOrderService;
+
+/**
+ * 订单领料表Controller
+ * @author sxl
+ * @version 2026-05-09
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/erp/mesMaterialOrder")
+public class MesMaterialOrderController extends BaseController {
+
+	@Autowired
+	private MesMaterialOrderService mesMaterialOrderService;
+	@Autowired
+	private MesMaterialErpService mesMaterialErpService;
+
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesMaterialOrder get(String id, boolean isNewRecord) {
+		return mesMaterialOrderService.get(id, isNewRecord);
+	}
+
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("erp:mesMaterialOrder:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesMaterialOrder mesMaterialOrder, Model model) {
+		model.addAttribute("mesMaterialOrder", mesMaterialOrder);
+		return "modules/erp/mesMaterialOrderList";
+	}
+
+	//跳转到详情页面
+	@RequestMapping(value = {"list2", ""})
+	public String list2(MesMaterialOrder mesMaterialOrder, Model model) {
+		MesMaterialErp mesMaterialErp = new MesMaterialErp();
+		mesMaterialErp.setRequisitionNo(mesMaterialOrder.getRequisitionNo());
+		model.addAttribute("mesMaterialErp", mesMaterialErp);
+		return "modules/erp/mesMaterialErpList";
+	}
+
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("erp:mesMaterialOrder:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesMaterialOrder> listData(MesMaterialOrder mesMaterialOrder, HttpServletRequest request, HttpServletResponse response) {
+		mesMaterialOrder.setPage(new Page<>(request, response));
+		Page<MesMaterialOrder> page = mesMaterialOrderService.findPage(mesMaterialOrder);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("erp:mesMaterialOrder:view")
+	@RequestMapping(value = "form")
+	public String form(MesMaterialOrder mesMaterialOrder, Model model) {
+		model.addAttribute("mesMaterialOrder", mesMaterialOrder);
+		return "modules/erp/mesMaterialOrderForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("erp:mesMaterialOrder:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesMaterialOrder mesMaterialOrder) {
+		mesMaterialOrderService.save(mesMaterialOrder);
+		return renderResult(Global.TRUE, text("保存订单领料表成功！"));
+	}
+
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("erp:mesMaterialOrder:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesMaterialOrder mesMaterialOrder) {
+		mesMaterialOrderService.delete(mesMaterialOrder);
+		return renderResult(Global.TRUE, text("删除订单领料表成功！"));
+	}
+
+}

src/main/resources/mappings/modules/erp/MesMaterialOrderDao.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.erp.dao.MesMaterialOrderDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesMaterialOrder">
+		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/erp/mesMaterialErpList.html

@@ -62,13 +62,11 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'${text("物料单号")}', name:'materialCode', index:'a.material_code', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/erp/mesMaterialErp/form?id='+row.id+'" class="btnList" data-title="${text("编辑mes_material_erp")}">'+(val||row.id)+'</a>';
-		}},
-		{header:'${text("物料名称")}', name:'materialName', index:'a.material_name', width:150, align:"left"},
-		{header:'${text("物料数量")}', name:'materialNumber', index:'a.material_number', width:150, align:"left"},
-		{header:'${text("物料规格")}', name:'materiarSize', index:'a.materiar_size', width:150, align:"left"},
-		{header:'${text("生产领料单")}', name:'requisitionNo', index:'a.requisition_no', width:150, align:"left"},
+		{header:'${text("物料单号")}', name:'materialCode', index:'a.material_code', width:150, align:"center"},
+		{header:'${text("物料名称")}', name:'materialName', index:'a.material_name', width:150, align:"center"},
+		{header:'${text("物料数量")}', name:'materialNumber', index:'a.material_number', width:150, align:"center"},
+		{header:'${text("物料规格")}', name:'materiarSize', index:'a.materiar_size', width:150, align:"center"},
+		{header:'${text("生产领料单")}', name:'requisitionNo', index:'a.requisition_no', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('erp:mesMaterialErp:edit')){ %>

src/main/resources/views/modules/erp/mesMaterialOrderForm.html

@@ -0,0 +1,84 @@
+<% layout('/layouts/default.html', {title: '订单领料表管理', libs: ['validate']}){ %>
+<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(mesMaterialOrder.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="${mesMaterialOrder}" action="${ctx}/erp/mesMaterialOrder/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('领料单号')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="requisitionNo" 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="updateTime" readonly="true" maxlength="20" class="form-control laydate"
+									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+							</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="createTime" readonly="true" maxlength="20" class="form-control laydate"
+									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+						<% if (hasPermi('erp:mesMaterialOrder: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/erp/mesMaterialOrderList.html

@@ -0,0 +1,86 @@
+<% 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('订单领料表管理')}
+			</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('erp:mesMaterialOrder:edit')){ %>
+					<a href="${ctx}/erp/mesMaterialOrder/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="${mesMaterialOrder}" action="${ctx}/erp/mesMaterialOrder/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('领料单号')}：</label>
+					<div class="control-inline">
+						<#form:input path="requisitionNo" 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="updateTime" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('创建时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="createTime" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</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:"center"},
+		{header:'${text("领料单号")}', name:'requisitionNo', index:'a.requisition_no', width:150, align:"center", formatter: function(val, obj, row, act){
+				if (val) {
+					// 使用 class="btnList" 通常会结合底层框架自动弹窗或打开新Tab
+					// 【注意】请将 href 中的 URL 替换为你实际查询领料单详情的 Controller 路由
+					return '<a href="${ctx}/erp/mesMaterialOrder/list2?requisitionNo=' + val + '" class="btnList" data-title="${text("领料单详情")}">' + val + '</a>';
+				}
+				return '';
+			}},
+		{header:'${text("更新时间")}', name:'updateTime', index:'a.update_time', width:150, align:"center"},
+		{header:'${text("创建时间")}', name:'createTime', index:'a.create_time', width:150, align:"center"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('erp:mesMaterialOrder:edit')){ %>
+				actions.push('<a href="${ctx}/erp/mesMaterialOrder/form?id='+row.id+'" class="btnList" title="${text("编辑订单领料表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/erp/mesMaterialOrder/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>

src/main/resources/views/modules/erp/mesProductOrderList.html

@@ -69,13 +69,14 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'${text("订单编号")}', name:'sn', index:'a.sn', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/erp/mesProductOrder/form?id='+row.id+'" class="btnList" data-title="${text("编辑生产订单")}">'+(val||row.id)+'</a>';
-		}},
+		// {header:'${text("订单编号")}', name:'sn', index:'a.sn', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
+		// 	return '<a href="${ctx}/erp/mesProductOrder/form?id='+row.id+'" class="btnList" data-title="${text("编辑生产订单")}">'+(val||row.id)+'</a>';
+		// }},
+		{header:'${text("订单编号")}', name:'sn', index:'a.sn', width:150, align:"center"},
 		{header:'${text("生产数量")}', name:'nums', index:'a.nums', width:150, align:"center"},
 		{header:'${text("交货日期")}', name:'deliveryDate', index:'a.delivery_date', width:150, align:"center"},
-		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"left"},
-		{header:'${text("状态")}', name:'state', index:'a.state', width:150, align:"left"},
+		{header:'${text("备注")}', name:'remark', index:'a.remark', width:150, align:"center"},
+		{header:'${text("状态")}', name:'state', index:'a.state', width:150, align:"center"},
 		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		// {header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
 		// 	return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);