机加订单领料工件绑定和ccd导出优化

src/main/java/com/jeesite/modules/mes/dao/MesOrderJjllDao.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.MesOrderJjll;
+
+/**
+ * 机加订单领料工件绑定DAO接口
+ * @author sxl
+ * @version 2026-10-26
+ */
+@MyBatisDao
+public interface MesOrderJjllDao extends CrudDao<MesOrderJjll> {
+	
+}

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

@@ -0,0 +1,63 @@
+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;
+import com.jeesite.common.utils.excel.annotation.ExcelField;
+import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
+import com.jeesite.common.utils.excel.annotation.ExcelFields;
+
+/**
+ * 机加订单领料工件绑定Entity
+ * @author sxl
+ * @version 2026-10-26
+ */
+@Table(name="mes_order_jjll", alias="a", label="机加订单领料工件绑定信息", columns={
+		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="order_jj", attrName="orderJj", label="机加订单"),
+		@Column(name="sn", attrName="sn", label="工件码"),
+		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false, isUpdateForce=true),
+	}, orderBy="a.id DESC"
+)
+public class MesOrderJjll extends DataEntity<MesOrderJjll> {
+	
+	private static final long serialVersionUID = 1L;
+	private String orderJj;		// 机加订单
+	private String sn;		// 工件码
+
+	@ExcelFields({
+		@ExcelField(title="id", attrName="id", align=Align.CENTER, sort=10),
+		@ExcelField(title="机加订单", attrName="orderJj", align=Align.CENTER, sort=20),
+		@ExcelField(title="工件码", attrName="sn", align=Align.CENTER, sort=30),
+		@ExcelField(title="创建时间", attrName="createDate", align=Align.CENTER, sort=40),
+	})
+	public MesOrderJjll() {
+		this(null);
+	}
+	
+	public MesOrderJjll(String id){
+		super(id);
+	}
+	
+	@Size(min=0, max=64, message="机加订单长度不能超过 64 个字符")
+	public String getOrderJj() {
+		return orderJj;
+	}
+
+	public void setOrderJj(String orderJj) {
+		this.orderJj = orderJj;
+	}
+	
+	@Size(min=0, max=64, message="工件码长度不能超过 64 个字符")
+	public String getSn() {
+		return sn;
+	}
+
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+	
+}

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

@@ -0,0 +1,137 @@
+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.MesOrderJjll;
+import com.jeesite.modules.mes.dao.MesOrderJjllDao;
+import com.jeesite.common.service.ServiceException;
+import com.jeesite.common.config.Global;
+import com.jeesite.common.validator.ValidatorUtils;
+import com.jeesite.common.utils.excel.ExcelImport;
+import org.springframework.web.multipart.MultipartFile;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+
+/**
+ * 机加订单领料工件绑定Service
+ * @author sxl
+ * @version 2026-10-26
+ */
+@Service
+public class MesOrderJjllService extends CrudService<MesOrderJjllDao, MesOrderJjll> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesOrderJjll
+	 * @return
+	 */
+	@Override
+	public MesOrderJjll get(MesOrderJjll mesOrderJjll) {
+		return super.get(mesOrderJjll);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesOrderJjll 查询条件
+	 * @param mesOrderJjll.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesOrderJjll> findPage(MesOrderJjll mesOrderJjll) {
+		return super.findPage(mesOrderJjll);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesOrderJjll
+	 * @return
+	 */
+	@Override
+	public List<MesOrderJjll> findList(MesOrderJjll mesOrderJjll) {
+		return super.findList(mesOrderJjll);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesOrderJjll
+	 */
+	@Override
+	@Transactional
+	public void save(MesOrderJjll mesOrderJjll) {
+		super.save(mesOrderJjll);
+	}
+
+	/**
+	 * 导入数据
+	 * @param file 导入的数据文件
+	 */
+	@Transactional
+	public String importData(MultipartFile file) {
+		if (file == null){
+			throw new ServiceException(text("请选择导入的数据文件！"));
+		}
+		int successNum = 0; int failureNum = 0;
+		StringBuilder successMsg = new StringBuilder();
+		StringBuilder failureMsg = new StringBuilder();
+		try(ExcelImport ei = new ExcelImport(file, 2, 0)){
+			List<MesOrderJjll> list = ei.getDataList(MesOrderJjll.class);
+			for (MesOrderJjll mesOrderJjll : list) {
+				try{
+					ValidatorUtils.validateWithException(mesOrderJjll);
+					this.save(mesOrderJjll);
+					successNum++;
+					successMsg.append("<br/>" + successNum + "、编号 " + mesOrderJjll.getId() + " 导入成功");
+				} catch (Exception e) {
+					failureNum++;
+					String msg = "<br/>" + failureNum + "、编号 " + mesOrderJjll.getId() + " 导入失败：";
+					if (e instanceof ConstraintViolationException){
+						ConstraintViolationException cve = (ConstraintViolationException)e;
+						for (ConstraintViolation<?> violation : cve.getConstraintViolations()) {
+							msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")";
+						}
+					}else{
+						msg += e.getMessage();
+					}
+					failureMsg.append(msg);
+					logger.error(msg, e);
+				}
+			}
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			failureMsg.append(e.getMessage());
+			return failureMsg.toString();
+		}
+		if (failureNum > 0) {
+			failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+			throw new ServiceException(failureMsg.toString());
+		}else{
+			successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+		}
+		return successMsg.toString();
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesOrderJjll
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesOrderJjll mesOrderJjll) {
+		super.updateStatus(mesOrderJjll);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesOrderJjll
+	 */
+	@Override
+	@Transactional
+	public void delete(MesOrderJjll mesOrderJjll) {
+		super.delete(mesOrderJjll);
+	}
+	
+}

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

@@ -0,0 +1,272 @@
+package com.jeesite.modules.mes.web;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+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.collect.ListUtils;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.DateUtils;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.common.utils.excel.ExcelExport;
+import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
+import org.springframework.web.multipart.MultipartFile;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.erp.entity.MesProductOrder;
+import com.jeesite.modules.erp.service.MesProductOrderService;
+import com.jeesite.modules.mes.entity.MesMaterialBl;
+import com.jeesite.modules.mes.entity.MesOrderJjll;
+import com.jeesite.modules.mes.entity.MesProduct;
+import com.jeesite.modules.mes.service.MesMaterialBlService;
+import com.jeesite.modules.mes.service.MesOrderJjllService;
+import com.jeesite.modules.mes.service.MesProductService;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 机加订单领料工件绑定Controller
+ * @author sxl
+ * @version 2026-10-26
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesOrderJjll")
+public class MesOrderJjllController extends BaseController {
+
+	@Autowired
+	private MesOrderJjllService mesOrderJjllService;
+	@Autowired
+	private MesProductOrderService mesProductOrderService;
+	@Autowired
+	private MesMaterialBlService mesMaterialBlService;
+	@Autowired
+	private MesProductService mesProductService;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesOrderJjll get(String id, boolean isNewRecord) {
+		return mesOrderJjllService.get(id, isNewRecord);
+	}
+
+	/**
+	 * 机加订单领料显示列表：
+	 * mes_product_order 中 lineSn 以 B0106 开头；
+	 * 返回订单编号、备料表 erpSn 以 B0110 开头的确认数量合计、MesOrderJjll 绑定记录数。
+	 */
+	@RequestMapping(value = "orderDisplayList")
+	@ResponseBody
+	public String orderDisplayList() {
+		MesProductOrder orderQuery = new MesProductOrder();
+		orderQuery.getSqlMap().getWhere().and("a.line_sn", QueryType.RIGHT_LIKE, "B0106");
+		List<MesProductOrder> orders = mesProductOrderService.findList(orderQuery);
+		List<Map<String, Object>> data = new ArrayList<>();
+		if (orders != null) {
+			for (MesProductOrder order : orders) {
+				if (order == null || StringUtils.isBlank(order.getSn())) {
+					continue;
+				}
+				Map<String, Object> item = new HashMap<>();
+				item.put("orderId", order.getSn());
+				item.put("numsQr", sumBlNumsQrByOrderAndErpPrefix(order.getSn(), "B0110"));
+				MesOrderJjll jjllQuery = new MesOrderJjll();
+				jjllQuery.setOrderJj(order.getSn());
+				item.put("jjllCount", mesOrderJjllService.findCount(jjllQuery));
+				data.add(item);
+			}
+		}
+		return renderResult(Global.TRUE, text("查询成功！"), data);
+	}
+
+	/**
+	 * 机加订单领料绑定工件码（同一工件码只能绑定一次；已绑定数不能大于备料确认数量）
+	 * 参数：orderJj=机加订单号，sn=工件码
+	 */
+	@RequestMapping(value = "bandJjllSn")
+	@ResponseBody
+	public String bandJjllSn(String orderJj, String sn) {
+		if (StringUtils.isBlank(orderJj)) {
+			return renderResult(Global.FALSE, text("机加订单号不能为空！"));
+		}
+		if (StringUtils.isBlank(sn)) {
+			return renderResult(Global.FALSE, text("工件码不能为空！"));
+		}
+		orderJj = orderJj.trim();
+		sn = sn.trim();
+
+		MesProduct mesProductQuery = new MesProduct();
+		mesProductQuery.setSn(sn);
+		List<MesProduct> productList = mesProductService.findList(mesProductQuery);
+		if (productList == null || productList.isEmpty() || ObjectUtils.isEmpty(productList.get(0))) {
+			return renderResult(Global.FALSE, text("工件不存在！"));
+		}
+
+		MesOrderJjll existQuery = new MesOrderJjll();
+		existQuery.setSn(sn);
+		if (mesOrderJjllService.findCount(existQuery) > 0) {
+			return renderResult(Global.FALSE, text("该工件码已绑定机加订单，不允许重复绑定！"));
+		}
+
+		MesProductOrder orderQuery = new MesProductOrder();
+		orderQuery.setSn(orderJj);
+		List<MesProductOrder> orderList = mesProductOrderService.findList(orderQuery);
+		if (orderList == null || orderList.isEmpty() || ObjectUtils.isEmpty(orderList.get(0))) {
+			return renderResult(Global.FALSE, text("机加订单不存在！"));
+		}
+
+		BigDecimal numsQrTotal = sumBlNumsQrDecimal(orderJj, "B0110");
+		if (numsQrTotal.compareTo(BigDecimal.ZERO) <= 0) {
+			return renderResult(Global.FALSE, text("备料确认数量未配置！"));
+		}
+		MesOrderJjll boundQuery = new MesOrderJjll();
+		boundQuery.setOrderJj(orderJj);
+		long boundCount = mesOrderJjllService.findCount(boundQuery);
+		if (BigDecimal.valueOf(boundCount).compareTo(numsQrTotal) >= 0) {
+			return renderResult(Global.FALSE, text("该订单已绑定数量已达备料确认数量，不允许再绑定！"));
+		}
+
+		MesOrderJjll mesOrderJjll = new MesOrderJjll();
+		mesOrderJjll.setOrderJj(orderJj);
+		mesOrderJjll.setSn(sn);
+		mesOrderJjllService.save(mesOrderJjll);
+		return renderResult(Global.TRUE, text("绑定成功！"));
+	}
+
+	/** 按订单号汇总备料表中 erpSn 以前缀开头的确认数量 */
+	private String sumBlNumsQrByOrderAndErpPrefix(String orderId, String erpPrefix) {
+		return sumBlNumsQrDecimal(orderId, erpPrefix).stripTrailingZeros().toPlainString();
+	}
+
+	private BigDecimal sumBlNumsQrDecimal(String orderId, String erpPrefix) {
+		MesMaterialBl blQuery = new MesMaterialBl();
+		blQuery.setOrderId(orderId);
+		blQuery.getSqlMap().getWhere().and("a.erp_sn", QueryType.RIGHT_LIKE, erpPrefix);
+		List<MesMaterialBl> blList = mesMaterialBlService.findList(blQuery);
+		BigDecimal total = BigDecimal.ZERO;
+		if (blList != null) {
+			for (MesMaterialBl bl : blList) {
+				if (bl == null || StringUtils.isBlank(bl.getNumsQr())) {
+					continue;
+				}
+				try {
+					total = total.add(new BigDecimal(bl.getNumsQr().trim()));
+				} catch (Exception ignore) {
+					// 非数字确认数量忽略
+				}
+			}
+		}
+		return total;
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesOrderJjll mesOrderJjll, Model model) {
+		model.addAttribute("mesOrderJjll", mesOrderJjll);
+		return "modules/mes/mesOrderJjllList";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesOrderJjll> listData(MesOrderJjll mesOrderJjll, HttpServletRequest request, HttpServletResponse response) {
+		mesOrderJjll.setPage(new Page<>(request, response));
+		Page<MesOrderJjll> page = mesOrderJjllService.findPage(mesOrderJjll);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:view")
+	@RequestMapping(value = "form")
+	public String form(MesOrderJjll mesOrderJjll, Model model) {
+		model.addAttribute("mesOrderJjll", mesOrderJjll);
+		return "modules/mes/mesOrderJjllForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesOrderJjll mesOrderJjll) {
+		mesOrderJjllService.save(mesOrderJjll);
+		return renderResult(Global.TRUE, text("保存机加订单领料工件绑定成功！"));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:view")
+	@RequestMapping(value = "exportData")
+	public void exportData(MesOrderJjll mesOrderJjll, HttpServletResponse response) {
+		List<MesOrderJjll> list = mesOrderJjllService.findList(mesOrderJjll);
+		String fileName = "机加订单领料工件绑定" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+		try(ExcelExport ee = new ExcelExport("机加订单领料工件绑定", MesOrderJjll.class)){
+			ee.setDataList(list).write(response, fileName);
+		}
+	}
+
+	/**
+	 * 下载模板
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:view")
+	@RequestMapping(value = "importTemplate")
+	public void importTemplate(HttpServletResponse response) {
+		MesOrderJjll mesOrderJjll = new MesOrderJjll();
+		List<MesOrderJjll> list = ListUtils.newArrayList(mesOrderJjll);
+		String fileName = "机加订单领料工件绑定模板.xlsx";
+		try(ExcelExport ee = new ExcelExport("机加订单领料工件绑定", MesOrderJjll.class, Type.IMPORT)){
+			ee.setDataList(list).write(response, fileName);
+		}
+	}
+
+	/**
+	 * 导入数据
+	 */
+	@ResponseBody
+	@RequiresPermissions("mes:mesOrderJjll:edit")
+	@PostMapping(value = "importData")
+	public String importData(MultipartFile file) {
+		try {
+			String message = mesOrderJjllService.importData(file);
+			return renderResult(Global.TRUE, "posfull:"+message);
+		} catch (Exception ex) {
+			return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
+		}
+	}
+	
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("mes:mesOrderJjll:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesOrderJjll mesOrderJjll) {
+		mesOrderJjllService.delete(mesOrderJjll);
+		return renderResult(Global.TRUE, text("删除机加订单领料工件绑定成功！"));
+	}
+	
+}

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

@@ -107,6 +107,8 @@ public class MesProductCcdController extends BaseController {
 	@RequiresPermissions("mes:mesProductCcd:view")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesProductCcd mesProductCcd, HttpServletResponse response) {
+		// 导出提交了 searchForm 中的 pageNo/pageSize（列表默认 20），需清空分页才能导全量
+		mesProductCcd.setPage(null);
 		List<MesProductCcd> list = mesProductCcdService.findList(mesProductCcd);
 		String fileName = "视觉检测记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("视觉检测记录", MesProductCcd.class)){

src/main/resources/config/application.yml

@@ -1108,7 +1108,7 @@ mes:
       password: oPCuA_123
     # FSW Modbus TCP 握手（工件码质量校验 + 过程参数采集）
     modbus:
-      enabled: true
+#      enabled: true
       host: 10.0.40.101
       port: 502
       unitId: 1
@@ -1117,21 +1117,21 @@ mes:
   # 框架气密 S7 采集（OP360）
   framework:
     qm:
-      enabled: true
+#      enabled: true
       plc:
         ip: 10.0.20.96
       oprno: OP360
       lineSn: XT
   # 涂胶 S7 采集（OP220）
   tj:
-    enabled: true
+#    enabled: true
     plc:
       ip: 10.0.40.100
     oprno: OP220
     lineSn: XT
     # 涂胶 S7 采集（OP240B）
     b:
-      enabled: true
+#      enabled: true
       plc:
         ip: 10.0.40.100
       oprno: OP240

src/main/resources/mappings/modules/mes/MesOrderJjllDao.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.MesOrderJjllDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesOrderJjll">
+		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/mesOrderJjllForm.html

@@ -0,0 +1,66 @@
+<% 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(mesOrderJjll.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="${mesOrderJjll}" action="${ctx}/mes/mesOrderJjll/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-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('机加订单')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="orderJj" 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" title="">
+								<span class="required hide">*</span> ${text('工件码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="sn" maxlength="64" 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('mes:mesOrderJjll: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/mesOrderJjllList.html

@@ -0,0 +1,120 @@
+<% 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>
+				<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a>
+				<% if(hasPermi('mes:mesOrderJjll:edit')){ %>
+						<a href="#" class="btn btn-default" id="btnImport"><i class="glyphicon glyphicon-import"></i> 导入</a>
+					<a href="${ctx}/mes/mesOrderJjll/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="${mesOrderJjll}" action="${ctx}/mes/mesOrderJjll/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="orderJj" 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="sn" 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:'orderJj', index:'a.order_jj', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesOrderJjll/form?id='+row.id+'" class="btnList" data-title="${text("编辑机加订单领料工件绑定")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:150, align:"left"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('mes:mesOrderJjll:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesOrderJjll/form?id='+row.id+'" class="btnList" title="${text("编辑机加订单领料工件绑定")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesOrderJjll/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><script>
+$('#btnExport').click(function(){
+	js.ajaxSubmitForm($('#searchForm'), {
+		url:'${ctx}/mes/mesOrderJjll/exportData',
+		downloadFile:true
+	});
+});
+$('#btnImport').click(function(){
+	js.layer.open({
+		type: 1,
+		area: ['400px'],
+		title: '${text("导入机加订单领料工件绑定")}',
+		resize: false,
+		scrollbar: true,
+		content: js.template('importTpl'),
+		btn: ['<i class="fa fa-check"></i> ${text("导入")}',
+			'<i class="fa fa-remove"></i> ${text("关闭")}'],
+		btn1: function(index, layero){
+			var form = {
+				inputForm: layero.find('#inputForm'),
+				file: layero.find('#file').val()
+			};
+		    if (form.file == '' || (!js.endWith(form.file, '.xls') && !js.endWith(form.file, '.xlsx'))){
+		    	js.showMessage("${text('文件不正确，请选择后缀为“xls”或“xlsx”的文件。')}", null, 'warning');
+		        return false;
+		    }
+			js.ajaxSubmitForm(form.inputForm, function(data){
+				js.showMessage(data.message);
+				if(data.result == Global.TRUE){
+					js.layer.closeAll();
+				}
+				page();
+			}, "json");
+			return true;
+		}
+	});
+});
+</script>
+<script id="importTpl" type="text/template">//<!--
+<form id="inputForm" action="${ctx}/mes/mesOrderJjll/importData" method="post" enctype="multipart/form-data"
+	class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
+	<div class="row">
+		<div class="col-xs-12 col-xs-offset-1">
+			<input type="file" id="file" name="file" class="form-file"/>
+			<div class="mt10 pt5" style="color:red">
+				${text('提示：仅允许导入“xls”或“xlsx”格式文件！')}
+			</div>
+			<div class="mt10 pt5">
+				<a href="${ctx}/mes/mesOrderJjll/importTemplate" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> ${text('下载模板')}</a>
+			</div>
+		</div>
+	</div>
+</form>
+//--></script>