浏览代码

生产订单

zhanghe 5 月之前
父节点
当前提交
b5da1e8b76

+ 15 - 0
src/main/java/com/jeesite/modules/erp/dao/MesProductOrderDao.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.MesProductOrder;
+
+/**
+ * 生产订单DAO接口
+ * @author system
+ * @version 2026-05-08
+ */
+@MyBatisDao
+public interface MesProductOrderDao extends CrudDao<MesProductOrder> {
+	
+}

+ 94 - 0
src/main/java/com/jeesite/modules/erp/entity/MesProductOrder.java

@@ -0,0 +1,94 @@
+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 system
+ * @version 2026-05-08
+ */
+@Table(name="mes_product_order", alias="a", label="生产订单信息", columns={
+		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="sn", attrName="sn", label="订单编号"),
+		@Column(name="nums", attrName="nums", label="生产数量", isUpdateForce=true),
+		@Column(name="delivery_date", attrName="deliveryDate", label="交货日期", isUpdateForce=true),
+		@Column(name="remark", attrName="remark", label="备注"),
+		@Column(name="state", attrName="state", label="状态 0=草稿 1=下发 2=完成"),
+		@Column(name="create_by", attrName="createBy", label="创建者", isUpdate=false, isQuery=false),
+		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false),
+		@Column(name="update_by", attrName="updateBy", label="更新者", isQuery=false),
+		@Column(name="update_date", attrName="updateDate", label="更新时间", isQuery=false),
+		@Column(name="status", attrName="status", label="状态", isUpdate=false),
+	}, orderBy="a.update_date DESC"
+)
+public class MesProductOrder extends DataEntity<MesProductOrder> {
+	
+	private static final long serialVersionUID = 1L;
+	private String sn;		// 订单编号
+	private Integer nums;		// 生产数量
+	private Date deliveryDate;		// 交货日期
+	private String remark;		// 备注
+	private String state;		// 状态 0=草稿 1=下发 2=完成
+
+	public MesProductOrder() {
+		this(null);
+	}
+	
+	public MesProductOrder(String id){
+		super(id);
+	}
+	
+	@Size(min=0, max=64, message="订单编号长度不能超过 64 个字符")
+	public String getSn() {
+		return sn;
+	}
+
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+	
+	public Integer getNums() {
+		return nums;
+	}
+
+	public void setNums(Integer nums) {
+		this.nums = nums;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getDeliveryDate() {
+		return deliveryDate;
+	}
+
+	public void setDeliveryDate(Date deliveryDate) {
+		this.deliveryDate = deliveryDate;
+	}
+	
+	@Size(min=0, max=255, message="备注长度不能超过 255 个字符")
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+	@Size(min=0, max=1, message="状态 0=草稿 1=下发 2=完成长度不能超过 1 个字符")
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+	
+}

+ 81 - 0
src/main/java/com/jeesite/modules/erp/service/MesProductOrderService.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.MesProductOrder;
+import com.jeesite.modules.erp.dao.MesProductOrderDao;
+
+/**
+ * 生产订单Service
+ * @author system
+ * @version 2026-05-08
+ */
+@Service
+public class MesProductOrderService extends CrudService<MesProductOrderDao, MesProductOrder> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesProductOrder
+	 * @return
+	 */
+	@Override
+	public MesProductOrder get(MesProductOrder mesProductOrder) {
+		return super.get(mesProductOrder);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesProductOrder 查询条件
+	 * @param mesProductOrder.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesProductOrder> findPage(MesProductOrder mesProductOrder) {
+		return super.findPage(mesProductOrder);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesProductOrder
+	 * @return
+	 */
+	@Override
+	public List<MesProductOrder> findList(MesProductOrder mesProductOrder) {
+		return super.findList(mesProductOrder);
+	}
+	
+	/**
+	 * 保存数据(插入或更新)
+	 * @param mesProductOrder
+	 */
+	@Override
+	@Transactional
+	public void save(MesProductOrder mesProductOrder) {
+		super.save(mesProductOrder);
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesProductOrder
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesProductOrder mesProductOrder) {
+		super.updateStatus(mesProductOrder);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesProductOrder
+	 */
+	@Override
+	@Transactional
+	public void delete(MesProductOrder mesProductOrder) {
+		super.delete(mesProductOrder);
+	}
+	
+}

+ 97 - 0
src/main/java/com/jeesite/modules/erp/web/MesProductOrderController.java

@@ -0,0 +1,97 @@
+package com.jeesite.modules.erp.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.erp.entity.MesProductOrder;
+import com.jeesite.modules.erp.service.MesProductOrderService;
+
+/**
+ * 生产订单Controller
+ * @author system
+ * @version 2026-05-08
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/erp/mesProductOrder")
+public class MesProductOrderController extends BaseController {
+
+	@Autowired
+	private MesProductOrderService mesProductOrderService;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesProductOrder get(String id, boolean isNewRecord) {
+		return mesProductOrderService.get(id, isNewRecord);
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("erp:mesProductOrder:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesProductOrder mesProductOrder, Model model) {
+		model.addAttribute("mesProductOrder", mesProductOrder);
+		return "modules/erp/mesProductOrderList";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("erp:mesProductOrder:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesProductOrder> listData(MesProductOrder mesProductOrder, HttpServletRequest request, HttpServletResponse response) {
+		mesProductOrder.setPage(new Page<>(request, response));
+		Page<MesProductOrder> page = mesProductOrderService.findPage(mesProductOrder);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("erp:mesProductOrder:view")
+	@RequestMapping(value = "form")
+	public String form(MesProductOrder mesProductOrder, Model model) {
+		model.addAttribute("mesProductOrder", mesProductOrder);
+		return "modules/erp/mesProductOrderForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("erp:mesProductOrder:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesProductOrder mesProductOrder) {
+		mesProductOrderService.save(mesProductOrder);
+		return renderResult(Global.TRUE, text("保存生产订单成功!"));
+	}
+	
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("erp:mesProductOrder:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesProductOrder mesProductOrder) {
+		mesProductOrderService.delete(mesProductOrder);
+		return renderResult(Global.TRUE, text("删除生产订单成功!"));
+	}
+	
+}

+ 15 - 0
src/main/resources/mappings/modules/erp/MesProductOrderDao.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.MesProductOrderDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesProductOrder">
+		SELECT ${sqlMap.column.toSql()}
+		FROM ${sqlMap.table.toSql()}
+		<where>
+			${sqlMap.where.toSql()}
+		</where>
+		ORDER BY ${sqlMap.order.toSql()}
+	</select> -->
+	
+</mapper>

+ 92 - 0
src/main/resources/views/modules/erp/mesProductOrderForm.html

@@ -0,0 +1,92 @@
+<% 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(mesProductOrder.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="${mesProductOrder}" action="${ctx}/erp/mesProductOrder/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="sn" 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="nums" maxlength="8" class="form-control digits"/>
+							</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="deliveryDate" 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="remark" 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('状态 0=草稿 1=下发 2=完成')}:<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="state" maxlength="1" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+						<% if (hasPermi('erp:mesProductOrder: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>

+ 97 - 0
src/main/resources/views/modules/erp/mesProductOrderList.html

@@ -0,0 +1,97 @@
+<% 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:mesProductOrder:edit')){ %>
+					<a href="${ctx}/erp/mesProductOrder/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="${mesProductOrder}" action="${ctx}/erp/mesProductOrder/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="sn" 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="nums" maxlength="8" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('交货日期')}:</label>
+					<div class="control-inline">
+						<#form:input path="deliveryDate" 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="remark" 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="state" maxlength="1" class="form-control width-120"/>
+					</div>
+				</div>
+<!--				<div class="form-group">-->
+<!--					<label class="control-label">${text('状态')}:</label>-->
+<!--					<div class="control-inline width-120">-->
+<!--						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>-->
+<!--					</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:'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:'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:'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);
+		// }},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('erp:mesProductOrder:edit')){ %>
+				actions.push('<a href="${ctx}/erp/mesProductOrder/form?id='+row.id+'" class="btnList" title="${text("编辑生产订单")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/erp/mesProductOrder/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>