微浦MES，工单镭雕条码，补生成条码，增加备注必填

WebContent/app/controller/pm/mes/MakeSNRuleMain.js

@@ -7,7 +7,7 @@ Ext.define('erp.controller.pm.mes.MakeSNRuleMain', {
 	views : [ 'pm.mes.MakeSNRuleMain', 'core.form.Panel',
 			'core.toolbar.Toolbar', 'core.button.Close', 'core.trigger.DbfindTrigger',
 			'core.trigger.TextAreaTrigger', 'core.trigger.MultiDbfindTrigger','core.button.Delete',
-			'core.form.YnField','core.button.DeleteAllDetails',
+			'core.form.YnField','core.button.DeleteAllDetails','core.button.Add',
 		     'core.button.GenerateBarcode','core.button.SuppleGenBar'],
 	init : function() {
 		var me = this;
@@ -25,7 +25,11 @@ Ext.define('erp.controller.pm.mes.MakeSNRuleMain', {
 					}
 				}
 			},
-
+			'erpAddButton': {
+				click: function(){
+					me.FormUtil.onAdd('addMakeSNRuleMain', '新增工单条码生成维护', 'jsps/pm/mes/makeSNRuleMain.jsp?whoami=MakeSNRuleMain');
+				}
+			},
 			/**
 			 * 生成条码
 			 */
@@ -92,9 +96,17 @@ Ext.define('erp.controller.pm.mes.MakeSNRuleMain', {
 					var addqty = Ext.getCmp("mm_addqty");
 					if (!addqty) {
 						showError("必须配置并且维护补生成数量字段!")
+						return;
 					}
 					if (addqty && (addqty.value == null || addqty.value == '' || addqty.value <= 0)) {
 						showError("补生成数量必须大于0，并且是整数!")
+						return;
+					}
+					//补生成条码备注必填
+					var remark = Ext.getCmp("mm_remark");
+					if(remark && Ext.isEmpty(remark.value)){
+						showError("补生成备注必填!")
+						return;
 					}
 					if (Ext.getCmp(form.codeField).value == null || Ext.getCmp(form.codeField).value == '') {
 						me.BaseUtil.getRandomNumber();//自动添加编号

src/com/uas/mes/pm/service/impl/MakeSNRuleMainServiceImpl.java

@@ -7,14 +7,12 @@ import com.uas.mes.common.support.SystemSession;
 import com.uas.mes.common.util.BaseUtil;
 import com.uas.mes.core.data.SqlRowList;
 import com.uas.mes.core.util.CollectionUtil;
-import com.uas.mes.core.util.FlexJsonUtil;
 import com.uas.mes.core.util.StringUtil;
 import com.uas.mes.pm.service.MakeSNRuleMainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,10 +49,11 @@ public class MakeSNRuleMainServiceImpl implements MakeSNRuleMainService {
                 BaseUtil.showError("工单不允许修改，原工单："+rs.getGeneralString("mm_macode")+",新工单："+map.get("mm_macode")+"!");
             }
             baseDao.execute(SqlUtil.getUpdateSqlByFormStore(map,"makesnrulemain","mm_id"));
+            baseDao.logger.update(caller,"mm_id",map.get("mm_id"));
         }else{
             baseDao.execute(SqlUtil.getInsertSqlByMap(map,"makesnrulemain"));
+            baseDao.logger.save(caller,"mm_id",map.get("mm_id"));
         }
-        baseDao.logger.save(caller,"mm_id",map.get("mm_id"));
         String da = baseDao.callProcedure("MA_GENMAKESNRULEDETAIL",map.get("mm_id"),"生成", SystemSession.getUser().getEm_name());
         if(StringUtil.hasText(da)){
             BaseUtil.showError(da);
@@ -105,8 +104,10 @@ public class MakeSNRuleMainServiceImpl implements MakeSNRuleMainService {
                 BaseUtil.showError("工单不允许修改，原工单："+rs.getGeneralString("mm_macode")+",新工单："+map.get("mm_macode")+"!");
             }
             baseDao.execute(SqlUtil.getUpdateSqlByFormStore(map,"makesnrulemain","mm_id"));
+            baseDao.logger.update(caller,"mm_id",map.get("mm_id"));
         }else{
             baseDao.execute(SqlUtil.getInsertSqlByMap(map,"makesnrulemain"));
+            baseDao.logger.save(caller,"mm_id",map.get("mm_id"));
         }
         String da = baseDao.callProcedure("MA_GENMAKESNRULEDETAIL",map.get("mm_id"),"补生成",SystemSession.getUser().getEm_name());
         if(StringUtil.hasText(da)){