Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng

src/main/java/com/sipai/controller/business/BusinessUnitController.java

@@ -93,7 +93,11 @@ public class BusinessUnitController {
 	public String dosave(HttpServletRequest request,Model model,
 			@ModelAttribute BusinessUnit businessUnit){
 		User cu= (User)request.getSession().getAttribute("cu");
-		String id = CommUtil.getUUID();
+		// Use custom ID if provided, otherwise generate UUID
+		String id = businessUnit.getId();
+		if(id == null || id.trim().isEmpty()) {
+			id = CommUtil.getUUID();
+		}
 		businessUnit.setId(id);
 		businessUnit.setInsuser(cu.getId());
 		businessUnit.setInsdt(CommUtil.nowDate());

src/main/java/com/sipai/entity/scada/MPoint.java

@@ -38,6 +38,7 @@ public class MPoint extends SQLAdapter implements Serializable {
 
 	private String id;
 	private String mpointid;
+	@Field(type = FieldType.Keyword, normalizer = "my_normalizer")
 	private String mpointcode;
 	//	@Field(name="parmname")
 	private String parmname;

src/main/webapp/jsp/business/businessUnitAdd.jsp

@@ -75,6 +75,12 @@
            <form class="form-horizontal" id="subForm">
                 <!-- 界面提醒div强制id为alertDiv -->
                 <div id="alertDiv"></div>
+                <div class="form-group">
+                 <label class="col-sm-3 control-label">业务单元ID</label>
+                 <div class="col-sm-9">
+                   <input type="text" class="form-control" id="id" name="id" placeholder="业务单元ID（不填则自动生成）" >
+                 </div>
+               </div>
                 <div class="form-group">
                  <label class="col-sm-3 control-label">*业务单元名称</label>
                  <div class="col-sm-9">

src/main/webapp/jsp/business/businessUnitEdit.jsp

@@ -53,6 +53,12 @@
            <form class="form-horizontal" id="subForm">
                 <div id="alertDiv"></div>
                 <input id="id" name="id" type="hidden" value="${businessUnit.id}"/>
+                <div class="form-group">
+                 <label class="col-sm-3 control-label">业务单元ID</label>
+                 <div class="col-sm-9">
+                   <input type="text" class="form-control" id="displayId" value="${businessUnit.id}" readonly style="background-color: #eee;">
+                 </div>
+               </div>
                 <div class="form-group">
                  <label class="col-sm-3 control-label">*业务单元名称</label>
                  <div class="col-sm-9">

src/main/webapp/jsp/business/businessUnitList.jsp

@@ -151,6 +151,11 @@
 	          columns: [
 	              {
 	                  checkbox: true,
+	              }, {
+	                  field: 'id',
+	                  title: '业务单元ID',
+	                  align: 'center',
+	                  valign: 'middle'
 	              }, {
 	                  field: 'name',
 	                  title: '业务单元名称',