Merge remote-tracking branch 'origin/mes_weipjs_prod' into mes_weipjs_prod

# Conflicts:
#	src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

WebContent/app/view/common/query/CheckForm.js

@@ -102,12 +102,20 @@ Ext.define('erp.view.common.query.CheckForm',{
 			showError("[" + error.slice(0, -1) + "]不允许为空");
 			return false;
 		}
+		//特殊校验
+		if("BarSmtReduce!Query" ==caller || "BarSmtReduce!Query2" ==caller ){
+			 error = form.specialCheck();
+			if(error!=""){
+				showError(error);
+				return false;
+			}
+		}
 		var condition = grid.defaultCondition || '';
 		condition = form.spellCondition(condition);
 		if(Ext.isEmpty(condition)) {
 			condition = grid.emptyCondition || '1=1';
 		}
-		form.beforeQuery(caller, condition);//鎵ц鏌ヨ鍓嶉�杈�
+		form.beforeQuery(caller, condition);
 		var gridParam = {caller: caller, condition: condition, start: 1, end: getUrlParam('_end')||1000};
 		grid.GridUtil.loadNewStore(grid, gridParam);
 	},
@@ -388,5 +396,51 @@ Ext.define('erp.view.common.query.CheckForm',{
 			}
 		});
 		return allowBlank;
+	},
+	specialCheck:function(){
+		var re = "";
+		if("BarSmtReduce!Query2"==caller) {
+			//fieldLabel
+			var bar = Ext.getCmp("msl_barcode");
+			var macode = Ext.getCmp("SMT_MS_MAKECODE");
+			var vendbar = Ext.getCmp("bar_vendbarcode");
+			if(bar && bar.value == ""){
+				if((vendbar && vendbar.value == "") && (macode && macode.value == "")){
+					re ="料卷号或者工单号需要必填其中一个项！";
+					return re;
+				}
+				if((vendbar && vendbar.value == "") || (macode && macode.value == "")){
+					re ="料卷号未填写时，工单号必填！";
+					return re;
+				}
+			}
+			if(!bar || !macode || !vendbar){
+				re ="主表筛选字段必须包含料卷号、工单号、供应商批号！";
+				return re;
+			}
+			//msl_barcode，SMT_MS_MAKECODE 、bar_vendbarcode
+		}else if("BarSmtReduce!Query"==caller) {
+			//msl_barcode ，SMT_MS_MAKECODE，bar_vendbarcode ，msl_prodcode
+			var bar = Ext.getCmp("msl_barcode");
+			var macode = Ext.getCmp("SMT_MS_MAKECODE");
+			var vendbar = Ext.getCmp("bar_vendbarcode");
+			var prodcode = Ext.getCmp("msl_prodcode");
+			if(bar && bar.value == ""){
+				if((vendbar && vendbar.value == "") && (macode && macode.value == "") && (prodcode && prodcode.value == "")){
+					re ="料卷号或者（工单号+物料编号）需要必填其中一个项！";
+					return re;
+				}
+				if((vendbar && vendbar.value == "") || (macode && macode.value == "") || (prodcode && macode.prodcode == "")){
+					re ="料卷号未填写时，工单号、物料编号都必填！";
+					return re;
+				}
+			}
+			if(!bar || !macode || !vendbar || !prodcode){
+				re ="主表筛选条件必须包含料卷号、工单号、供应商批号、物料编号！";
+				return re;
+			}
+		}
+		return re;
+
 	}
 });

src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

@@ -1639,7 +1639,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 			}
 			 
 			 //未校验站位前二十条
-			 rs=baseDao.queryForRowSet("select * from (select psl_location,PSL_PRODCODE from(select min(psl_detno)psl_detno,psl_location,wm_concat(PSL_PRODCODE)PSL_PRODCODE from productsmtlocation left join productsmt on ps_id=psl_psid "
+			 rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location from productsmtlocation left join productsmt on ps_id=psl_psid "
 			    		+" where ps_linecode = ? and ps_prodcode = ? and psl_table = ? and  psl_location not in (select distinct dsl_location from devsmtlocation where "
 			    		+" dsl_linecode=? and dsl_makecode=? and dsl_table=? and dsl_status=0 and dsl_ifcheck = -1) "
 			    		+" group by psl_location order by psl_detno)) where rownum<=20 ",linecode,ps_prodcode,table,linecode,macode,table);

src/com/uas/mes/pda/service/impl/PdaSpmServiceImpl.java

@@ -60,7 +60,7 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
                     "    INSERT (SPB_ID,SPB_BARCODE,SPB_STATUS,SPB_REWARMINGDATE,SPB_RESTORECOUNT,SPB_OPENTIME) " +
                     "	  VALUES(spmbarcode_seq.nextval,'"+barcodeItem+"','出库回温',sysdate,0,0)");
             //3、插入日志到SPMLOG记录条码出库回温
-            sqls.add(getSpmlog (barcodeItem,"出库","条码: "+barcodeItem+",出库回温成功。",""));
+            sqls.add(getSpmlog (barcodeItem,"出库","条码: "+barcodeItem+",出库成功,开始回温。",""));
             baseDao.execute("update barcode set bar_pdaget = 0 where bar_code = '"+barcodeItem+"'");
         }
         baseDao.execute(sqls);
@@ -127,9 +127,9 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
         //PDA扫码上料，限制状态必须为‘已开封’，回温时间必须小于24H
         checkLoading(barcode);
         //线别转大写处理，必须存在且已审核
-        boolean macodeCheck = baseDao.checkIf("make","ma_code = '"+macode+"' and nvl(ma_statuscode,' ') = 'STARTED'");
+        boolean macodeCheck = baseDao.checkIf("make","ma_code = '"+macode+"' ");
         if(!macodeCheck){
-            throw new APIErrorException(APIErrorCode.DATA_NOT_FOUND,"工单: "+macode+",不存在或未下放！");
+            throw new APIErrorException(APIErrorCode.DATA_NOT_FOUND,"工单: "+macode+",不存在！");
         }
         if(StringUtil.hasText(linecode)){
             linecode = linecode.toUpperCase();
@@ -383,7 +383,7 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
         //2、批量更新条码状态为”空瓶”
         baseDao.execute("update spmbarcode set spb_status = '已搅拌' where spb_barcode in ("+barcodeStr+")");
         //3、插入日志到SPMLOG记录条码空瓶回收
-        saveSpmlog(barcodeStr,"搅拌","入搅拌成功。","","");
+        saveSpmlog(barcodeStr,"搅拌","回温成功,搅拌成功。","","");
     }
 
     @Override

src/com/uas/mes/scm/service/impl/GenerateBarcodeServiceImpl.java

@@ -692,7 +692,7 @@ public class GenerateBarcodeServiceImpl implements GenerateBarcodeService{ //生
 			mp1.put("BAR_CODE", bar_code);
 			mp1.put("BAR_REMAIN", bar_remain);
 			mp1.put("BAR_STATUS", "1");
-			mp1.put("BAR_PLACE", "");
+			mp1.put("BAR_PLACE", "1");
 			mp1.put("BAR_RECORDDATE", DateUtil.format(null, "yyyy-MM-dd HH:mm:ss"));
 			baseDao.execute(SqlUtil.getInsertSqlByFormStore(mp1, "barcode", new String[] {}, new Object[] {}));
 			// 产生barcodechange记录